http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java index 3e32532..73d564a 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java @@ -19,11 +19,6 @@ package org.apache.cayenne.access; -import java.sql.Types; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - import org.apache.cayenne.Cayenne; import org.apache.cayenne.DataChannel; import org.apache.cayenne.DataObject; @@ -44,6 +39,12 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.sql.Types; +import java.util.Date; +import java.util.Iterator; +import java.util.List; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContextReadIT extends ServerCase { @@ -112,6 +113,7 @@ public class NestedDataContextReadIT extends ServerCase { tPainting.insert(33006, "P_artist6", 33001, 3000); } + @Test public void testCreateChildDataContext() { context.setValidatingObjectsOnCommit(true); @@ -137,6 +139,7 @@ public class NestedDataContextReadIT extends ServerCase { assertFalse(((DataContext) child2).isValidatingObjectsOnCommit()); } + @Test public void testSelect() throws Exception { createArtistsDataSet(); @@ -178,6 +181,7 @@ public class NestedDataContextReadIT extends ServerCase { } } + @Test public void testReadToOneRelationship() throws Exception { createRelationshipDataSet(); @@ -277,6 +281,7 @@ public class NestedDataContextReadIT extends ServerCase { }); } + @Test public void testPrefetchingToOne() throws Exception { createPrefetchingDataSet(); @@ -315,6 +320,7 @@ public class NestedDataContextReadIT extends ServerCase { }); } + @Test public void testPrefetchingToMany() throws Exception { createPrefetchingDataSet(); @@ -356,6 +362,7 @@ public class NestedDataContextReadIT extends ServerCase { }); } + @Test public void testObjectFromDataRow() throws Exception { DataContext childContext = (DataContext) runtime.newContext(context);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java index 86110c2..63b5ea0 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java @@ -24,6 +24,7 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContextRollbackIT extends ServerCase { @@ -34,6 +35,7 @@ public class NestedDataContextRollbackIT extends ServerCase { @Inject private DataContext context; + @Test public void testRollbackChanges() { ObjectContext child1 = runtime.newContext(context); @@ -51,6 +53,7 @@ public class NestedDataContextRollbackIT extends ServerCase { assertFalse(child1.hasChanges()); } + @Test public void testRollbackChangesLocally() { ObjectContext child1 = runtime.newContext(context); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java index fd18428..2ac6652 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java @@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.validation.ValidationException; +import org.junit.Test; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContextValidationIT extends ServerCase { @@ -49,6 +50,7 @@ public class NestedDataContextValidationIT extends ServerCase { dbHelper.deleteAll("ARTIST"); } + @Test public void testValidateOnCommitToParent() { context.setValidatingObjectsOnCommit(true); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java index 569283c..ed319c8 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java @@ -39,6 +39,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.sql.Types; import java.util.Collection; @@ -129,6 +130,7 @@ public class NestedDataContextWriteIT extends ServerCase { return context; } + @Test public void testDeleteNew() throws Exception { createSingleArtistDataSet(); @@ -151,6 +153,7 @@ public class NestedDataContextWriteIT extends ServerCase { /** * A test case for CAY-698 bug. */ + @Test public void testNullifyToOne() throws Exception { createNullifyToOneDataSet(); @@ -180,6 +183,7 @@ public class NestedDataContextWriteIT extends ServerCase { }); } + @Test public void testCommitChangesToParent() throws Exception { createArtistsDataSet(); @@ -254,6 +258,7 @@ public class NestedDataContextWriteIT extends ServerCase { }); } + @Test public void testCommitChangesToParentDeleted() throws Exception { createArtistsDataSet(); @@ -290,6 +295,7 @@ public class NestedDataContextWriteIT extends ServerCase { assertEquals("DDD", parentDeleted.getArtistName()); } + @Test public void testCommitChanges() throws Exception { createArtistsDataSet(); @@ -356,6 +362,7 @@ public class NestedDataContextWriteIT extends ServerCase { assertNotNull(parentHollow); } + @Test public void testCommitChangesToParent_MergeProperties() throws Exception { createMixedDataSet(); @@ -436,6 +443,7 @@ public class NestedDataContextWriteIT extends ServerCase { }); } + @Test public void testCommitChangesToParentPropagatedKey() throws Exception { final DataContext context = createDataContext(); final ObjectContext childContext = runtime.newContext(context); @@ -476,6 +484,7 @@ public class NestedDataContextWriteIT extends ServerCase { }); } + @Test public void testCommitChangesToParentFlattened() throws Exception { final DataContext context = createDataContext(); @@ -525,6 +534,7 @@ public class NestedDataContextWriteIT extends ServerCase { }); } + @Test public void testCommitChangesToParentFlattenedMultipleFlush() throws Exception { final DataContext context = createDataContext(); final ObjectContext childContext = runtime.newContext(context); @@ -622,6 +632,7 @@ public class NestedDataContextWriteIT extends ServerCase { }); } + @Test public void testAddRemove() { DataContext context = createDataContext(); @@ -648,6 +659,7 @@ public class NestedDataContextWriteIT extends ServerCase { } + @Test public void testCAY1194() throws Exception { DataContext context = createDataContext(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java index a46c506..2d05ff3 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java @@ -18,9 +18,6 @@ ****************************************************************/ package org.apache.cayenne.access; -import java.util.List; -import java.util.Random; - import org.apache.cayenne.ObjectContext; import org.apache.cayenne.configuration.server.ServerRuntime; import org.apache.cayenne.di.Inject; @@ -31,6 +28,10 @@ import org.apache.cayenne.test.parallel.ParallelTestContainer; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.util.List; +import java.util.Random; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContext_DeadlockIT extends ServerCase { @@ -64,6 +65,7 @@ public class NestedDataContext_DeadlockIT extends ServerCase { } } + @Test public void testDeadlock() throws Exception { createArtists(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java index 4581852..2ce5d42 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java @@ -19,10 +19,6 @@ package org.apache.cayenne.access; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.List; - import org.apache.cayenne.ObjectId; import org.apache.cayenne.configuration.server.ServerRuntime; import org.apache.cayenne.di.Inject; @@ -42,6 +38,11 @@ import org.apache.cayenne.testdo.testmap.SmallintTestEntity; import org.apache.cayenne.testdo.testmap.TinyintTestEntity; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.List; /** */ @@ -87,6 +88,7 @@ public class NumericTypesIT extends ServerCase { tTinyintTest.insert(2, 50); } + @Test public void testLong() throws Exception { LongEntity test = context.newObject(LongEntity.class); @@ -104,6 +106,7 @@ public class NumericTypesIT extends ServerCase { context.commitChanges(); } + @Test public void testBigInteger() throws Exception { BigIntegerEntity test = context.newObject(BigIntegerEntity.class); @@ -121,6 +124,7 @@ public class NumericTypesIT extends ServerCase { context.commitChanges(); } + @Test public void testBigDecimal() throws Exception { BigDecimalEntity test = context.newObject(BigDecimalEntity.class); @@ -138,6 +142,7 @@ public class NumericTypesIT extends ServerCase { context.commitChanges(); } + @Test public void testShortInQualifier() throws Exception { createShortDataSet(); @@ -152,6 +157,7 @@ public class NumericTypesIT extends ServerCase { assertEquals(new Short("9999"), object.getSmallintCol()); } + @Test public void testShortInInsert() throws Exception { SmallintTestEntity object = (SmallintTestEntity) (context) .newObject("SmallintTestEntity"); @@ -159,6 +165,7 @@ public class NumericTypesIT extends ServerCase { context.commitChanges(); } + @Test public void testTinyintInQualifier() throws Exception { createTinyintDataSet(); @@ -173,6 +180,7 @@ public class NumericTypesIT extends ServerCase { assertEquals(new Byte((byte) 81), object.getTinyintCol()); } + @Test public void testTinyintInInsert() throws Exception { TinyintTestEntity object = (TinyintTestEntity) (context) .newObject("TinyintTestEntity"); @@ -180,6 +188,7 @@ public class NumericTypesIT extends ServerCase { context.commitChanges(); } + @Test public void testBooleanBit() throws Exception { BitTestEntity trueObject = (BitTestEntity) context.newObject("BitTestEntity"); @@ -218,6 +227,7 @@ public class NumericTypesIT extends ServerCase { assertSame(Boolean.FALSE, falseRefetched.getBitColumn()); } + @Test public void testBooleanBoolean() throws Exception { // populate (testing insert as well) @@ -260,6 +270,7 @@ public class NumericTypesIT extends ServerCase { assertSame(Boolean.FALSE, falseRefetched.getBooleanColumn()); } + @Test public void testDecimalPK() throws Exception { // populate (testing insert as well) @@ -279,6 +290,7 @@ public class NumericTypesIT extends ServerCase { context.commitChanges(); } + @Test public void testDecimalPK1() throws Exception { // populate (testing insert as well) http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java index f8b11d7..67eeb7a 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java @@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.sql.Types; @@ -73,6 +74,7 @@ public class ObjectStoreDiffRetainingIT extends ServerCase { tPainting.insert(2000, null, null, 3000, "p1"); } + @Test public void testSnapshotRetainedOnPropertyModification() throws Exception { createMixedDataSet(); @@ -85,6 +87,7 @@ public class ObjectStoreDiffRetainingIT extends ServerCase { assertNotNull(objectStore.getChangesByObjectId().get(a.getObjectId())); } + @Test public void testSnapshotRetainedOnRelAndPropertyModification() throws Exception { createMixedDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java index 86e8ede..81abf7f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java @@ -27,6 +27,7 @@ import org.apache.cayenne.test.parallel.ParallelTestContainer; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class ObjectStoreGCIT extends ServerCase { @@ -46,6 +47,7 @@ public class ObjectStoreGCIT extends ServerCase { dbHelper.deleteAll("ARTIST"); } + @Test public void testReleaseUnreferenced() throws Exception { context.performGenericQuery(new SQLTemplate( Artist.class, @@ -66,6 +68,7 @@ public class ObjectStoreGCIT extends ServerCase { }.runTest(2000); } + @Test public void testRetainUnreferencedNew() throws Exception { assertEquals(0, context.getObjectStore().registeredObjectsCount()); Artist a = context.newObject(Artist.class); @@ -96,6 +99,7 @@ public class ObjectStoreGCIT extends ServerCase { } + @Test public void testRetainUnreferencedModified() throws Exception { context.performGenericQuery(new SQLTemplate( Artist.class, http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java index 8e24d38..4929c4f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreIT.java @@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.testmap.Gallery; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.Collections; import java.util.Date; @@ -40,6 +41,7 @@ public class ObjectStoreIT extends ServerCase { @Inject private DataContext context; + @Test public void testRegisteredObjectsCount() throws Exception { assertEquals(0, context.getObjectStore().registeredObjectsCount()); @@ -62,6 +64,7 @@ public class ObjectStoreIT extends ServerCase { assertEquals(2, context.getObjectStore().registeredObjectsCount()); } + @Test public void testObjectsUnregistered() throws Exception { DataRow row = new DataRow(10); @@ -85,6 +88,7 @@ public class ObjectStoreIT extends ServerCase { assertNull(context.getObjectStore().getCachedSnapshot(oid)); } + @Test public void testUnregisterThenRegister() throws Exception { // Create a gallery. http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java index b345f2a..20e9f07 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java @@ -19,10 +19,6 @@ package org.apache.cayenne.access; -import java.sql.Types; -import java.util.List; -import java.util.Map; - import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.Ordering; import org.apache.cayenne.query.SelectQuery; @@ -33,6 +29,11 @@ import org.apache.cayenne.testdo.locking.RelLockingTestEntity; import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.sql.Types; +import java.util.List; +import java.util.Map; @UseServerRuntime(ServerCase.LOCKING_PROJECT) public class OptimisticLockingIT extends ServerCase { @@ -117,6 +118,7 @@ public class OptimisticLockingIT extends ServerCase { tSimpleLockingTest.delete().execute(); } + @Test public void testSuccessSimpleLockingOnDelete() throws Exception { createSimpleLockingDataSet(); @@ -134,6 +136,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testSuccessSimpleLockingOnDeleteFollowedByInvalidate() throws Exception { createSimpleLockingDataSet(); @@ -152,6 +155,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testSuccessSimpleLockingOnDeleteFollowedByForgetSnapshot() throws Exception { createSimpleLockingDataSet(); @@ -171,6 +175,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testSuccessSimpleLockingOnDeletePrecededByInvalidate() throws Exception { createSimpleLockingDataSet(); @@ -189,6 +194,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testSuccessSimpleLockingOnDeletePrecededByForgetSnapshot() throws Exception { createSimpleLockingDataSet(); @@ -208,6 +214,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testFailSimpleLockingOnDelete() throws Exception { createSimpleLockingDataSet(); @@ -235,6 +242,7 @@ public class OptimisticLockingIT extends ServerCase { } } + @Test public void testSuccessSimpleLockingOnUpdate() throws Exception { createSimpleLockingDataSet(); @@ -253,6 +261,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testSuccessSimpleLockingOnUpdateFollowedByInvalidate() throws Exception { createSimpleLockingDataSet(); @@ -272,6 +281,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testSuccessSimpleLockingOnUpdatePrecededByInvalidate() throws Exception { createSimpleLockingDataSet(); @@ -291,6 +301,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testSuccessSimpleLockingOnUpdateFollowedByForgetSnapshot() throws Exception { createSimpleLockingDataSet(); @@ -311,6 +322,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testSuccessSimpleLockingOnUpdatePrecededByForgetSnapshot() throws Exception { createSimpleLockingDataSet(); @@ -331,6 +343,7 @@ public class OptimisticLockingIT extends ServerCase { context.commitChanges(); } + @Test public void testFailSimpleLocking() throws Exception { createSimpleLockingDataSet(); @@ -359,6 +372,7 @@ public class OptimisticLockingIT extends ServerCase { } } + @Test public void testFailLockingOnNull() throws Exception { createLockingOnNullDataSet(); @@ -388,6 +402,7 @@ public class OptimisticLockingIT extends ServerCase { } } + @Test public void testSuccessLockingOnMixed() throws Exception { createLockingOnMixedDataSet(); @@ -412,6 +427,7 @@ public class OptimisticLockingIT extends ServerCase { // this requires refactoring of ContextCommit. } + @Test public void testFailLockingOnToOne() throws Exception { createLockingOnToOneDataSet(); @@ -446,6 +462,7 @@ public class OptimisticLockingIT extends ServerCase { } } + @Test public void testFailRetrieveRow() throws Exception { createSimpleLockingDataSet(); @@ -471,6 +488,7 @@ public class OptimisticLockingIT extends ServerCase { } } + @Test public void testFailRetrieveDeletedRow() throws Exception { createSimpleLockingDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java index cdf65e3..6e9a6ad 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/PrefetchProcessorTreeBuilderIT.java @@ -34,6 +34,7 @@ import org.apache.cayenne.testdo.testmap.Gallery; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.ArrayList; import java.util.HashMap; @@ -49,6 +50,7 @@ public class PrefetchProcessorTreeBuilderIT extends ServerCase { @Inject private EntityResolver resolver; + @Test public void testBuildTreeNoPrefetches() { final ClassDescriptor descriptor = resolver.getClassDescriptor("Artist"); @@ -109,6 +111,7 @@ public class PrefetchProcessorTreeBuilderIT extends ServerCase { assertNull(processingTree.getIncoming()); } + @Test public void testBuildTreeWithPrefetches() { final ClassDescriptor descriptor = resolver.getClassDescriptor("Artist"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java index f16395d..206c90d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java @@ -23,6 +23,7 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.testmap.PrimitivesTestEntity; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class PrimitiveAttributesIT extends ServerCase { @@ -38,6 +39,7 @@ public class PrimitiveAttributesIT extends ServerCase { dbHelper.deleteAll("PRIMITIVES_TEST"); } + @Test public void testCommit() { PrimitivesTestEntity e = context.newObject(PrimitivesTestEntity.class); e.setBooleanColumn(true); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java index de7f72a..2eac6d0 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java @@ -18,10 +18,6 @@ ****************************************************************/ package org.apache.cayenne.access; -import java.util.Collections; -import java.util.Date; -import java.util.List; - import org.apache.cayenne.ObjectContext; import org.apache.cayenne.ObjectId; import org.apache.cayenne.di.Inject; @@ -37,6 +33,11 @@ import org.apache.cayenne.testdo.quotemap.QuoteAdress; import org.apache.cayenne.testdo.quotemap.Quote_Person; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.util.Collections; +import java.util.Date; +import java.util.List; @UseServerRuntime(ServerCase.QUOTED_IDENTIFIERS_PROJECT) public class QuotedIdentifiersIT extends ServerCase { @@ -85,6 +86,7 @@ public class QuotedIdentifiersIT extends ServerCase { context.commitChanges(); } + @Test public void testPrefetchQuote() throws Exception { DbEntity entity = context.getEntityResolver().getObjEntity(QuoteAdress.class).getDbEntity(); List idAttributes = Collections.singletonList(entity.getAttribute("City")); @@ -129,6 +131,7 @@ public class QuotedIdentifiersIT extends ServerCase { assertEquals(1, objects10.size()); } + @Test public void testQuotedEJBQLQuery() throws Exception { String ejbql = "select a from QuoteAdress a where a.group = '324'"; EJBQLQuery queryEJBQL = new EJBQLQuery(ejbql); @@ -136,6 +139,7 @@ public class QuotedIdentifiersIT extends ServerCase { assertEquals(1, objects11.size()); } + @Test public void testQuotedEJBQLQueryWithJoin() throws Exception { String ejbql = "select p from Quote_Person p join p.address_Rel a where p.name = 'Arcadi'"; EJBQLQuery queryEJBQL = new EJBQLQuery(ejbql); @@ -143,6 +147,7 @@ public class QuotedIdentifiersIT extends ServerCase { assertEquals(1, resultList.size()); } + @Test public void testQuotedEJBQLQueryWithOrderBy() throws Exception { EJBQLQuery query = new EJBQLQuery("select p from Quote_Person p order by p.name"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java index 920096d..d84939c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ReturnTypesMappingIT.java @@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.testmap.ReturnTypesMapLobs1; import org.apache.cayenne.unit.UnitDbAdapter; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.math.BigDecimal; import java.sql.Time; @@ -65,7 +66,8 @@ public class ReturnTypesMappingIT extends ServerCase { /* * TODO: olga: We need divided TYPES_MAPPING_TES2 to 2 schemas with lobs columns and not lobs columns */ - + + @Test public void testBIGINT() throws Exception { String columnName = "BIGINT_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -82,6 +84,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(bigintValue, columnValue); } + @Test public void testBIGINT2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -97,6 +100,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(bigintValue, columnValue); } + @Test public void testBINARY() throws Exception { if (unitDbAdapter.supportsLobs()) { String columnName = "BINARY_COLUMN"; @@ -117,6 +121,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testBINARY2() throws Exception { if (unitDbAdapter.supportsLobs()) { ReturnTypesMap2 test = context.newObject(ReturnTypesMap2.class); @@ -136,6 +141,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testBIT() throws Exception { String columnName = "BIT_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -153,6 +159,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertTrue(bitValue.equals(columnValue) || ((Number) columnValue).intValue() == 1); } + @Test public void testBIT2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -168,6 +175,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(bitValue, columnValue); } + @Test public void testBLOB() throws Exception { if (unitDbAdapter.supportsLobs()) { String columnName = "BLOB_COLUMN"; @@ -188,6 +196,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testBLOB2() throws Exception { if (unitDbAdapter.supportsLobs()) { ReturnTypesMap2 test = context.newObject(ReturnTypesMap2.class); @@ -207,6 +216,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testBOOLEAN() throws Exception { String columnName = "BOOLEAN_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -225,6 +235,7 @@ public class ReturnTypesMappingIT extends ServerCase { || ((Number) columnValue).intValue() == 1); } + @Test public void testBOOLEAN2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -240,6 +251,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(booleanValue, columnValue); } + @Test public void testCHAR() throws Exception { String columnName = "CHAR_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -256,6 +268,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(charValue, columnValue); } + @Test public void testCHAR2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -271,6 +284,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(charValue, columnValue); } + @Test public void testCLOB() throws Exception { if (unitDbAdapter.supportsLobs()) { String columnName = "CLOB_COLUMN"; @@ -296,6 +310,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testCLOB2() throws Exception { if (unitDbAdapter.supportsLobs()) { ReturnTypesMapLobs1 test = context.newObject(ReturnTypesMapLobs1.class); @@ -317,6 +332,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testDATE() throws Exception { String columnName = "DATE_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -336,6 +352,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(dateValue.toString(), columnValue.toString()); } + @Test public void testDATE2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -354,6 +371,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(dateValue.toString(), columnValue.toString()); } + @Test public void testDECIMAL() throws Exception { String columnName = "DECIMAL_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -370,6 +388,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(decimalValue, columnValue); } + @Test public void testDECIMAL2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -385,6 +404,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(decimalValue, columnValue); } + @Test public void testDOUBLE() throws Exception { String columnName = "DOUBLE_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -401,6 +421,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(doubleValue, columnValue); } + @Test public void testDOUBLE2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -416,6 +437,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(doubleValue, columnValue); } + @Test public void testFLOAT() throws Exception { String columnName = "FLOAT_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -430,9 +452,10 @@ public class ReturnTypesMappingIT extends ServerCase { assertNotNull(columnValue); assertTrue(Float.class.equals(columnValue.getClass()) || Double.class.equals(columnValue.getClass())); - assertEquals(floatValue.floatValue(), ((Number)columnValue).floatValue()); + assertEquals(floatValue.floatValue(), ((Number)columnValue).floatValue(), 0); } + @Test public void testFLOAT2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -448,6 +471,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(floatValue, columnValue); } + @Test public void testINTEGER() throws Exception { String columnName = "INTEGER_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -464,6 +488,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(integerValue, columnValue); } + @Test public void testINTEGER2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -479,6 +504,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(integerValue, columnValue); } + @Test public void testLONGVARBINARY() throws Exception { if (unitDbAdapter.supportsLobs()) { String columnName = "LONGVARBINARY_COLUMN"; @@ -499,6 +525,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testLONGVARBINARY2() throws Exception { if (unitDbAdapter.supportsLobs()) { ReturnTypesMap2 test = context.newObject(ReturnTypesMap2.class); @@ -518,6 +545,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testLONGVARCHAR() throws Exception { String columnName = "LONGVARCHAR_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -538,6 +566,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(longvarcharValue, columnValue); } + @Test public void testLONGVARCHAR2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -557,6 +586,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(longvarcharValue, columnValue); } + @Test public void testNUMERIC() throws Exception { String columnName = "NUMERIC_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -573,6 +603,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(numericValue, columnValue); } + @Test public void testNUMERIC2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -588,6 +619,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(numericValue, columnValue); } + @Test public void testREAL() throws Exception { String columnName = "REAL_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -612,6 +644,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testREAL2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -627,6 +660,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(realValue, columnValue); } + @Test public void testSMALLINT() throws Exception { String columnName = "SMALLINT_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -643,6 +677,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(smallintValue, columnValue); } + @Test public void testSMALLINT2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -658,6 +693,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(smallintValue, columnValue); } + @Test public void testTIME() throws Exception { String columnName = "TIME_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -678,6 +714,7 @@ public class ReturnTypesMappingIT extends ServerCase { .toString()); } + @Test public void testTIME2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -696,6 +733,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(timeValue.toString(), new Time(columnValue.getTime()).toString()); } + @Test public void testSQLTemplateTime() throws Exception { DateTestEntity test = (DateTestEntity) context.newObject("DateTestEntity"); @@ -717,6 +755,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(now.toString(), new Time(columnValue.getTime()).toString()); } + @Test public void testTIMESTAMP() throws Exception { String columnName = "TIMESTAMP_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -737,6 +776,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertTrue(delta < 1000); } + @Test public void testTIMESTAMP2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -755,6 +795,7 @@ public class ReturnTypesMappingIT extends ServerCase { long delta = timestampValue.getTime() - ((Date) columnValue).getTime(); assertTrue(delta < 1000); } + @Test public void testTINYINT() throws Exception { String columnName = "TINYINT_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -771,6 +812,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(tinyintValue.intValue(), ((Number)columnValue).intValue()); } + @Test public void testTINYINT2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -786,6 +828,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(tinyintValue, columnValue); } + @Test public void testVARBINARY() throws Exception { if (unitDbAdapter.supportsLobs()) { String columnName = "VARBINARY_COLUMN"; @@ -806,6 +849,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testVARBINARY2() throws Exception { if (unitDbAdapter.supportsLobs()) { ReturnTypesMap2 test = context.newObject(ReturnTypesMap2.class); @@ -825,6 +869,7 @@ public class ReturnTypesMappingIT extends ServerCase { } } + @Test public void testVARCHAR() throws Exception { String columnName = "VARCHAR_COLUMN"; ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); @@ -841,6 +886,7 @@ public class ReturnTypesMappingIT extends ServerCase { assertEquals(varcharValue, columnValue); } + @Test public void testVARCHAR2() throws Exception { ReturnTypesMap1 test = context.newObject(ReturnTypesMap1.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java index 1c84092..99e5f41 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java @@ -19,9 +19,6 @@ package org.apache.cayenne.access; -import java.util.Iterator; -import java.util.List; - import org.apache.cayenne.DataRow; import org.apache.cayenne.di.Inject; import org.apache.cayenne.exp.Expression; @@ -33,6 +30,10 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.util.Iterator; +import java.util.List; /** * Tests IncrementalFaultList behavior when fetching data rows. @@ -100,6 +101,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase { tArtist.insert(33025, "artist25"); } + @Test public void testGet1() throws Exception { assertEquals(1, list.idWidth); assertTrue(list.elements.get(0) instanceof Long); @@ -113,6 +115,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase { assertEquals("artist20", ((DataRow) a).get("ARTIST_NAME")); } + @Test public void testIndexOf1() throws Exception { Expression qual = ExpressionFactory.matchExp("artistName", "artist20"); @@ -132,6 +135,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase { assertEquals(-1, list.indexOf(row)); } + @Test public void testIndexOf2() throws Exception { // resolve first page @@ -151,6 +155,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase { assertEquals(-1, list.indexOf(row)); } + @Test public void testLastIndexOf1() throws Exception { // resolve first page @@ -170,6 +175,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase { assertEquals(-1, list.lastIndexOf(row)); } + @Test public void testLastIndexOf2() throws Exception { Expression qual = ExpressionFactory.matchExp("artistName", "artist20"); @@ -186,6 +192,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase { assertEquals(-1, list.lastIndexOf(row)); } + @Test public void testIterator() throws Exception { assertEquals(1, list.idWidth); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java index ce4e4ea..22e3691 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java @@ -19,10 +19,6 @@ package org.apache.cayenne.access; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; - import org.apache.cayenne.DataObject; import org.apache.cayenne.di.Inject; import org.apache.cayenne.exp.Expression; @@ -35,6 +31,11 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class SimpleIdIncrementalFaultListIT extends ServerCase { @@ -87,6 +88,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { tArtist.insert(33025, "artist25"); } + @Test public void testRemoveDeleted() throws Exception { createArtistsDataSet(); @@ -120,21 +122,25 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { return new SimpleIdIncrementalFaultList<Object>(context, query, 10000); } + @Test public void testSize() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); assertEquals(25, list.size()); } + @Test public void testSmallList() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(49); assertEquals(25, list.size()); } + @Test public void testOnePageList() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(25); assertEquals(25, list.size()); } + @Test public void testIterator() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); Iterator<?> it = list.iterator(); @@ -158,6 +164,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { } } + @Test public void testNewObject() throws Exception { createArtistsDataSet(); @@ -177,6 +184,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { assertSame(newArtist, list.get(25)); } + @Test public void testListIterator() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); ListIterator<?> it = list.listIterator(); @@ -200,6 +208,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { } } + @Test public void testSort() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); @@ -216,6 +225,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { } } + @Test public void testUnfetchedObjects() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); assertEquals(25, list.getUnfetchedObjects()); @@ -225,6 +235,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { assertEquals(0, list.getUnfetchedObjects()); } + @Test public void testPageIndex() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); assertEquals(0, list.pageIndex(0)); @@ -240,6 +251,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { } } + @Test public void testPagesRead1() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); assertTrue(list.elements.get(0) instanceof Long); @@ -252,6 +264,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { assertTrue((list.elements.get(list.size() - 1)) instanceof Artist); } + @Test public void testGet1() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); assertTrue(list.elements.get(0) instanceof Long); @@ -264,6 +277,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { assertTrue(list.elements.get(8) instanceof Artist); } + @Test public void testIndexOf() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); Expression qual = ExpressionFactory.matchExp("artistName", "artist20"); @@ -277,6 +291,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase { assertEquals(-1, list.indexOf(list.dataContext.newObject("Artist"))); } + @Test public void testLastIndexOf() throws Exception { SimpleIdIncrementalFaultList<?> list = prepareList(6); Expression qual = ExpressionFactory.matchExp("artistName", "artist20"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java index d0a1b6e..6194ff8 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java @@ -35,6 +35,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.List; @@ -94,6 +95,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends ServerCase { tPaining.insert(33007, "P_artist21", 33007, 21000); } + @Test public void testListType() throws Exception { createArtistsDataSet(); @@ -110,6 +112,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends ServerCase { * Test that all queries specified in prefetch are executed with a single prefetch * path. */ + @Test public void testPrefetch1() throws Exception { createArtistsAndPaintingsDataSet(); @@ -144,6 +147,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends ServerCase { /** * Test that a to-many relationship is initialized. */ + @Test public void testPrefetch3() throws Exception { createArtistsAndPaintingsDataSet(); @@ -173,6 +177,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends ServerCase { /** * Test that a to-one relationship is initialized. */ + @Test public void testPrefetch4() throws Exception { createArtistsAndPaintingsDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java index 32220f0..31e093c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java @@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.inheritance_flat.Role; import org.apache.cayenne.testdo.inheritance_flat.User; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; /** * Special test cases per CAY-1378, CAY-1379. @@ -51,6 +52,7 @@ public class SingleTableInheritance1IT extends ServerCase { dbHelper.deleteAll("ROLES"); } + @Test public void testGroupActions() throws Exception { User user = context.newObject(User.class); @@ -80,6 +82,7 @@ public class SingleTableInheritance1IT extends ServerCase { context.commitChanges(); } + @Test public void testFlattenedNullifyNullifyDeleteRules() throws Exception { User user = context.newObject(User.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java index ea76fa7..22a6e8b 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java @@ -43,6 +43,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.sql.Types; import java.util.Arrays; @@ -151,6 +152,7 @@ public class SingleTableInheritanceIT extends ServerCase { tPerson.insert(9, "Kelly", "EM", 100000, null, 1); } + @Test public void testMatchingOnSuperAttributes() throws Exception { create2PersonDataSet(); @@ -164,6 +166,7 @@ public class SingleTableInheritanceIT extends ServerCase { assertEquals("E2", results.get(0).getName()); } + @Test public void testMatchingOnSuperAttributesWithPrefetch() throws Exception { create2PersonDataSet(); @@ -178,6 +181,7 @@ public class SingleTableInheritanceIT extends ServerCase { assertEquals("E2", results.get(0).getName()); } + @Test public void testPaginatedQueries() throws Exception { create5PersonDataSet(); @@ -200,6 +204,7 @@ public class SingleTableInheritanceIT extends ServerCase { assertTrue(results.get(4) instanceof Employee); } + @Test public void testRelationshipToAbstractSuper() { context .performGenericQuery(new SQLTemplate( @@ -216,6 +221,7 @@ public class SingleTableInheritanceIT extends ServerCase { assertTrue(note.getPerson() instanceof Employee); } + @Test public void testRelationshipAbstractFromSuperPrefetchingJoint() { context .performGenericQuery(new SQLTemplate( @@ -255,6 +261,7 @@ public class SingleTableInheritanceIT extends ServerCase { }); } + @Test public void testRelationshipAbstractFromSuperPrefetchingDisjoint() { context .performGenericQuery(new SQLTemplate( @@ -292,6 +299,7 @@ public class SingleTableInheritanceIT extends ServerCase { }); } + @Test public void testRelationshipAbstractToSuperPrefetchingDisjoint() { context .performGenericQuery(new SQLTemplate( @@ -322,6 +330,7 @@ public class SingleTableInheritanceIT extends ServerCase { }); } + @Test public void testRelationshipAbstractToSuperPrefetchingJoint() { context .performGenericQuery(new SQLTemplate( @@ -347,6 +356,7 @@ public class SingleTableInheritanceIT extends ServerCase { } + @Test public void testSave() throws Exception { ClientCompany company = context.newObject(ClientCompany.class); company.setName("Boeing"); @@ -373,6 +383,7 @@ public class SingleTableInheritanceIT extends ServerCase { /** * Tests that to-one relationship produces correct subclass. */ + @Test public void testEmployeeAddress() throws Exception { createEmployeeAddressDataSet(); @@ -386,6 +397,7 @@ public class SingleTableInheritanceIT extends ServerCase { /** * Tests that to-one relationship produces correct subclass. */ + @Test public void testManagerAddress() throws Exception { createManagerAddressDataSet(); @@ -398,6 +410,7 @@ public class SingleTableInheritanceIT extends ServerCase { assertSame(Manager.class, e.getClass()); } + @Test public void testCAY592() throws Exception { createManagerAddressDataSet(); @@ -421,6 +434,7 @@ public class SingleTableInheritanceIT extends ServerCase { /** * Tests that to-one relationship produces correct subclass. */ + @Test public void testRepCompany() throws Exception { createRepCompanyDataSet(); @@ -436,6 +450,7 @@ public class SingleTableInheritanceIT extends ServerCase { /** * Tests that to-many relationship produces correct subclasses. */ + @Test public void testDepartmentEmployees() throws Exception { createDepartmentEmployeesDataSet(); @@ -449,6 +464,7 @@ public class SingleTableInheritanceIT extends ServerCase { assertEquals(1, countObjectOfClass(employees, Manager.class)); } + @Test public void testSelectInheritanceResolving() throws Exception { createSelectDataSet(); @@ -465,6 +481,7 @@ public class SingleTableInheritanceIT extends ServerCase { * Test for CAY-1008: Reverse relationships may not be correctly set if inheritance is * used. */ + @Test public void testCAY1008() { RelatedEntity related = context.newObject(RelatedEntity.class); @@ -486,6 +503,7 @@ public class SingleTableInheritanceIT extends ServerCase { /** * Test for CAY-1009: Bogus runtime relationships can mess up commit. */ + @Test public void testCAY1009() { // We should have only one relationship. DirectToSubEntity -> SubEntity. http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java index 54a555c..e31a0bd 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ToManyListIT.java @@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.PersistentObjectList; +import org.junit.Test; import java.lang.reflect.Field; import java.util.LinkedList; @@ -62,6 +63,7 @@ public class ToManyListIT extends ServerCase { return new ToManyList(artist, Artist.PAINTING_ARRAY_PROPERTY); } + @Test public void testNewAddRemove() throws Exception { ToManyList list = createForNewArtist(); assertFalse("Expected resolved list when created with a new object", list @@ -80,6 +82,7 @@ public class ToManyListIT extends ServerCase { assertEquals(1, list.size()); } + @Test public void testSavedUnresolvedAddRemove() throws Exception { ToManyList list = createForExistingArtist(); @@ -110,6 +113,7 @@ public class ToManyListIT extends ServerCase { assertTrue(getValue(list).contains(p2)); } + @Test public void testSavedUnresolvedMerge() throws Exception { ToManyList list = createForExistingArtist(); @@ -144,6 +148,7 @@ public class ToManyListIT extends ServerCase { assertTrue(getValue(list).contains(p1)); } + @Test public void testThrowOutDeleted() throws Exception { ToManyList list = createForExistingArtist(); @@ -191,6 +196,7 @@ public class ToManyListIT extends ServerCase { .contains(p2)); } + @Test public void testRealRelationship() throws Exception { Artist artist = context.newObject(Artist.class); artist.setArtistName("aaa"); @@ -222,6 +228,7 @@ public class ToManyListIT extends ServerCase { assertEquals(2, size); } + @Test public void testRealRelationshipRollback() throws Exception { Artist artist = context.newObject(Artist.class); artist.setArtistName("aaa"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java index eb290fd..b4a9b10 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/TransactionThreadIT.java @@ -19,8 +19,6 @@ package org.apache.cayenne.access; -import java.sql.Connection; - import org.apache.cayenne.di.Inject; import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.query.SelectQuery; @@ -31,6 +29,9 @@ import org.apache.cayenne.tx.CayenneTransaction; import org.apache.cayenne.tx.Transaction; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.sql.Connection; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class TransactionThreadIT extends ServerCase { @@ -53,6 +54,7 @@ public class TransactionThreadIT extends ServerCase { dbHelper.deleteAll("ARTIST"); } + @Test public void testThreadConnectionReuseOnSelect() throws Exception { ConnectionCounterTx t = new ConnectionCounterTx(new CayenneTransaction(logger)); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java index 9275638..e3cb82e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.UuidPkEntity; import org.apache.cayenne.testdo.testmap.UuidTestEntity; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.UUID; @@ -50,6 +51,7 @@ public class UUIDIT extends ServerCase { uuidPkEntity = new TableHelper(dbHelper, "UUID_PK_ENTITY", "ID"); } + @Test public void testUUID() throws Exception { UuidTestEntity test = context.newObject(UuidTestEntity.class); @@ -67,6 +69,7 @@ public class UUIDIT extends ServerCase { context.commitChanges(); } + @Test public void testUUIDMeaningfulPkInsert() throws Exception { UUID id = UUID.randomUUID(); @@ -79,6 +82,7 @@ public class UUIDIT extends ServerCase { assertEquals(id, UUID.fromString(fetched)); } + @Test public void testUUIDMeaningfulPkSelect() throws Exception { UUID id = UUID.randomUUID(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java index 5e6c461..3d77739 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/UserTransactionIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.tx.CayenneTransaction; import org.apache.cayenne.tx.Transaction; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.sql.Connection; @@ -40,6 +41,7 @@ public class UserTransactionIT extends ServerCase { @Inject private JdbcEventLogger logger; + @Test public void testCommit() throws Exception { Artist a = context.newObject(Artist.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java index 46bdc11..c389fa1 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java @@ -33,6 +33,7 @@ import org.apache.cayenne.testdo.inheritance.vertical.IvSub1Sub1; import org.apache.cayenne.testdo.inheritance.vertical.IvSub2; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.sql.SQLException; import java.sql.Types; @@ -65,6 +66,7 @@ public class VerticalInheritanceIT extends ServerCase { dbHelper.deleteAll("IV2_X"); } + @Test public void testInsert_Root() throws Exception { TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT"); @@ -86,6 +88,7 @@ public class VerticalInheritanceIT extends ServerCase { assertNull(rootData[2]); } + @Test public void testInsert_Sub1() throws Exception { TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT"); @@ -134,6 +137,7 @@ public class VerticalInheritanceIT extends ServerCase { assertEquals("BdE2", subdata[1]); } + @Test public void testInsert_Sub2() throws Exception { TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT"); @@ -200,6 +204,7 @@ public class VerticalInheritanceIT extends ServerCase { assertEquals(0, ivSub2Table.getRowCount()); } + @Test public void testInsert_Sub1Sub1() throws Exception { TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT"); @@ -239,6 +244,7 @@ public class VerticalInheritanceIT extends ServerCase { assertEquals("3DQa", subsubdata[1]); } + @Test public void testSelectQuery_SuperSub() throws Exception { TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT"); @@ -280,6 +286,7 @@ public class VerticalInheritanceIT extends ServerCase { assertEquals("IvSub1", sub1.getDiscriminator()); } + @Test public void testSelectQuery_DeepAndWide() throws Exception { TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT"); @@ -349,6 +356,7 @@ public class VerticalInheritanceIT extends ServerCase { assertEquals("xSUB2", sub2.getSub2Name()); } + @Test public void testSelectQuery_MiddleLeaf() throws Exception { TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT"); @@ -407,6 +415,7 @@ public class VerticalInheritanceIT extends ServerCase { assertEquals("xSUB1_SUB1", sub1Sub1.getSub1Sub1Name()); } + @Test public void testDelete_Mix() throws Exception { TableHelper ivRootTable = new TableHelper(dbHelper, "IV_ROOT"); @@ -465,6 +474,7 @@ public class VerticalInheritanceIT extends ServerCase { assertEquals(2, results.size()); } + @Test public void testSelectQuery_AttributeOverrides() throws Exception { TableHelper iv1RootTable = new TableHelper(dbHelper, "IV1_ROOT"); @@ -505,6 +515,7 @@ public class VerticalInheritanceIT extends ServerCase { assertEquals("xSUB1", sub1.getName()); } + @Test public void testInsertWithRelationship() throws SQLException { TableHelper xTable = new TableHelper(dbHelper, "IV2_X"); TableHelper rootTable = new TableHelper(dbHelper, "IV2_ROOT"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java index 682d187..8ac759d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyIT.java @@ -18,19 +18,21 @@ ****************************************************************/ package org.apache.cayenne.access.dbsync; -import java.util.Collections; -import java.util.Map; - import org.apache.cayenne.access.MockOperationObserver; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.query.Query; import org.apache.cayenne.query.SQLTemplate; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.util.Collections; +import java.util.Map; @UseServerRuntime(ServerCase.SUS_PROJECT) public class SchemaUpdateStrategyIT extends SchemaUpdateStrategyBase { + @Test public void testCreateIfNoSchemaStrategy() throws Exception { setStrategy(CreateIfNoSchemaStrategy.class); @@ -49,6 +51,7 @@ public class SchemaUpdateStrategyIT extends SchemaUpdateStrategyBase { assertEquals(2, existingTables().size()); } + @Test public void testNoStandardSchema() throws Exception { String template = "SELECT #result('ARTIST_ID' 'int') FROM ARTIST ORDER BY ARTIST_ID"; SQLTemplate query = new SQLTemplate(Object.class, template); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java index 138f131..cd7f7af 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategyTest.java @@ -18,20 +18,22 @@ ****************************************************************/ package org.apache.cayenne.access.dbsync; -import static org.mockito.Mockito.mock; - -import java.util.Collections; -import java.util.Map; - import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.query.SQLTemplate; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.util.Collections; +import java.util.Map; + +import static org.mockito.Mockito.mock; @UseServerRuntime(ServerCase.SUS_PROJECT) public class ThrowOnPartialOrCreateSchemaStrategyTest extends SchemaUpdateStrategyBase { + @Test public void testMixedStrategyTableExist() throws Exception { createOneTable("SUS1"); @@ -44,6 +46,7 @@ public class ThrowOnPartialOrCreateSchemaStrategyTest extends SchemaUpdateStrate node.performQueries(Collections.singletonList(query), mock(OperationObserver.class)); } + @Test public void testMixedStrategyTableNoExist() throws Exception { String template = "SELECT #result('id' 'int') FROM SUS1"; @@ -60,6 +63,7 @@ public class ThrowOnPartialOrCreateSchemaStrategyTest extends SchemaUpdateStrate assertEquals(2, existingTables().size()); } + @Test public void testMixedStrategyWithOneTable() throws Exception { createOneTable("SUS1"); setStrategy(ThrowOnPartialOrCreateSchemaStrategy.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java index 383996a..55abbcb 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategyTest.java @@ -18,18 +18,20 @@ ****************************************************************/ package org.apache.cayenne.access.dbsync; -import java.util.Collections; - import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.MockOperationObserver; import org.apache.cayenne.query.Query; import org.apache.cayenne.query.SQLTemplate; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.util.Collections; @UseServerRuntime(ServerCase.SUS_PROJECT) public class ThrowOnPartialSchemaStrategyTest extends SchemaUpdateStrategyBase { + @Test public void testThrowOnPartialStrategyTableNoExist() throws Exception { String template = "SELECT #result('ARTIST_ID' 'int') FROM ARTIST ORDER BY ARTIST_ID"; @@ -51,6 +53,7 @@ public class ThrowOnPartialSchemaStrategyTest extends SchemaUpdateStrategyBase { } } + @Test public void testThrowOnPartialStrategyTableExist() throws Exception { String template = "SELECT #result('ARTIST_ID' 'int') FROM ARTIST ORDER BY ARTIST_ID"; @@ -64,6 +67,7 @@ public class ThrowOnPartialSchemaStrategyTest extends SchemaUpdateStrategyBase { node.performQueries(Collections.singletonList(query), observer); } + @Test public void testThrowOnPartialStrategyWithOneTable() throws Exception { createOneTable("SUS1"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java index be323bb..f59c4f6 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionIT.java @@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import static org.mockito.Mockito.mock; @@ -43,6 +44,7 @@ public class BatchActionIT extends ServerCase { @Inject private AdhocObjectFactory objectFactory; + @Test public void testHasGeneratedKeys1() throws Exception { EntityResolver resolver = runtime.getChannel().getEntityResolver(); @@ -62,6 +64,7 @@ public class BatchActionIT extends ServerCase { assertFalse(new BatchAction(batch2, node, false).hasGeneratedKeys()); } + @Test public void testHasGeneratedKeys2() throws Exception { EntityResolver resolver = runtime.getChannel().getEntityResolver(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java index 42061b8..89cc849 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java @@ -38,6 +38,7 @@ import org.apache.cayenne.query.DeleteBatchQuery; import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.Arrays; import java.util.Collection; @@ -60,6 +61,7 @@ public class BatchActionLockingIT extends ServerCase { @Inject private AdhocObjectFactory objectFactory; + @Test public void testRunAsIndividualQueriesSuccess() throws Exception { EntityResolver resolver = runtime.getDataDomain().getEntityResolver(); @@ -101,6 +103,7 @@ public class BatchActionLockingIT extends ServerCase { assertEquals(0, mockConnection.getNumberRollbacks()); } + @Test public void testRunAsIndividualQueriesOptimisticLockingFailure() throws Exception { EntityResolver resolver = runtime.getDataDomain().getEntityResolver(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java index ab1b1c9..b9f0240 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java @@ -37,6 +37,7 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.unit.util.SQLTemplateCustomizer; +import org.junit.Test; import java.sql.Connection; import java.sql.Date; @@ -90,6 +91,7 @@ public class SQLTemplateActionIT extends ServerCase { tArtist.insert(3001, "artist5", date); } + @Test public void testProperties() throws Exception { SQLTemplate template = new SQLTemplate(Object.class, "AAAAA"); @@ -98,6 +100,7 @@ public class SQLTemplateActionIT extends ServerCase { assertSame(node, action.dataNode); } + @Test public void testExecuteSelect() throws Exception { createFourArtists(); @@ -139,6 +142,7 @@ public class SQLTemplateActionIT extends ServerCase { assertTrue(row.containsKey("DATE_OF_BIRTH")); } + @Test public void testSelectUtilDate() throws Exception { createFourArtists(); @@ -172,6 +176,7 @@ public class SQLTemplateActionIT extends ServerCase { assertEquals(java.util.Date.class, row.get("DOB").getClass()); } + @Test public void testSelectSQLDate() throws Exception { createFourArtists(); @@ -205,6 +210,7 @@ public class SQLTemplateActionIT extends ServerCase { assertEquals(java.sql.Date.class, row.get("DOB").getClass()); } + @Test public void testSelectSQLTimestamp() throws Exception { createFourArtists(); @@ -239,6 +245,7 @@ public class SQLTemplateActionIT extends ServerCase { assertTrue(java.sql.Timestamp.class.isAssignableFrom(row.get("DOB").getClass())); } + @Test public void testExecuteUpdate() throws Exception { String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) " + "VALUES (#bind($id), #bind($name), #bind($dob 'DATE'))"; @@ -271,6 +278,7 @@ public class SQLTemplateActionIT extends ServerCase { assertEquals("a1", tArtist.getString("ARTIST_NAME").trim()); } + @Test public void testExecuteUpdateNoParameters() throws Exception { createFourArtists(); @@ -295,6 +303,7 @@ public class SQLTemplateActionIT extends ServerCase { } } + @Test public void testExecuteUpdateBatch() throws Exception { String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) " + "VALUES (#bind($id), #bind($name), #bind($dob 'DATE'))"; @@ -355,6 +364,7 @@ public class SQLTemplateActionIT extends ServerCase { // assertEquals(bindings2.get("dob"), row2.get("DATE_OF_BIRTH")); } + @Test public void testExtractTemplateString() throws Exception { SQLTemplate template = new SQLTemplate(Artist.class, "A\nBC"); SQLTemplateAction action = new SQLTemplateAction(template, node); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java index 40849fd..77df179 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SelectActionIT.java @@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.ClobTestRelation; import org.apache.cayenne.unit.UnitDbAdapter; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.List; @@ -53,6 +54,7 @@ public class SelectActionIT extends ServerCase { } } + @Test public void testFetchLimit_DistinctResultIterator() throws Exception { if (accessStackAdapter.supportsLobs()) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java index 542f7cd..fef421e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorIT.java @@ -29,6 +29,7 @@ import org.apache.cayenne.query.BatchQuery; import org.apache.cayenne.query.BatchQueryRow; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.sql.Types; @@ -40,6 +41,7 @@ public class DefaultBatchTranslatorIT extends ServerCase { @Inject private AdhocObjectFactory objectFactory; + @Test public void testConstructor() throws Exception { DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName()); DefaultBatchTranslator builder = new DefaultBatchTranslator(mock(BatchQuery.class), adapter, null) { @@ -62,6 +64,7 @@ public class DefaultBatchTranslatorIT extends ServerCase { assertSame(adapter, builder.adapter); } + @Test public void testAppendDbAttribute1() throws Exception { DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName()); String trimFunction = "testTrim"; @@ -98,6 +101,7 @@ public class DefaultBatchTranslatorIT extends ServerCase { assertEquals("testAttr", buf.toString()); } + @Test public void testAppendDbAttribute2() throws Exception { DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
