http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 3ae0c34..6cd67d2 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 @@ -30,8 +30,10 @@ import org.apache.cayenne.testdo.testmap.Exhibit; import org.apache.cayenne.testdo.testmap.Gallery; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.testdo.testmap.PaintingInfo; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -46,7 +48,7 @@ import static org.junit.Assert.fail; // TODO: redefine all test cases in terms of entities in "relationships" map // and merge this test case with DeleteRulesTst that inherits // from RelationshipTestCase. -@UseServerRuntime("cayenne-small-testmap.xml") +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextDeleteRulesIT extends ServerCase { @Inject @@ -55,17 +57,9 @@ public class DataContextDeleteRulesIT extends ServerCase { @Inject private DBHelper dbHelper; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); + @Before + public void testSetUp() throws Exception { dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); - dbHelper.deleteAll("ARTGROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); } @Test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 272e61f..582eb04 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 @@ -31,8 +31,10 @@ import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.testdo.testmap.PaintingInfo; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -45,7 +47,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextDisjointByIdPrefetchIT extends ServerCase { @Inject @@ -61,14 +63,8 @@ public class DataContextDisjointByIdPrefetchIT extends ServerCase { private TableHelper tPainting; private TableHelper tPaintingInfo; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 2d43bf5..ba4b6c2 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 @@ -35,8 +35,10 @@ import org.apache.cayenne.testdo.things.BoxInfo; import org.apache.cayenne.testdo.things.Thing; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.util.ArrayList; @@ -50,7 +52,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.THINGS_PROJECT) +@UseServerRuntime(CayenneProjects.THINGS_PROJECT) public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase { @Inject @@ -67,15 +69,8 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase { protected TableHelper tBoxThing; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("BALL"); - dbHelper.deleteAll("BOX_THING"); - dbHelper.deleteAll("THING"); - dbHelper.deleteAll("BOX_INFO"); - dbHelper.deleteAll("BOX"); - dbHelper.deleteAll("BAG"); - + @Before + public void testSetUp() throws Exception { tBoxThing = new TableHelper(dbHelper, "BOX_THING"); tBoxThing.setColumns("BOX_ID", "THING_WEIGHT", "THING_VOLUME"); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 d0955c9..b924325 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 @@ -24,8 +24,10 @@ import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.math.BigDecimal; @@ -35,7 +37,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLArrayResultIT extends ServerCase { @Inject @@ -44,14 +46,8 @@ public class DataContextEJBQLArrayResultIT extends ServerCase { @Inject protected DBHelper dbHelper; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { TableHelper tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); tArtist.insert(33001, "AA1"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 b283614..360967e 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 @@ -28,8 +28,10 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.math.BigDecimal; @@ -46,7 +48,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLConditionsIT extends ServerCase { @Inject @@ -58,14 +60,8 @@ public class DataContextEJBQLConditionsIT extends ServerCase { protected TableHelper tArtist; protected TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 2dd5dde..c83399f 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 @@ -26,8 +26,10 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.inheritance_people.Address; import org.apache.cayenne.testdo.inheritance_people.Department; import org.apache.cayenne.testdo.inheritance_people.Manager; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -39,7 +41,7 @@ import java.util.Set; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.PEOPLE_PROJECT) +@UseServerRuntime(CayenneProjects.PEOPLE_PROJECT) public class DataContextEJBQLConditionsPeopleIT extends ServerCase { @Inject @@ -48,8 +50,8 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase { @Inject private ObjectContext context; - @Override - protected void setUpAfterInjection() throws Exception { + @Before + public void testSetUp() throws Exception { TableHelper tPerson = new TableHelper(dbHelper, "PERSON"); tPerson.setColumns( @@ -63,12 +65,6 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase { // manually break circular deps tPerson.update().set("DEPARTMENT_ID", null, Types.INTEGER).execute(); - dbHelper.deleteAll("ADDRESS"); - dbHelper.deleteAll("DEPARTMENT"); - dbHelper.deleteAll("PERSON_NOTES"); - dbHelper.deleteAll("PERSON"); - dbHelper.deleteAll("CLIENT_COMPANY"); - // TODO: use TableHelper to create test data Department d1 = context.newObject(Department.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java index 03db219..8b0a25a 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java @@ -22,8 +22,8 @@ package org.apache.cayenne.access; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.EJBQLQuery; -import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.date_time.DateTestEntity; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -34,20 +34,12 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.DATE_TIME_PROJECT) +@UseServerRuntime(CayenneProjects.DATE_TIME_PROJECT) public class DataContextEJBQLDateTimeFunctionalExpressionsIT extends ServerCase { @Inject - protected DBHelper dbHelper; - - @Inject private ObjectContext context; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("DATE_TEST"); - } - @Test public void testCURRENT_DATE() { http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 f29f219..fe44df1 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 @@ -27,8 +27,10 @@ import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Painting; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -37,7 +39,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLDeleteIT extends ServerCase { @Inject @@ -51,14 +53,8 @@ public class DataContextEJBQLDeleteIT extends ServerCase { protected TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tPainting = new TableHelper(dbHelper, "PAINTING"); tPainting.setColumns( "PAINTING_ID", http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeletePKIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeletePKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeletePKIT.java index 9a950a2..cfe9168 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeletePKIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeletePKIT.java @@ -25,8 +25,10 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.util.List; @@ -34,7 +36,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@UseServerRuntime(ServerCase.MEANINGFUL_PK_PROJECT) +@UseServerRuntime(CayenneProjects.MEANINGFUL_PK_PROJECT) public class DataContextEJBQLDeletePKIT extends ServerCase { @Inject @@ -45,11 +47,8 @@ public class DataContextEJBQLDeletePKIT extends ServerCase { protected TableHelper tMeaningfulPKTest1Table; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("MEANINGFUL_PK_DEP"); - dbHelper.deleteAll("MEANINGFUL_PK_TEST1"); - + @Before + public void testSetUp() throws Exception { tMeaningfulPKTest1Table = new TableHelper(dbHelper, "MEANINGFUL_PK_TEST1"); tMeaningfulPKTest1Table.setColumns("PK_ATTRIBUTE", "DESCR"); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 1ed6d89..42f81f4 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 @@ -32,8 +32,10 @@ import org.apache.cayenne.testdo.testmap.Gallery; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Date; @@ -47,7 +49,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLFetchJoinIT extends ServerCase { @Inject @@ -65,16 +67,8 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase { protected TableHelper tExhibit; protected TableHelper tArtistExhibit; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 bac7b4b..5b2e776 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 @@ -26,8 +26,10 @@ import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.relationships_flattened.FlattenedTest1; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.util.HashSet; @@ -40,7 +42,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.RELATIONSHIPS_FLATTENED_PROJECT) +@UseServerRuntime(CayenneProjects.RELATIONSHIPS_FLATTENED_PROJECT) public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { @Inject @@ -54,15 +56,8 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { protected TableHelper ft3Helper; protected TableHelper ft4Helper; - @Override - protected void setUpAfterInjection() throws Exception { - - dbHelper.deleteAll("COMPLEX_JOIN"); - dbHelper.deleteAll("FLATTENED_TEST_4"); - dbHelper.deleteAll("FLATTENED_TEST_3"); - dbHelper.deleteAll("FLATTENED_TEST_2"); - dbHelper.deleteAll("FLATTENED_TEST_1"); - + @Before + public void testSetUp() throws Exception { ft1Helper = new TableHelper(dbHelper, "FLATTENED_TEST_1", "FT1_ID", "NAME"); ft2Helper = new TableHelper(dbHelper, "FLATTENED_TEST_2"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsIT.java index cd75d76..50c274b 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressionsIT.java @@ -24,10 +24,10 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.query.QueryChain; import org.apache.cayenne.query.SQLTemplate; -import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.UnitDbAdapter; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -38,27 +38,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; // TODO: renamed as it fails on DB's like Derby. See CAY-1480. -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLFunctionalExpressionsIT extends ServerCase { @Inject - protected DBHelper dbHelper; - - @Inject private ObjectContext context; @Inject private UnitDbAdapter accessStackAdapter; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - } - @Test public void testSIZE() { http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 30fc0db..1db11fd 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 @@ -26,8 +26,10 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.test.junit.AssertExtras; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Gallery; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.math.BigDecimal; @@ -42,7 +44,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLGroupByHavingIT extends ServerCase { @Inject @@ -55,16 +57,8 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase { protected TableHelper tPainting; protected TableHelper tGallery; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 ca5f763..3d5b01e 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 @@ -26,8 +26,10 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.inheritance_people.CustomerRepresentative; import org.apache.cayenne.testdo.inheritance_people.Employee; import org.apache.cayenne.testdo.inheritance_people.Manager; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -35,7 +37,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -@UseServerRuntime(ServerCase.PEOPLE_PROJECT) +@UseServerRuntime(CayenneProjects.PEOPLE_PROJECT) public class DataContextEJBQLInheritanceIT extends ServerCase { @Inject @@ -44,18 +46,11 @@ public class DataContextEJBQLInheritanceIT extends ServerCase { @Inject protected DBHelper dbHelper; - @Override - protected void setUpAfterInjection() throws Exception { - + @Before + public void testSetUp() throws Exception { // manually break circular deps dbHelper.update("PERSON").set("DEPARTMENT_ID", null, Types.INTEGER).execute(); - dbHelper.deleteAll("ADDRESS"); - dbHelper.deleteAll("DEPARTMENT"); - dbHelper.deleteAll("PERSON_NOTES"); - dbHelper.deleteAll("PERSON"); - dbHelper.deleteAll("CLIENT_COMPANY"); - TableHelper person = new TableHelper(dbHelper, "PERSON"); person.setColumns("PERSON_ID", "NAME", "PERSON_TYPE", "SALARY").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR, Types.FLOAT); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 24ca818..5151e53 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 @@ -26,8 +26,10 @@ import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.unit.UnitDbAdapter; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -35,7 +37,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLIsNullIT extends ServerCase { @Inject @@ -50,14 +52,8 @@ public class DataContextEJBQLIsNullIT extends ServerCase { protected TableHelper tArtist; protected TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 4f587de..ef6b884 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 @@ -25,8 +25,10 @@ import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -38,7 +40,7 @@ import java.util.Set; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLJoinsIT extends ServerCase { @Inject @@ -51,16 +53,8 @@ public class DataContextEJBQLJoinsIT extends ServerCase { protected TableHelper tPainting; protected TableHelper tGallery; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLNumericalFunctionalIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLNumericalFunctionalIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLNumericalFunctionalIT.java index ec876b6..97f7e22 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLNumericalFunctionalIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLNumericalFunctionalIT.java @@ -29,8 +29,10 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.numeric_types.BigDecimalEntity; import org.apache.cayenne.testdo.numeric_types.BigIntegerEntity; import org.apache.cayenne.testdo.numeric_types.BooleanTestEntity; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.math.BigDecimal; @@ -41,7 +43,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.NUMERIC_TYPES_PROJECT) +@UseServerRuntime(CayenneProjects.NUMERIC_TYPES_PROJECT) public class DataContextEJBQLNumericalFunctionalIT extends ServerCase { @Inject @@ -52,12 +54,8 @@ public class DataContextEJBQLNumericalFunctionalIT extends ServerCase { private TableHelper tBigIntegerEntity; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("BIGDECIMAL_ENTITY"); - dbHelper.deleteAll("BIGINTEGER_ENTITY"); - dbHelper.deleteAll("BOOLEAN_TEST"); - + @Before + public void testSetUp() throws Exception { tBigIntegerEntity = new TableHelper(dbHelper, "BIGINTEGER_ENTITY"); tBigIntegerEntity.setColumns("ID", "BIG_INTEGER_FIELD"); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/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 133aa10..b4fe558 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 @@ -25,8 +25,10 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -34,7 +36,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLOrderByIT extends ServerCase { @Inject @@ -46,14 +48,8 @@ public class DataContextEJBQLOrderByIT extends ServerCase { protected TableHelper tArtist; protected TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryCompoundIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryCompoundIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryCompoundIT.java index 3969534..73809ac 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryCompoundIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryCompoundIT.java @@ -28,8 +28,10 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.compound.CompoundFkTestEntity; import org.apache.cayenne.testdo.compound.CompoundPkTestEntity; import org.apache.cayenne.unit.UnitDbAdapter; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.util.HashMap; @@ -38,7 +40,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; -@UseServerRuntime(ServerCase.COMPOUND_PROJECT) +@UseServerRuntime(CayenneProjects.COMPOUND_PROJECT) public class DataContextEJBQLQueryCompoundIT extends ServerCase { @Inject @@ -53,11 +55,8 @@ public class DataContextEJBQLQueryCompoundIT extends ServerCase { private TableHelper tCompoundPk; private TableHelper tCompoundFk; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("COMPOUND_FK_TEST"); - dbHelper.deleteAll("COMPOUND_PK_TEST"); - + @Before + public void testSetUp() throws Exception { tCompoundPk = new TableHelper(dbHelper, "COMPOUND_PK_TEST"); tCompoundPk.setColumns("KEY1", "KEY2"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java index a61cf18..cb27ea5 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java @@ -31,8 +31,10 @@ import org.apache.cayenne.test.junit.AssertExtras; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.UnitDbAdapter; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.math.BigDecimal; @@ -46,7 +48,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLQueryIT extends ServerCase { @Inject @@ -61,14 +63,8 @@ public class DataContextEJBQLQueryIT extends ServerCase { private TableHelper tArtist; private TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java index 3b4ccbe..e704c44 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java @@ -27,8 +27,10 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.UnitDbAdapter; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -40,7 +42,7 @@ import java.util.Set; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLSubqueryIT extends ServerCase { @Inject @@ -55,15 +57,8 @@ public class DataContextEJBQLSubqueryIT extends ServerCase { private TableHelper tArtist; private TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("PAINTING1"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateCompoundIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateCompoundIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateCompoundIT.java index 9fe77ed..5e00532 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateCompoundIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateCompoundIT.java @@ -27,8 +27,10 @@ import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.compound.CompoundPkTestEntity; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.util.HashMap; @@ -38,7 +40,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@UseServerRuntime(ServerCase.COMPOUND_PROJECT) +@UseServerRuntime(CayenneProjects.COMPOUND_PROJECT) public class DataContextEJBQLUpdateCompoundIT extends ServerCase { @Inject @@ -50,11 +52,8 @@ public class DataContextEJBQLUpdateCompoundIT extends ServerCase { private TableHelper tCompoundPk; private TableHelper tCompoundFk; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("COMPOUND_FK_TEST"); - dbHelper.deleteAll("COMPOUND_PK_TEST"); - + @Before + public void testSetUp() throws Exception { tCompoundPk = new TableHelper(dbHelper, "COMPOUND_PK_TEST"); tCompoundPk.setColumns("KEY1", "KEY2"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java index fad0256..6761132 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java @@ -26,8 +26,10 @@ import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -35,7 +37,7 @@ import java.sql.Types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextEJBQLUpdateIT extends ServerCase { @Inject @@ -47,14 +49,8 @@ public class DataContextEJBQLUpdateIT extends ServerCase { private TableHelper tArtist; private TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java index 34be732..0b93031 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java @@ -26,9 +26,9 @@ import org.apache.cayenne.configuration.server.ServerRuntime; import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.ObjectIdQuery; import org.apache.cayenne.query.SelectQuery; -import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKDep; import org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKTest1; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -41,24 +41,16 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.MEANINGFUL_PK_PROJECT) +@UseServerRuntime(CayenneProjects.MEANINGFUL_PK_PROJECT) public class DataContextEntityWithMeaningfulPKIT extends ServerCase { @Inject private DataContext context; - @Inject - private DBHelper dbHelper; @Inject private ServerRuntime runtime; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("MEANINGFUL_PK_DEP"); - dbHelper.deleteAll("MEANINGFUL_PK_TEST1"); - } - @Test public void testInsertWithMeaningfulPK() throws Exception { MeaningfulPKTest1 obj = context.newObject(MeaningfulPKTest1.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java index 594ef1f..ee041cf 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java @@ -25,9 +25,9 @@ import org.apache.cayenne.exp.ExpressionFactory; import org.apache.cayenne.query.CapsStrategy; import org.apache.cayenne.query.SQLTemplate; import org.apache.cayenne.query.SelectQuery; -import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.extended_type.ExtendedTypeEntity; import org.apache.cayenne.testdo.extended_type.StringET1; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -36,20 +36,12 @@ import java.util.Arrays; import static org.junit.Assert.assertEquals; -@UseServerRuntime(ServerCase.EXTENDED_TYPE_PROJECT) +@UseServerRuntime(CayenneProjects.EXTENDED_TYPE_PROJECT) public class DataContextExtendedTypeOperationsIT extends ServerCase { @Inject protected ObjectContext context; - @Inject - protected DBHelper dbHelper; - - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("EXTENDED_TYPE_TEST"); - } - @Test public void testStoreExtendedType() { ExtendedTypeEntity e1 = context.newObject(ExtendedTypeEntity.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java index f5f32c4..2acc316 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java @@ -39,8 +39,10 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -56,7 +58,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextExtrasIT extends ServerCase { @Inject @@ -74,15 +76,8 @@ public class DataContextExtrasIT extends ServerCase { protected TableHelper tArtist; protected TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("PAINTING1"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java index 0837d07..4d7f4b7 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java @@ -32,6 +32,7 @@ import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.CompoundPainting; import org.apache.cayenne.testdo.testmap.CompoundPaintingLongNames; import org.apache.cayenne.testdo.testmap.Gallery; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -46,7 +47,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextFlattenedAttributesIT extends ServerCase { @Inject @@ -55,17 +56,6 @@ public class DataContextFlattenedAttributesIT extends ServerCase { @Inject private DBHelper dbHelper; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("PAINTING1"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("GALLERY"); - } - private void createTestDataSet() throws Exception { TableHelper tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java index ee63afa..5434fcb 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java @@ -51,9 +51,11 @@ import org.apache.cayenne.testdo.testmap.ROArtist; import org.apache.cayenne.unit.UnitDbAdapter; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; +import org.apache.cayenne.unit.di.server.CayenneProjects; 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.junit.Before; import org.junit.Test; import java.math.BigDecimal; @@ -79,7 +81,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextIT extends ServerCase { @Inject @@ -102,16 +104,8 @@ public class DataContextIT extends ServerCase { protected TableHelper tGallery; protected TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java index 911b42b..bf465c6 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java @@ -27,8 +27,10 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Gallery; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Timestamp; @@ -36,7 +38,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextJoinAliasesIT extends ServerCase { @Inject @@ -50,13 +52,8 @@ public class DataContextJoinAliasesIT extends ServerCase { protected TableHelper tGallery; protected TableHelper tArtistExhibit; - @Override - public void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java index 4102669..461210e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java @@ -29,8 +29,10 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -39,7 +41,7 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextLocalObjectIT extends ServerCase { @Inject @@ -59,16 +61,8 @@ public class DataContextLocalObjectIT extends ServerCase { private TableHelper tArtist; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java index 0e23a8d..4c4f906 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java @@ -26,8 +26,10 @@ import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.no_pk.NoPkTestEntity; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.util.List; @@ -38,7 +40,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@UseServerRuntime(ServerCase.NO_PK_PROJECT) +@UseServerRuntime(CayenneProjects.NO_PK_PROJECT) public class DataContextNoPkIT extends ServerCase { @Inject @@ -47,8 +49,8 @@ public class DataContextNoPkIT extends ServerCase { @Inject protected DBHelper dbHelper; - @Override - protected void setUpAfterInjection() throws Exception { + @Before + public void testSetUp() throws Exception { TableHelper noPkTestTable = new TableHelper(dbHelper, "NO_PK_TEST", "ATTRIBUTE1"); noPkTestTable.deleteAll(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java index cdace4b..5cf05a4 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java @@ -23,8 +23,8 @@ import org.apache.cayenne.ObjectId; import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.ObjectIdQuery; import org.apache.cayenne.query.SQLTemplate; -import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.testmap.Artist; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -36,25 +36,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextObjectIdQueryIT extends ServerCase { @Inject private DataContext context; - @Inject - private DBHelper dbHelper; - - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("PAINTING1"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - } - @Test public void testRefreshNullifiedValuesNew() { http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java index 15ea9b7..acc61ed 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java @@ -29,8 +29,10 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.DataChannelInterceptor; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -46,7 +48,7 @@ import static org.junit.Assert.assertSame; * Tests objects registration in DataContext, transferring objects between contexts and * such. */ -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextObjectTrackingIT extends ServerCase { @Inject @@ -64,14 +66,8 @@ public class DataContextObjectTrackingIT extends ServerCase { protected TableHelper tArtist; protected TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java index 1134f4d..a66fd16 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java @@ -22,9 +22,9 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.exp.ExpressionFactory; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.query.SortOrder; -import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -36,25 +36,12 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextOrderingIT extends ServerCase { @Inject private DataContext context; - @Inject - private DBHelper dbHelper; - - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("PAINTING1"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - } - @Test public void testMultipleOrdering() throws Exception { http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java index a322082..8029f7c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java @@ -29,8 +29,10 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Types; @@ -38,7 +40,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextOuterJoinsIT extends ServerCase { @Inject @@ -52,9 +54,8 @@ public class DataContextOuterJoinsIT extends ServerCase { protected TableHelper artgroupHelper; protected TableHelper artistGroupHelper; - @Override - protected void setUpAfterInjection() throws Exception { - + @Before + public void testSetUp() throws Exception { artistHelper = new TableHelper(dbHelper, "ARTIST", "ARTIST_ID", "ARTIST_NAME"); paintingHelper = new TableHelper( dbHelper, http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java index 5178517..d86ba38 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java @@ -24,8 +24,10 @@ import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.util.List; @@ -33,7 +35,7 @@ import java.util.List; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextPaginatedQueryIT extends ServerCase { @Inject @@ -44,13 +46,8 @@ public class DataContextPaginatedQueryIT extends ServerCase { protected TableHelper tArtist; - @Override - public void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java index 20f0f58..5304b21 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java @@ -33,8 +33,10 @@ import org.apache.cayenne.tx.Transaction; import org.apache.cayenne.unit.UnitDbAdapter; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.math.BigDecimal; @@ -47,7 +49,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextPerformQueryAPIIT extends ServerCase { @Inject @@ -71,16 +73,8 @@ public class DataContextPerformQueryAPIIT extends ServerCase { private TableHelper tArtist; private TableHelper tPainting; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("GALLERY"); - dbHelper.deleteAll("EXHIBIT"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java index 9995660..18b74fd 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java @@ -26,6 +26,7 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.testdo.testmap.PaintingInfo; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -38,7 +39,7 @@ import static org.junit.Assert.assertTrue; /** * A test case for CAY-788. */ -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextPrefetchExtras1IT extends ServerCase { @Inject @@ -47,15 +48,6 @@ public class DataContextPrefetchExtras1IT extends ServerCase { @Inject protected DBHelper dbHelper; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - } - protected void createDataSet() throws Exception { TableHelper tPainting = new TableHelper(dbHelper, "PAINTING"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java index 06cc7bd..9eb59ea 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java @@ -35,8 +35,10 @@ import org.apache.cayenne.testdo.compound.CharFkTestEntity; import org.apache.cayenne.testdo.compound.CharPkTestEntity; import org.apache.cayenne.testdo.compound.CompoundFkTestEntity; import org.apache.cayenne.testdo.compound.CompoundPkTestEntity; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.util.List; @@ -50,7 +52,7 @@ import static org.junit.Assert.assertTrue; /** * Test prefetching of various obscure cases. */ -@UseServerRuntime(ServerCase.COMPOUND_PROJECT) +@UseServerRuntime(CayenneProjects.COMPOUND_PROJECT) public class DataContextPrefetchExtrasIT extends ServerCase { @Inject @@ -64,14 +66,8 @@ public class DataContextPrefetchExtrasIT extends ServerCase { protected TableHelper tCompoundPkTest; protected TableHelper tCompoundFkTest; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("CHAR_FK_TEST"); - dbHelper.deleteAll("CHAR_PK_TEST"); - - dbHelper.deleteAll("COMPOUND_FK_TEST"); - dbHelper.deleteAll("COMPOUND_PK_TEST"); - + @Before + public void testSetUp() throws Exception { tCharPkTest = new TableHelper(dbHelper, "CHAR_PK_TEST"); tCharPkTest.setColumns("PK_COL", "OTHER_COL"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java index 315bd8a..0995dfa 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java @@ -41,8 +41,10 @@ import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.testdo.testmap.PaintingInfo; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Timestamp; @@ -59,7 +61,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextPrefetchIT extends ServerCase { @Inject @@ -80,19 +82,8 @@ public class DataContextPrefetchIT extends ServerCase { protected TableHelper tArtistGroup; protected TableHelper tArtGroup; - - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTGROUP"); - - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java index 2bcd1d6..fb35989 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java @@ -34,8 +34,10 @@ import org.apache.cayenne.testdo.testmap.ArtistExhibit; import org.apache.cayenne.testdo.testmap.Exhibit; import org.apache.cayenne.testdo.testmap.Gallery; import org.apache.cayenne.testdo.testmap.Painting; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; import java.sql.Timestamp; @@ -50,7 +52,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextPrefetchMultistepIT extends ServerCase { @Inject @@ -64,16 +66,8 @@ public class DataContextPrefetchMultistepIT extends ServerCase { protected TableHelper tGallery; protected TableHelper tArtistExhibit; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); - + @Before + public void testSetUp() throws Exception { tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java index 401af58..bfc0b31 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java @@ -26,6 +26,7 @@ import org.apache.cayenne.query.SortOrder; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.testmap.Artist; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -34,7 +35,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextPrefetchQualifierOverlapIT extends ServerCase { @Inject @@ -43,16 +44,6 @@ public class DataContextPrefetchQualifierOverlapIT extends ServerCase { @Inject private DBHelper dbHelper; - @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("PAINTING1"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - } - private void createTwoArtistsThreePaintingsDataSet() throws Exception { TableHelper tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/368b4ac5/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java index 8a6267d..423047b 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java @@ -27,12 +27,12 @@ import org.apache.cayenne.map.Procedure; import org.apache.cayenne.query.CapsStrategy; import org.apache.cayenne.query.ProcedureQuery; import org.apache.cayenne.query.SelectQuery; -import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.tx.BaseTransaction; import org.apache.cayenne.tx.ExternalTransaction; import org.apache.cayenne.unit.UnitDbAdapter; +import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -48,7 +48,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class DataContextProcedureQueryIT extends ServerCase { public static final String UPDATE_STORED_PROCEDURE = "cayenne_test_upd_proc"; @@ -63,24 +63,8 @@ public class DataContextProcedureQueryIT extends ServerCase { private UnitDbAdapter accessStackAdapter; @Inject - protected DBHelper dbHelper; - - @Inject private JdbcEventLogger jdbcEventLogger; - @Override - protected void setUpAfterInjection() throws Exception { - if (!accessStackAdapter.supportsStoredProcedures()) { - return; - } - - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - } - @Test public void testUpdate() throws Exception { if (!accessStackAdapter.supportsStoredProcedures()) {
