Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6203210EC9 for ; Tue, 4 Nov 2014 17:25:32 +0000 (UTC) Received: (qmail 80906 invoked by uid 500); 4 Nov 2014 17:25:32 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 80854 invoked by uid 500); 4 Nov 2014 17:25:32 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 80615 invoked by uid 99); 4 Nov 2014 17:25:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 17:25:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A9C858AE334; Tue, 4 Nov 2014 17:25:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aadamchik@apache.org To: commits@cayenne.apache.org Date: Tue, 04 Nov 2014 17:25:37 -0000 Message-Id: <9be156294bf44655abbc7bd44d75a551@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/12] Apply JUnit4 instead of JUnit3 in IT http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java index 16ce817..6acbd18 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java @@ -25,6 +25,7 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.testmap.CompoundPkTestEntity; 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 CompoundPkChangeIT extends ServerCase { @@ -48,6 +49,7 @@ public class CompoundPkChangeIT extends ServerCase { dbHelper.deleteAll("COMPOUND_PK_TEST"); } + @Test public void testCompoundPkChangeSingleElement() throws Exception { CompoundPkTestEntity object = context.newObject(CompoundPkTestEntity.class); @@ -103,6 +105,7 @@ public class CompoundPkChangeIT extends ServerCase { assertEquals(object.getObjectId(), refreshedObject.getObjectId()); } + @Test public void testCompoundPkChangeAllElements() throws Exception { CompoundPkTestEntity object = context.newObject(CompoundPkTestEntity.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java b/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java index d0f69eb..4a2f07f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java @@ -31,6 +31,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.SQLException; import java.sql.Types; @@ -87,6 +88,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase { } } + @Test public void testDisjointByIdPrefetch() throws Exception { insertData(); runtime.getDataDomain().setMaxIdQualifierSize(10); @@ -104,6 +106,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase { assertEquals(11, queriesCount); } + @Test public void testDisjointByIdPrefetch_Zero() throws Exception { insertData(); runtime.getDataDomain().setMaxIdQualifierSize(0); @@ -121,6 +124,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase { assertEquals(2, queriesCount); } + @Test public void testDisjointByIdPrefetch_Negative() throws Exception { insertData(); runtime.getDataDomain().setMaxIdQualifierSize(-1); @@ -138,6 +142,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase { assertEquals(2, queriesCount); } + @Test public void testIncrementalFaultList_Lower() throws Exception { insertData_OneBag_100Boxes(); @@ -168,7 +173,8 @@ public class DataContextMaxIdQualifierIT extends ServerCase { assertEquals(21, queriesCount); } - + + @Test public void testIncrementalFaultList_Higher() throws Exception { insertData_OneBag_100Boxes(); @@ -200,6 +206,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase { assertEquals(2, queriesCount); } + @Test public void testIncrementalFaultList_Zero() throws Exception { insertData_OneBag_100Boxes(); @@ -219,6 +226,7 @@ public class DataContextMaxIdQualifierIT extends ServerCase { assertEquals(2, queriesCount); } + @Test public void testIncrementalFaultList_Negative() throws Exception { insertData_OneBag_100Boxes(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java index 13c4228..d34016d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java @@ -25,6 +25,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.util.Util; +import org.junit.Test; import java.util.List; @@ -34,6 +35,7 @@ public class DataObjectSerializationIT extends ServerCase { @Inject private ObjectContext context; + @Test public void testSerializeTransient() throws Exception { Artist artist = new Artist(); artist.setArtistName("artist1"); @@ -46,6 +48,7 @@ public class DataObjectSerializationIT extends ServerCase { assertEquals("artist1", deserialized.getArtistName()); } + @Test public void testSerializeNew() throws Exception { Artist artist = context.newObject(Artist.class); artist.setArtistName("artist1"); @@ -68,6 +71,7 @@ public class DataObjectSerializationIT extends ServerCase { assertEquals(0, paintings.size()); } + @Test public void testSerializeNewWithFaults() throws Exception { Artist artist = context.newObject(Artist.class); artist.setArtistName("artist1"); @@ -88,6 +92,7 @@ public class DataObjectSerializationIT extends ServerCase { assertFalse(list.isFault()); } + @Test public void testSerializeCommitted() throws Exception { Artist artist = context.newObject(Artist.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java index b38937c..7246c62 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java @@ -33,6 +33,7 @@ import org.apache.cayenne.testdo.relationship.FlattenedTest2; import org.apache.cayenne.testdo.relationship.FlattenedTest3; 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; @@ -113,6 +114,7 @@ public class FlattenedRelationshipsIT extends ServerCase { tComplexJoin.insert(2002, 2, 3, "C"); } + @Test public void testInsertJoinWithPK() throws Exception { FlattenedTest1 obj01 = context.newObject(FlattenedTest1.class); FlattenedTest3 obj11 = context.newObject(FlattenedTest3.class); @@ -140,6 +142,7 @@ public class FlattenedRelationshipsIT extends ServerCase { assertEquals(2, ((List) related).size()); } + @Test public void testUnsetJoinWithPK() throws Exception { createCircularJoinDataSet(); @@ -170,6 +173,7 @@ public class FlattenedRelationshipsIT extends ServerCase { assertEquals(1, context.performQuery(joinSelect).size()); } + @Test public void testQualifyOnToManyFlattened() throws Exception { FlattenedTest1 obj01 = context.newObject(FlattenedTest1.class); FlattenedTest2 obj02 = context.newObject(FlattenedTest2.class); @@ -213,6 +217,7 @@ public class FlattenedRelationshipsIT extends ServerCase { assertSame(obj11, objects2.get(0)); } + @Test public void testToOneSeriesFlattenedRel() { FlattenedTest1 ft1 = (FlattenedTest1) context.newObject("FlattenedTest1"); @@ -239,6 +244,7 @@ public class FlattenedRelationshipsIT extends ServerCase { assertEquals("FT1Name", fetchedFT1.getName()); } + @Test public void testTakeObjectSnapshotFlattenedFault() throws Exception { createFlattenedTestDataSet(); @@ -257,6 +263,7 @@ public class FlattenedRelationshipsIT extends ServerCase { } + @Test public void testRefetchWithFlattenedFaultToOneTarget1() throws Exception { createFlattenedTestDataSet(); @@ -272,6 +279,7 @@ public class FlattenedRelationshipsIT extends ServerCase { assertTrue(ft3.readPropertyDirectly("toFT1") instanceof Fault); } + @Test public void testFlattenedCircular() throws Exception { createFlattenedCircularDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java index c7bae44..73468d1 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.List; @@ -46,6 +47,7 @@ public class GenericMappingIT extends ServerCase { dbHelper.deleteAll("GENERIC1"); } + @Test public void testInsertSingle() { DataObject g1 = (DataObject) context.newObject("Generic1"); g1.writeProperty("name", "G1 Name"); @@ -53,6 +55,7 @@ public class GenericMappingIT extends ServerCase { context.commitChanges(); } + @Test public void testInsertRelated() { DataObject g1 = (DataObject) context.newObject("Generic1"); g1.writeProperty("name", "G1 Name"); @@ -64,6 +67,7 @@ public class GenericMappingIT extends ServerCase { context.commitChanges(); } + @Test public void testSelect() { context.performNonSelectingQuery(new SQLTemplate( "Generic1", @@ -82,6 +86,7 @@ public class GenericMappingIT extends ServerCase { assertEquals(1, result.size()); } + @Test public void testUpdateRelated() { DataObject g1 = (DataObject) context.newObject("Generic1"); g1.writeProperty("name", "G1 Name"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java index 12d676d..9703962 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java @@ -24,6 +24,7 @@ import org.apache.cayenne.testdo.r1.Activity; import org.apache.cayenne.testdo.r1.ActivityResult; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.sql.Date; @@ -42,6 +43,7 @@ public class ManyToManyNoJoinIT extends ServerCase { dbHelper.deleteAll("RESULT"); } + @Test public void testValidateForSave1() throws Exception { ActivityResult result = context.newObject(ActivityResult.class); result.setAppointDate(new Date(System.currentTimeMillis())); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java index ce4d44a..65ed9a4 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java @@ -26,6 +26,7 @@ import org.apache.cayenne.testdo.relationship.RelationshipHelper; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.validation.ValidationResult; +import org.junit.Test; @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT) public class MeaningfulFKIT extends ServerCase { @@ -41,6 +42,7 @@ public class MeaningfulFKIT extends ServerCase { dbHelper.deleteAll("MEANINGFUL_FK"); } + @Test public void testValidateForSave1() throws Exception { MeaningfulFK testObject = context.newObject(MeaningfulFK.class); @@ -55,6 +57,7 @@ public class MeaningfulFKIT extends ServerCase { validation.getFailures().size()); } + @Test public void testValidateForSave2() throws Exception { MeaningfulFK testObject = context.newObject(MeaningfulFK.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java index 0bafab4..bc47ae0 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.oneway.OnewayTable3; import org.apache.cayenne.testdo.oneway.OnewayTable4; 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.util.List; @@ -65,6 +66,7 @@ public class OneWayRelationshipsIT extends ServerCase { t4Helper.setColumns("ID", "TABLE3_ID"); } + @Test public void testToOne_TwoNew() throws SQLException { OnewayTable1 t1 = context.newObject(OnewayTable1.class); @@ -79,6 +81,7 @@ public class OneWayRelationshipsIT extends ServerCase { assertEquals(t1Pk, t2FK); } + @Test public void testToOne_Replace() throws SQLException { t1Helper.insert(1).insert(2); @@ -99,6 +102,7 @@ public class OneWayRelationshipsIT extends ServerCase { assertEquals(2, t2FK); } + @Test public void testToOne_ReplaceWithNull() throws SQLException { t1Helper.insert(1); @@ -118,6 +122,7 @@ public class OneWayRelationshipsIT extends ServerCase { assertNull(t2FK); } + @Test public void testToMany_TwoNew() throws SQLException { OnewayTable3 t3 = context.newObject(OnewayTable3.class); @@ -132,6 +137,7 @@ public class OneWayRelationshipsIT extends ServerCase { assertEquals(t3Pk, t4FK); } + @Test public void testToMany_AddNew() throws SQLException { t3Helper.insert(1); @@ -159,6 +165,7 @@ public class OneWayRelationshipsIT extends ServerCase { } } + @Test public void testToMany_AddExisting() throws SQLException { t3Helper.insert(1); @@ -187,6 +194,7 @@ public class OneWayRelationshipsIT extends ServerCase { } } + @Test public void testToMany_RemoveExisting() throws SQLException { t3Helper.insert(1); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java index 9139841..24d880f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java @@ -24,6 +24,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; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class PersistenceByReachabilityIT extends ServerCase { @@ -34,6 +35,7 @@ public class PersistenceByReachabilityIT extends ServerCase { @Inject private ObjectContext context1; + @Test public void testToOneTargetTransient() throws Exception { Painting persistentDO = context.newObject(Painting.class); @@ -43,6 +45,7 @@ public class PersistenceByReachabilityIT extends ServerCase { assertEquals(PersistenceState.NEW, transientDO.getPersistenceState()); } + @Test public void testToOneTargetPersistent() throws Exception { Painting transientDO = context.newObject(Painting.class); @@ -52,6 +55,7 @@ public class PersistenceByReachabilityIT extends ServerCase { assertEquals(PersistenceState.NEW, transientDO.getPersistenceState()); } + @Test public void testToOneTargetDifferentContext() throws Exception { Painting doC1 = context.newObject(Painting.class); @@ -68,6 +72,7 @@ public class PersistenceByReachabilityIT extends ServerCase { } } + @Test public void testToManyTargetDifferentContext() throws Exception { Painting doC1 = context.newObject(Painting.class); Artist doC2 = context1.newObject(Artist.class); @@ -83,6 +88,7 @@ public class PersistenceByReachabilityIT extends ServerCase { } } + @Test public void testToManyTargetTransient() throws Exception { Painting transientDO = context.newObject(Painting.class); @@ -92,6 +98,7 @@ public class PersistenceByReachabilityIT extends ServerCase { assertEquals(PersistenceState.NEW, transientDO.getPersistenceState()); } + @Test public void testToManyTargetPersistent() throws Exception { Painting persistentDO = context.newObject(Painting.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java index 1defd66..baba75a 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java @@ -21,12 +21,14 @@ package org.apache.cayenne; 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; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class PersistentObjectIT extends ServerCase { + @Test public void testObjectContext() { ObjectContext context = mock(ObjectContext.class); PersistentObject object = new MockPersistentObject(); @@ -36,6 +38,7 @@ public class PersistentObjectIT extends ServerCase { assertSame(context, object.getObjectContext()); } + @Test public void testPersistenceState() { PersistentObject object = new MockPersistentObject(); assertEquals(PersistenceState.TRANSIENT, object.getPersistenceState()); @@ -43,6 +46,7 @@ public class PersistentObjectIT extends ServerCase { assertEquals(PersistenceState.DELETED, object.getPersistenceState()); } + @Test public void testObjectID() { ObjectId id = new ObjectId("test"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java index d8d71b8..05ce2ab 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java @@ -27,6 +27,7 @@ import org.apache.cayenne.test.jdbc.DBHelper; 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; /** * This test case ensures that PK pre-generated for the entity manually before commit is @@ -55,6 +56,7 @@ public class PregeneratedPKIT extends ServerCase { dbHelper.deleteAll("GALLERY"); } + @Test public void testLongPk() throws Exception { Artist a = context.newObject(Artist.class); a.setArtistName("XXX"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java index 3432c76..f7fbddb 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.BinaryPKTest2; 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; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextBinaryPKIT extends ServerCase { @@ -52,6 +53,7 @@ public class DataContextBinaryPKIT extends ServerCase { } } + @Test public void testInsertBinaryPK() throws Exception { if (accessStackAdapter.supportsBinaryPK()) { @@ -67,6 +69,7 @@ public class DataContextBinaryPKIT extends ServerCase { } } + @Test public void testFetchRelationshipBinaryPK() throws Exception { if (accessStackAdapter.supportsBinaryPK()) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java index da19e51..80b355a 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java @@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.BlobTestEntity; 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; @@ -62,7 +63,8 @@ public class DataContextBlobIT extends ServerCase { protected boolean skipEmptyLOBTests() { return !accessStackAdapter.handlesNullVsEmptyLOBs(); } - + + @Test public void testManyBlobsInOneTX() throws Exception { if (skipTests()) { return; @@ -85,6 +87,7 @@ public class DataContextBlobIT extends ServerCase { assertEquals(3, objects2.size()); } + @Test public void testEmptyBlob() throws Exception { if (skipTests()) { return; @@ -95,6 +98,7 @@ public class DataContextBlobIT extends ServerCase { runWithBlobSize(0); } + @Test public void test5ByteBlob() throws Exception { if (skipTests()) { return; @@ -102,6 +106,7 @@ public class DataContextBlobIT extends ServerCase { runWithBlobSize(5); } + @Test public void test5KByteBlob() throws Exception { if (skipTests()) { return; @@ -109,6 +114,7 @@ public class DataContextBlobIT extends ServerCase { runWithBlobSize(5 * 1024); } + @Test public void test1MBBlob() throws Exception { if (skipTests()) { return; @@ -116,6 +122,7 @@ public class DataContextBlobIT extends ServerCase { runWithBlobSize(1024 * 1024); } + @Test public void testNullBlob() throws Exception { if (skipTests()) { return; http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java index 9450aea..fdb98d7 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java @@ -28,6 +28,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; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextCallbacksIT extends ServerCase { @@ -56,6 +57,7 @@ public class DataContextCallbacksIT extends ServerCase { resolver.getCallbackRegistry().clear(); } + @Test public void testPostAddCallbacks() { LifecycleCallbackRegistry registry = runtime .getDataDomain() @@ -92,6 +94,7 @@ public class DataContextCallbacksIT extends ServerCase { assertSame(a3, listener2.getPublicCalledbackEntity()); } + @Test public void testPrePersistCallbacks() { LifecycleCallbackRegistry registry = runtime .getDataDomain() @@ -130,6 +133,7 @@ public class DataContextCallbacksIT extends ServerCase { assertSame(a3, listener2.getPublicCalledbackEntity()); } + @Test public void testPreRemoveCallbacks() { LifecycleCallbackRegistry registry = runtime .getDataDomain() http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java index f066bd4..5e0ac6a 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java @@ -26,6 +26,7 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.testmap.CharPkTestEntity; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.List; @@ -44,6 +45,7 @@ public class DataContextCharPKIT extends ServerCase { dbHelper.deleteAll("CHAR_PK_TEST"); } + @Test public void testInsert() throws Exception { CharPkTestEntity object = context.newObject(CharPkTestEntity.class); object.setOtherCol("object-XYZ"); @@ -74,6 +76,7 @@ public class DataContextCharPKIT extends ServerCase { assertEquals("PK1", val); } + @Test public void testDelete() throws Exception { CharPkTestEntity object = context.newObject(CharPkTestEntity.class); object.setOtherCol("object-XYZ"); @@ -93,6 +96,7 @@ public class DataContextCharPKIT extends ServerCase { assertEquals(0, rows.size()); } + @Test public void testUpdate() throws Exception { CharPkTestEntity object = context.newObject(CharPkTestEntity.class); object.setOtherCol("object-XYZ"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java index 2a69198..1b920f0 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.ReturnTypesMap1; 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; @@ -47,7 +48,8 @@ public class DataContextCharTypeIT extends ServerCase { protected void setUpAfterInjection() throws Exception { dbHelper.deleteAll("TYPES_MAPPING_TEST1"); } - + + @Test public void testCharTrimming() { if (unitDbAdapter.supportsLobs()) { ReturnTypesMap1 map1 = context.newObject(ReturnTypesMap1.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java index 4fae72b..1ee5119 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java @@ -26,6 +26,7 @@ import org.apache.cayenne.testdo.testmap.ClobTestEntity; 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; @@ -62,6 +63,7 @@ public class DataContextClobIT extends ServerCase { return !accessStackAdapter.handlesNullVsEmptyLOBs(); } + @Test public void testEmptyClob() throws Exception { if (skipEmptyLOBTests()) { return; @@ -69,6 +71,7 @@ public class DataContextClobIT extends ServerCase { runWithClobSize(0); } + @Test public void test5ByteClob() throws Exception { if (skipTests()) { return; @@ -76,6 +79,7 @@ public class DataContextClobIT extends ServerCase { runWithClobSize(5); } + @Test public void test5KByteClob() throws Exception { if (skipTests()) { return; @@ -83,6 +87,7 @@ public class DataContextClobIT extends ServerCase { runWithClobSize(5 * 1024); } + @Test public void test1MBClob() throws Exception { if (skipTests()) { return; @@ -90,6 +95,7 @@ public class DataContextClobIT extends ServerCase { runWithClobSize(1024 * 1024); } + @Test public void testNullClob() throws Exception { if (skipTests()) { return; http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java index 30784e1..d0510a1 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.NullTestEntity; 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; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextCommitIT extends ServerCase { @@ -48,6 +49,7 @@ public class DataContextCommitIT extends ServerCase { dbHelper.deleteAll("NULL_TEST"); } + @Test public void testFlushToParent_Commit() { // commit new object http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java index fcd2563..c1d8496 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.CompoundFkTestEntity; import org.apache.cayenne.testdo.testmap.CompoundPkTestEntity; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.List; @@ -52,6 +53,7 @@ public class DataContextCompoundRelIT extends ServerCase { dbHelper.deleteAll("COMPOUND_PK_TEST"); } + @Test public void testInsert() { CompoundPkTestEntity master = context.newObject(CompoundPkTestEntity.class); @@ -79,6 +81,7 @@ public class DataContextCompoundRelIT extends ServerCase { assertEquals("d1", detail.getName()); } + @Test public void testFetchQualifyingToOne() { CompoundPkTestEntity master = (CompoundPkTestEntity) context .newObject("CompoundPkTestEntity"); @@ -115,6 +118,7 @@ public class DataContextCompoundRelIT extends ServerCase { assertEquals("d1", detail.getName()); } + @Test public void testFetchQualifyingToMany() throws Exception { CompoundPkTestEntity master = (CompoundPkTestEntity) context .newObject("CompoundPkTestEntity"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java index 2a50584..3a3d7ed 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCrossDBIT.java @@ -25,6 +25,7 @@ import org.apache.cayenne.testdo.db2.CrossdbM2E1; import org.apache.cayenne.testdo.db2.CrossdbM2E2; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; @UseServerRuntime(ServerCase.MULTINODE_PROJECT) public class DataContextCrossDBIT extends ServerCase { @@ -32,6 +33,7 @@ public class DataContextCrossDBIT extends ServerCase { @Inject private DataContext context; + @Test public void testMultiDBUpdate() { // for now testing that no exceptions are thrown... wouldn't hurt to check the http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java index 2f9bdbc..ca04495 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java @@ -30,6 +30,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.util.EventUtil; +import org.junit.Test; /** * Tests that DataContext sends DataChannel events. @@ -46,6 +47,7 @@ public class DataContextDataChannelEventsIT extends ServerCase { @Inject private ServerRuntime runtime; + @Test public void testCommitEvent() throws Exception { Artist a = context.newObject(Artist.class); a.setArtistName("X"); @@ -69,6 +71,7 @@ public class DataContextDataChannelEventsIT extends ServerCase { } + @Test public void testRollbackEvent() throws Exception { Artist a = context.newObject(Artist.class); a.setArtistName("X"); @@ -91,6 +94,7 @@ public class DataContextDataChannelEventsIT extends ServerCase { }.runTest(10000); } + @Test public void testChangeEventOnChildChange() throws Exception { Artist a = context.newObject(Artist.class); a.setArtistName("X"); @@ -117,6 +121,7 @@ public class DataContextDataChannelEventsIT extends ServerCase { }.runTest(10000); } + @Test public void testChangeEventOnPeerChange() throws Exception { Artist a = context.newObject(Artist.class); a.setArtistName("X"); @@ -141,6 +146,7 @@ public class DataContextDataChannelEventsIT extends ServerCase { }.runTest(10000); } + @Test public void testChangeEventOnPeerChangeSecondNestingLevel() throws Exception { ObjectContext childPeer1 = runtime.newContext(context); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java index a740643..0c6c807 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java @@ -35,6 +35,7 @@ import org.apache.cayenne.test.jdbc.DBHelper; 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.Map; @@ -56,6 +57,7 @@ public class DataContextDecoratedStackIT extends ServerCase { dbHelper.deleteAll("ARTIST"); } + @Test public void testCommitDecorated() { DataDomain dd = runtime.getDataDomain(); DataChannel decorator = new DataChannelDecorator(dd); @@ -80,6 +82,7 @@ public class DataContextDecoratedStackIT extends ServerCase { assertEquals(new Integer(1), count.get("x")); } + @Test public void testGetParentDataDomain() { DataDomain dd = runtime.getDataDomain(); DataChannel decorator = new DataChannelDecorator(dd); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java index a86b751..38cc1c6 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Gallery; 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.List; @@ -67,6 +68,7 @@ public class DataContextDelegateIT extends ServerCase { context.commitChanges(); } + @Test public void testWillPerformGenericQuery() throws Exception { final List queriesPerformed = new ArrayList(1); @@ -90,6 +92,7 @@ public class DataContextDelegateIT extends ServerCase { assertTrue("Delegate unexpectedly blocked the query.", query.isRouteCalled()); } + @Test public void testWillPerformGenericQueryBlocked() throws Exception { final List queriesPerformed = new ArrayList(1); @@ -112,6 +115,7 @@ public class DataContextDelegateIT extends ServerCase { assertFalse("Delegate couldn't block the query.", query.isRouteCalled()); } + @Test public void testWillPerformQuery() throws Exception { final List queriesPerformed = new ArrayList(1); @@ -135,6 +139,7 @@ public class DataContextDelegateIT extends ServerCase { assertNotNull(results); } + @Test public void testWillPerformQueryBlocked() throws Exception { final List queriesPerformed = new ArrayList(1); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java index d18d4de..5f4fc80 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.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; import java.util.Date; @@ -55,6 +56,7 @@ public class DataContextDelegateSharedCacheIT extends ServerCase { * Test case to prove that delegate method is invoked on external change of object in * the store. */ + @Test public void testShouldMergeChanges() throws Exception { final boolean[] methodInvoked = new boolean[1]; @@ -98,6 +100,7 @@ public class DataContextDelegateSharedCacheIT extends ServerCase { * * @throws Exception */ + @Test public void testBlockedShouldMergeChanges() throws Exception { String oldName = artist.getArtistName(); @@ -132,6 +135,7 @@ public class DataContextDelegateSharedCacheIT extends ServerCase { * * @throws Exception */ + @Test public void testShouldProcessDeleteOnExternalChange() throws Exception { final boolean[] methodInvoked = new boolean[1]; @@ -175,6 +179,7 @@ public class DataContextDelegateSharedCacheIT extends ServerCase { * * @throws Exception */ + @Test public void testBlockShouldProcessDeleteOnExternalChange() throws Exception { final boolean[] methodInvoked = new boolean[1]; http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java index 47b2ba3..e870521 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java @@ -32,6 +32,7 @@ import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.testdo.testmap.PaintingInfo; 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; @@ -61,6 +62,7 @@ public class DataContextDeleteRulesIT extends ServerCase { dbHelper.deleteAll("GALLERY"); } + @Test public void testNullifyToOne() { // ArtGroup toParentGroup ArtGroup parentGroup = (ArtGroup) context.newObject("ArtGroup"); @@ -94,6 +96,7 @@ public class DataContextDeleteRulesIT extends ServerCase { * Tests that deleting a source of a flattened relationship with CASCADE rule results * in deleting a join and a target. */ + @Test public void testCascadeToManyFlattened() { // testing Artist.groupArray relationship ArtGroup aGroup = context.newObject(ArtGroup.class); @@ -126,6 +129,7 @@ public class DataContextDeleteRulesIT extends ServerCase { * Tests that deleting a source of a flattened relationship with NULLIFY rule results * in deleting a join together with the object deleted. */ + @Test public void testNullifyToManyFlattened() { // testing ArtGroup.artistArray relationship ArtGroup aGroup = context.newObject(ArtGroup.class); @@ -155,6 +159,7 @@ public class DataContextDeleteRulesIT extends ServerCase { assertEquals(0, joins2.size()); } + @Test public void testNullifyToMany() { // ArtGroup childGroupsArray ArtGroup parentGroup = (ArtGroup) context.newObject("ArtGroup"); @@ -180,6 +185,7 @@ public class DataContextDeleteRulesIT extends ServerCase { context.commitChanges(); } + @Test public void testCascadeToOne() { // Painting toPaintingInfo Painting painting = (Painting) context.newObject("Painting"); @@ -201,6 +207,7 @@ public class DataContextDeleteRulesIT extends ServerCase { context.commitChanges(); } + @Test public void testCascadeToMany() { // Artist artistExhibitArray Artist anArtist = (Artist) context.newObject("Artist"); @@ -229,6 +236,7 @@ public class DataContextDeleteRulesIT extends ServerCase { context.commitChanges(); } + @Test public void testDenyToMany() { // Gallery paintingArray Gallery gallery = (Gallery) context.newObject("Gallery"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java index 0d91102..cebf478 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java @@ -33,6 +33,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.ArrayList; @@ -110,6 +111,7 @@ public class DataContextDisjointByIdPrefetchIT extends ServerCase { tPaintingInfo.insert(2, "green"); } + @Test public void testOneToMany() throws Exception { createArtistWithTwoPaintingsDataSet(); @@ -140,6 +142,7 @@ public class DataContextDisjointByIdPrefetchIT extends ServerCase { }); } + @Test public void testManyToOne() throws Exception { createArtistWithTwoPaintingsDataSet(); @@ -159,6 +162,7 @@ public class DataContextDisjointByIdPrefetchIT extends ServerCase { }); } + @Test public void testFetchLimit() throws Exception { createThreeArtistsWithPlentyOfPaintingsDataSet(); @@ -193,6 +197,7 @@ public class DataContextDisjointByIdPrefetchIT extends ServerCase { }); } + @Test public void testOneToOneRelationship() throws Exception { createTwoPaintingsWithInfosDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java index 4c7057f..c46197c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java @@ -37,6 +37,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.ArrayList; import java.util.Arrays; @@ -191,6 +192,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase { context.invalidateObjects(invalidate); } + @Test public void testFlattenedRelationship() throws Exception { createBagWithTwoBoxesAndPlentyOfBallsDataSet(); @@ -218,6 +220,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase { }); } + @Test public void testFlattenedMultiColumnRelationship() throws Exception { createBagWithTwoBoxesAndPlentyOfBallsDataSet(); @@ -245,6 +248,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase { }); } + @Test public void testLongFlattenedRelationship() throws Exception { createBagWithTwoBoxesAndPlentyOfBallsDataSet(); @@ -272,6 +276,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase { }); } + @Test public void testMultiColumnRelationship() throws Exception { createBagWithTwoBoxesAndPlentyOfBallsDataSet(); @@ -295,6 +300,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase { }); } + @Test public void testJointPrefetchInParent() throws Exception { createBagWithTwoBoxesAndPlentyOfBallsDataSet(); @@ -326,6 +332,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase { }); } + @Test public void testJointPrefetchInChild() throws Exception { createBagWithTwoBoxesAndPlentyOfBallsDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java index ab9a5b4..fbd80c2 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java @@ -26,6 +26,7 @@ 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.math.BigDecimal; import java.sql.Types; @@ -70,6 +71,7 @@ public class DataContextEJBQLArrayResultIT extends ServerCase { tPainting.insert(33003, null, "P3", 5000); } + @Test public void testSQLResultSetMappingScalar() throws Exception { String ejbql = "SELECT count(p) FROM Painting p JOIN p.toArtist a"; @@ -83,6 +85,7 @@ public class DataContextEJBQLArrayResultIT extends ServerCase { assertEquals(new Long(2), o1); } + @Test public void testSQLResultSetMappingScalars() throws Exception { String ejbql = "SELECT count(p), sum(p.estimatedPrice) FROM Painting p JOIN p.toArtist a"; @@ -101,6 +104,7 @@ public class DataContextEJBQLArrayResultIT extends ServerCase { assertEquals(0, new BigDecimal(8000).compareTo((BigDecimal) array1[1])); } + @Test public void testSQLResultSetMappingMixed() throws Exception { String ejbql = "SELECT count(p), a, sum(p.estimatedPrice) " http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java index 52ee3af..09e35fd 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java @@ -30,6 +30,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.math.BigDecimal; import java.sql.Types; @@ -108,6 +109,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { tPainting.insert(33014, null, "C", 5000); } + @Test public void testDateParameter() throws Exception { createCollectionDataSet(); @@ -128,6 +130,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertSame(allArtists.get(0), objects.get(0)); } + @Test public void testArithmetics() throws Exception { createLikeDataSet(); @@ -153,6 +156,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { // assertTrue(ids.contains(new Integer(33002))); } + @Test public void testLike1() throws Exception { createLikeDataSet(); @@ -172,6 +176,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(new Integer(33001))); } + @Test public void testNotLike() throws Exception { createLikeDataSet(); @@ -191,6 +196,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertFalse(ids.contains(new Integer(33001))); } + @Test public void testLike2() throws Exception { createLikeDataSet(); @@ -212,6 +218,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(new Integer(33005))); } + @Test public void testLikeEscape() throws Exception { createLikeDataSet(); @@ -231,6 +238,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(new Integer(33005))); } + @Test public void testLikeEscape_LikeParameter() throws Exception { createLikeDataSet(); @@ -252,6 +260,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(new Integer(33005))); } + @Test public void testLikeNullParameter() { Artist a1 = context.newObject(Artist.class); a1.setArtistName("a1"); @@ -269,6 +278,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertNotNull(Cayenne.objectForQuery(context, eq2)); } + @Test public void testIn() throws Exception { createInDataSet(); @@ -289,6 +299,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(new Integer(33007))); } + @Test public void testNotIn() throws Exception { createInDataSet(); @@ -308,6 +319,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(new Integer(33008))); } + @Test public void testInSubquery() throws Exception { createInSubqueryDataSet(); @@ -330,6 +342,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(new Integer(33014))); } + @Test public void testCollectionEmpty() throws Exception { createCollectionDataSet(); @@ -349,6 +362,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(new Long(33003))); } + @Test public void testCollectionNotEmpty() throws Exception { createCollectionDataSet(); @@ -369,6 +383,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(33002l)); } + @Test public void testCollectionNotEmptyExplicitDistinct() throws Exception { createCollectionDataSet(); @@ -389,6 +404,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(33002l)); } + @Test public void testCollectionMemberOfParameter() throws Exception { createCollectionDataSet(); @@ -409,6 +425,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(33001l)); } + @Test public void testGreaterOrEquals() throws Exception { createGreaterThanDataSet(); @@ -420,6 +437,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertEquals(4, objects.size()); } + @Test public void testLessOrEquals() throws Exception { createGreaterThanDataSet(); @@ -431,6 +449,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertEquals(2, objects.size()); } + @Test public void testCollectionNotMemberOfParameter() throws Exception { createCollectionDataSet(); @@ -452,6 +471,7 @@ public class DataContextEJBQLConditionsIT extends ServerCase { assertTrue(ids.contains(33003l)); } + @Test public void testCollectionMemberOfThetaJoin() throws Exception { createCollectionDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java index 9a921f9..b1b59ef 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.inherit.Department; import org.apache.cayenne.testdo.inherit.Manager; 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.HashSet; @@ -112,6 +113,7 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase { context.commitChanges(); } + @Test public void testCollectionMemberOfId() throws Exception { String ejbql = "SELECT DISTINCT m FROM Manager m JOIN m.managedDepartments d" @@ -132,6 +134,7 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase { assertTrue(ids.contains("m3")); } + @Test public void testCollectionNotMemberOfId() throws Exception { String ejbql = "SELECT DISTINCT m FROM Manager m JOIN m.managedDepartments d" @@ -151,6 +154,7 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase { assertTrue(ids.contains("m2")); } + @Test public void testCollectionNotMemberOfToOne() throws Exception { // need a better test ... this query returns zero rows by definition http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java index 728adaf..1b21506 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java @@ -29,6 +29,7 @@ import org.apache.cayenne.test.jdbc.TableHelper; 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; import java.util.List; @@ -86,6 +87,7 @@ public class DataContextEJBQLDeleteIT extends ServerCase { } } + @Test public void testDeleteNoIdVar() throws Exception { createPaintingsDataSet(); @@ -100,6 +102,7 @@ public class DataContextEJBQLDeleteIT extends ServerCase { assertEquals(2, count[0]); } + @Test public void testDeleteNoQualifier() throws Exception { createPaintingsDataSet(); @@ -114,6 +117,7 @@ public class DataContextEJBQLDeleteIT extends ServerCase { assertEquals(2, count[0]); } + @Test public void testDeleteSameEntityQualifier() throws Exception { createPaintingsDataSet(); @@ -133,6 +137,7 @@ public class DataContextEJBQLDeleteIT extends ServerCase { assertNull(Cayenne.objectForPK(freshContext, Painting.class, 33002)); } + @Test public void testDeleteIdVar() throws Exception { createMeaningfulPKDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java index 2a686d5..8141130 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java @@ -34,6 +34,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.Date; import java.sql.Types; @@ -118,6 +119,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase { tArtistExhibit.insert(1, 2); } + @Test public void testFetchJoinForOneEntity() throws Exception { createOneFetchJoinDataSet(); @@ -151,6 +153,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase { }); } + @Test public void testSeveralFetchJoins() throws Exception { createMultipleFetchJoinsDataSet(); @@ -206,6 +209,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase { }); } + @Test public void testSeveralEntitiesFetchJoins() throws Exception { createMultipleFetchJoinsDataSet(); @@ -228,6 +232,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase { }); } + @Test public void testSeveralEntitiesAndScalarFetchInnerJoins() throws Exception { createMultipleFetchJoinsDataSet(); @@ -307,6 +312,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase { }); } + @Test public void testSeveralEntitiesAndScalarFetchOuterJoins() throws Exception { createMultipleFetchJoinsDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java index b755c1a..1e48da4 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.relationship.FlattenedTest1; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.HashSet; import java.util.Iterator; @@ -80,6 +81,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { ft4Helper.insert(1, 1, "ft4"); } + @Test public void testCollectionMemberOfThetaJoin() throws Exception { createFt123(); @@ -104,6 +106,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { assertTrue(ids.contains(3)); } + @Test public void testCollectionMemberOfThetaJoinLongRelationshipSequence() throws Exception { @@ -135,6 +138,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { assertEquals(0, objects.size()); } + @Test public void testCollectionInnerJoin() throws Exception { createFt123(); @@ -160,6 +164,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { } + @Test public void testCollectionAsInnerJoin() throws Exception { createFt123(); @@ -187,6 +192,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { } + @Test public void testCollectionThetaJoin() throws Exception { createFt123(); @@ -210,6 +216,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { } + @Test public void testCollectionIdentificationVariable() throws Exception { createFt123(); @@ -236,6 +243,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { } + @Test public void testAssociationFieldSelect() throws Exception { createFt123(); @@ -259,6 +267,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { } + @Test public void testCollectionSubquery() throws Exception { createFt123(); @@ -281,6 +290,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { } + @Test public void testCollectionSubquery1() throws Exception { createFt123(); @@ -306,6 +316,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { } + @Test public void testGroupByFlattenedRelationship() throws Exception { createFt123(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java index 7884520..60ffb8f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java @@ -18,11 +18,6 @@ ****************************************************************/ package org.apache.cayenne.access; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Calendar; -import java.util.List; - import org.apache.cayenne.Cayenne; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.di.Inject; @@ -38,6 +33,12 @@ import org.apache.cayenne.testdo.testmap.Painting; 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.math.BigInteger; +import java.util.Calendar; +import java.util.List; // TODO: renamed as it fails on DB's like Derby. See CAY-1480. @UseServerRuntime(ServerCase.TESTMAP_PROJECT) @@ -65,6 +66,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { dbHelper.deleteAll("DATE_TEST"); } + @Test public void testCURRENT_DATE() { Calendar cal = Calendar.getInstance(); @@ -87,6 +89,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(o2)); } + @Test public void testCURRENT_TIME() { Calendar cal = Calendar.getInstance(); @@ -109,6 +112,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(o1)); } + @Test public void testCURRENT_TIMESTAMP() { Calendar cal = Calendar.getInstance(); @@ -133,6 +137,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(o1)); } + @Test public void testABS() { BigDecimalEntity o1 = context.newObject(BigDecimalEntity.class); @@ -150,6 +155,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(o2)); } + @Test public void testSQRT() { BigDecimalEntity o1 = context.newObject(BigDecimalEntity.class); @@ -167,6 +173,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(o2)); } + @Test public void testMOD() { BigIntegerEntity o1 = context.newObject(BigIntegerEntity.class); @@ -184,6 +191,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(o2)); } + @Test public void testSIZE() { Artist a1 = context.newObject(Artist.class); @@ -215,6 +223,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { // assertTrue(objects2.contains(a1)); } + @Test public void testCONCAT() { Painting a1 = context.newObject(Painting.class); @@ -231,6 +240,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(a1)); } + @Test public void testSUBSTRING() { Artist a1 = context.newObject(Artist.class); @@ -247,6 +257,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(a2)); } + @Test public void testLOWER() { Artist a1 = context.newObject(Artist.class); @@ -268,6 +279,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(a2)); } + @Test public void testUPPER() { Artist a1 = context.newObject(Artist.class); @@ -289,6 +301,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(a2)); } + @Test public void testLENGTH() { Artist a1 = context.newObject(Artist.class); @@ -309,6 +322,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(a2)); } + @Test public void testLOCATE() { Artist a1 = context.newObject(Artist.class); @@ -325,6 +339,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { assertTrue(objects.contains(a2)); } + @Test public void testTRIM() { // insert via a SQL template to prevent adapter trimming and such... @@ -369,6 +384,7 @@ public class DataContextEJBQLFunctionalExpressions extends ServerCase { } + @Test public void testTRIMChar() { if (!accessStackAdapter.supportsTrimChar()) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java index f13b7ba..268fb1e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Gallery; 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.Types; @@ -114,6 +115,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { tPainting.insert(33010, 33001, 33002, "P112", 5000); } + @Test public void testGroupBy() throws Exception { createFivePaintings(); @@ -135,6 +137,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { assertEquals(new Long(2l), row1[1]); } + @Test public void testGroupByMultipleItems() throws Exception { createFivePaintings(); @@ -163,6 +166,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { assertEquals(new Long(2), row2[2]); } + @Test public void testGroupByRelatedEntity() throws Exception { createFourArtistsAndTwoPaintings(); @@ -183,6 +187,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { assertTrue(row0[1] instanceof Artist); } + @Test public void testGroupByIdVariable() throws Exception { createFivePaintings(); @@ -203,6 +208,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { // } } + @Test public void testGroupByHavingOnColumn() throws Exception { createFivePaintings(); @@ -220,6 +226,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { assertEquals(new Long(2), row0[1]); } + @Test public void testGroupByHavingOnAggregate() throws Exception { createFivePaintings(); @@ -237,6 +244,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { assertEquals(new Long(3l), row0[1]); } + @Test public void testGroupByHavingOnAggregateMultipleConditions() throws Exception { createFivePaintings(); @@ -254,6 +262,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { assertEquals(new Long(3l), row0[1]); } + @Test public void testGroupByJoinedRelatedEntities() throws Exception { createFourArtistsAndTwoPaintings(); @@ -278,6 +287,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { assertTrue("error artistName:" + artistName, expectedArtists.contains(artistName)); } + @Test public void testGroupByJoinedEntities() throws Exception { createArtistsPaintingGalleries(); EJBQLQuery query = new EJBQLQuery( @@ -300,6 +310,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { } } + @Test public void testGroupByJoinedEntityInCount() throws Exception { createArtistsPaintingGalleries(); @@ -321,6 +332,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { } } + @Test public void testGroupByChainedJoins() throws Exception { createFivePaintings(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java index 69cbf00..fd9ab47 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.inherit.Employee; import org.apache.cayenne.testdo.inherit.Manager; 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; @@ -64,6 +65,7 @@ public class DataContextEJBQLInheritanceIT extends ServerCase { person.insert(6, "e", "C", null); } + @Test public void testSelect() throws Exception { EJBQLQuery superclass = new EJBQLQuery("select p from AbstractPerson 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/DataContextEJBQLIsNullIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java index 5bcfe79..8df591f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.TableHelper; 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.sql.Types; import java.util.List; @@ -81,6 +82,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase { tPainting.insert(33003, 33001, "C", 500); } + @Test public void testCompareToNull() throws Exception { // the query below can blow up on FrontBase. See CAY-819 for details. @@ -102,6 +104,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase { context.performQuery(query1); } + @Test public void testCompareToNull2() throws Exception { if (!accessStackAdapter.supportsEqualNullSyntax()) { @@ -117,6 +120,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase { context.performQuery(query1); } + @Test public void testCompareToNull3() throws Exception { if (!accessStackAdapter.supportsEqualNullSyntax()) { return; @@ -131,6 +135,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase { context.performQuery(query1); } + @Test public void testIsNull() throws Exception { createTwoPaintings(); @@ -143,6 +148,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase { assertEquals(33001, Cayenne.intPKForObject((Persistent) results.get(0))); } + @Test public void testIsNotNull() throws Exception { createTwoPaintings(); @@ -155,6 +161,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase { assertEquals(33002, Cayenne.intPKForObject((Persistent) results.get(0))); } + @Test public void testToOneIsNull() throws Exception { createTwoPaintingsAndOneArtist(); @@ -167,6 +174,7 @@ public class DataContextEJBQLIsNullIT extends ServerCase { assertEquals(33001, Cayenne.intPKForObject((Persistent) results.get(0))); } + @Test public void testToOneIsNotNull() throws Exception { createTwoPaintingsAndOneArtist(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java index 774b729..59acfd6 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java @@ -27,6 +27,7 @@ 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.sql.Types; import java.util.HashSet; @@ -111,6 +112,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase { tPainting.insert(33007, 33001, null, "P2", 5000); } + @Test public void testThetaJoins() throws Exception { createFourArtistsFourPaintings(); @@ -133,6 +135,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase { assertTrue(names.contains("BB2")); } + @Test public void testInnerJoins() throws Exception { createTwoArtistsOnePainting(); @@ -145,6 +148,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase { assertEquals(33001, Cayenne.intPKForObject((Artist) artists.get(0))); } + @Test public void testOuterJoins() throws Exception { createTwoArtistsOnePainting(); @@ -165,6 +169,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase { assertTrue(ids.contains(33005l)); } + @Test public void testChainedJoins() throws Exception { createTwoArtistsTwoPaintingsTwoGalleries(); @@ -179,6 +184,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase { assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0))); } + @Test public void testImplicitJoins() throws Exception { createTwoArtistsTwoPaintingsTwoGalleries(); @@ -196,6 +202,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase { assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0))); } + @Test public void testPartialImplicitJoins1() throws Exception { createTwoArtistsTwoPaintingsTwoGalleries(); @@ -208,6 +215,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase { assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0))); } + @Test public void testPartialImplicitJoins2() throws Exception { createTwoArtistsTwoPaintingsTwoGalleries(); @@ -220,6 +228,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase { assertEquals(33002, Cayenne.intPKForObject((Artist) artists.get(0))); } + @Test public void testMultipleJoinsToTheSameTable() throws Exception { createTwoArtistsThreePaintings(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java index 8800098..3450b71 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java @@ -27,6 +27,7 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; 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; @@ -86,6 +87,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase { tPainting.insert(33006, 33002, "C", 500); } + @Test public void testOrderByDefault() throws Exception { createThreePaintings(); @@ -111,6 +113,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase { assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(2))); } + @Test public void testOrderByAsc() throws Exception { createThreePaintings(); @@ -136,6 +139,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase { assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(2))); } + @Test public void testOrderByDesc() throws Exception { createThreePaintings(); @@ -160,6 +164,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase { assertEquals(33003, Cayenne.intPKForObject((Persistent) results2.get(2))); } + @Test public void testOrderByQualified() throws Exception { createThreePaintings(); @@ -182,6 +187,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase { assertEquals(33001, Cayenne.intPKForObject((Persistent) results2.get(1))); } + @Test public void testOrderByMultiple() throws Exception { createFourPaintings(); @@ -197,6 +203,7 @@ public class DataContextEJBQLOrderByIT extends ServerCase { assertEquals(33001, Cayenne.intPKForObject((Persistent) results1.get(3))); } + @Test public void testOrderByPath() throws Exception { createTwoArtistsTwoPaintings();