You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/27 08:12:12 UTC
[29/39] cayenne git commit: fixing tests
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
index 357b7f4..103f8c5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
@@ -49,7 +49,7 @@ public class DataContextRelationshipQueryIT extends ServerCase {
private TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
tPainting = new TableHelper(dbHelper, "PAINTING");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateCompoundIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateCompoundIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateCompoundIT.java
index 76adc85..4ff8002 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateCompoundIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateCompoundIT.java
@@ -53,7 +53,7 @@ public class DataContextSQLTemplateCompoundIT extends ServerCase {
protected TableHelper tCompoundFkTest;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tCompoundPkTest = new TableHelper(dbHelper, "COMPOUND_PK_TEST");
tCompoundPkTest.setColumns("KEY1", "KEY2");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
index b7748b2..dd7f582 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
@@ -69,7 +69,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
protected TableHelper tArtist;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java
index 1c2a489..46f7a80 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java
@@ -47,7 +47,7 @@ public class DataContextSelectQuerySplitAliasesIT extends ServerCase {
private TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
index d7e27fe..5ac9f0c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
@@ -67,7 +67,7 @@ public class DataContextSerializationIT extends ServerCase {
protected TableHelper tArtist;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
CayenneRuntime.bindThreadInjector(runtime.getInjector());
tArtist = new TableHelper(dbHelper, "ARTIST");
@@ -79,7 +79,7 @@ public class DataContextSerializationIT extends ServerCase {
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
CayenneRuntime.bindThreadInjector(null);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
index 3c3f2f1..91c1ed1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
@@ -60,7 +60,7 @@ public class DataContextSharedCacheEmpiricIT extends ServerCase {
private DataContext c2;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
DataRowStore cache = new DataRowStore(
"cacheTest",
Collections.EMPTY_MAP,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
index 271611a..03fd0c0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
@@ -70,7 +70,7 @@ public class DataContextSharedCacheIT extends ServerCase {
private Artist artist;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
// prepare a single artist record
artist = (Artist) context.newObject("Artist");
artist.setArtistName("version1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
index 55016e7..cd1e103 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
@@ -49,7 +49,7 @@ public class DataDomainQueryActionIT extends ServerCase {
private ServerRuntime runtime;
@After
- public void testTearDown() {
+ public void tearDown() {
runtime.getDataDomain().resetProperties();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java
index 02f4ff6..67f6f43 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java
@@ -57,7 +57,7 @@ public class DataNodeQueriesIT extends ServerCase {
protected TableHelper tArtist;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java
index 3632acc..c27f1a0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java
@@ -56,7 +56,7 @@ public class DataRowUtilsIT extends ServerCase {
protected TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
index e7fac36..d5bf4bd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
@@ -51,7 +51,7 @@ public class DbGeneratorIT extends ServerCase {
private DbGenerator generator;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
generator = new DbGenerator(adapter, runtime
.getDataDomain()
.getDataMap("testmap"), logger);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
index 3294b19..8ef7ef9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java
@@ -66,12 +66,12 @@ public class DbLoaderIT extends ServerCase {
private DbLoader loader;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
loader = new DbLoader(dataSourceFactory.getSharedDataSource().getConnection(), adapter, null);
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
loader.getConnection().close();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
index 343f80c..9a3aba7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java
@@ -49,7 +49,7 @@ public class DbLoaderPartialIT extends ServerCase {
private DbLoader loader;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
loader = new DbLoader(
dataSourceFactory.getSharedDataSource().getConnection(),
adapter,
@@ -63,7 +63,7 @@ public class DbLoaderPartialIT extends ServerCase {
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
loader.getConnection().close();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java
index fa33e47..68e1944 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java
@@ -55,7 +55,7 @@ public class DeleteObjectIT extends ServerCase {
protected TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java
index 7d50b47..58ddaf4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java
@@ -52,7 +52,7 @@ public class EmbeddingIT extends ServerCase {
protected TableHelper tEmbedEntity1;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tEmbedEntity1 = new TableHelper(dbHelper, "EMBED_ENTITY1");
tEmbedEntity1.setColumns("ID", "NAME", "EMBEDDED10", "EMBEDDED20", "EMBEDDED30", "EMBEDDED40");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java
index b7cd2c5..f896877 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java
@@ -66,7 +66,7 @@ public class FlattenedPrefetchIT extends ServerCase {
protected TableHelper tArtistGroup;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute();
tArtist = new TableHelper(dbHelper, "ARTIST");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
index 960fd97..690e318 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
@@ -54,7 +54,7 @@ public class FlattenedRelationshipInContextIT extends ServerCase {
private TableHelper tFlattenedTest3;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tFlattenedTest1 = new TableHelper(dbHelper, "FLATTENED_TEST_1");
tFlattenedTest1.setColumns("FT1_ID", "NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java
index dad1db3..c072c62 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java
@@ -68,7 +68,7 @@ public class IdentityColumnsIT extends ServerCase {
protected TableHelper joinTable;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
joinTable = new TableHelper(dbHelper, "GENERATED_JOIN");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
index 62cc1fa..2f2e702 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
@@ -85,7 +85,7 @@ public class JointPrefetchIT extends ServerCase {
protected TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
index ad9dd99..558c64e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
@@ -75,7 +75,7 @@ public class NestedDataContextReadIT extends ServerCase {
private TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
index 33be4b1..9c27d5a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
@@ -74,7 +74,7 @@ public class NestedDataContextWriteIT extends ServerCase {
private TableHelper tPaintingInfo;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
index 4796ace..6d7a21a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
@@ -52,7 +52,7 @@ public class NestedDataContext_DeadlockIT extends ServerCase {
protected TableHelper tArtist;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
index 491715e..6ad368d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
@@ -72,7 +72,7 @@ public class NumericTypesIT extends ServerCase {
protected TableHelper tTinyintTest;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tSmallintTest = new TableHelper(dbHelper, "SMALLINT_TEST");
tSmallintTest.setColumns("ID", "SMALLINT_COL");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java
index 6017252..260781f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java
@@ -49,7 +49,7 @@ public class ObjectStoreDiffRetainingIT extends ServerCase {
protected TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH")
.setColumnTypes(Types.BIGINT, Types.CHAR, Types.DATE);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java
index 1842fec..cd5e430 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java
@@ -56,7 +56,7 @@ public class OptimisticLockingIT extends ServerCase {
protected TableHelper tLockingHelper;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tSimpleLockingTest = new TableHelper(dbHelper, "SIMPLE_LOCKING_TEST");
tSimpleLockingTest.setColumns("LOCKING_TEST_ID", "NAME", "DESCRIPTION")
.setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.VARCHAR);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java
index b70b590..2f46cfe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/QuotedIdentifiersIT.java
@@ -49,7 +49,7 @@ public class QuotedIdentifiersIT extends ServerCase {
private ObjectContext context;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
QuoteAdress quoteAdress = context.newObject(QuoteAdress.class);
quoteAdress.setCity("city");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java
index d373f30..ee4b26d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java
@@ -60,7 +60,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT extends ServerCase {
private SimpleIdIncrementalFaultList<?> list;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
createArtistsDataSet();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java
index ae24849..d4e62bd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java
@@ -57,7 +57,7 @@ public class SimpleIdIncrementalFaultListIT extends ServerCase {
private TableHelper tArtist;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
index def1bb4..6e87b09 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
@@ -62,7 +62,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends ServerCase {
protected TableHelper tPaining;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
index 41f9446..fd0d9dc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
@@ -78,11 +78,7 @@ public class SingleTableInheritanceIT extends ServerCase {
private TableHelper tDepartment;
@Override
- protected void setUpAfterInjection() throws Exception {
- }
-
- @Before
- public void testSetUp() throws Exception {
+ public void cleanUpDB() throws Exception {
tPerson = new TableHelper(dbHelper, "PERSON");
tPerson.setColumns(
"PERSON_ID",
@@ -98,6 +94,13 @@ public class SingleTableInheritanceIT extends ServerCase {
Types.INTEGER,
Types.INTEGER);
+ // manually break circular deps
+ tPerson.update().set("DEPARTMENT_ID", null, Types.INTEGER).execute();
+ dbCleaner.clean();
+ }
+
+ @Before
+ public void setUp() {
tAddress = new TableHelper(dbHelper, "ADDRESS");
tAddress.setColumns("ADDRESS_ID", "CITY", "PERSON_ID");
@@ -106,10 +109,6 @@ public class SingleTableInheritanceIT extends ServerCase {
tDepartment = new TableHelper(dbHelper, "DEPARTMENT");
tDepartment.setColumns("DEPARTMENT_ID", "NAME");
-
- // manually break circular deps
- tPerson.update().set("DEPARTMENT_ID", null, Types.INTEGER).execute();
- dbCleaner.clean();
}
private void create2PersonDataSet() throws Exception {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java
index fba1743..1b0dcba 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/UUIDIT.java
@@ -49,7 +49,7 @@ public class UUIDIT extends ServerCase {
private TableHelper uuidPkEntity;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
uuidPkEntity = new TableHelper(dbHelper, "UUID_PK_ENTITY", "ID");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyBase.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyBase.java b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyBase.java
index 39da5e9..59b5b73 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyBase.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyBase.java
@@ -48,8 +48,7 @@ public class SchemaUpdateStrategyBase extends ServerCase {
protected DbAdapter adapter;
@Override
- protected void setUpAfterInjection() throws Exception {
-
+ public void cleanUpDB() throws Exception {
DataMap map = node.getEntityResolver().getDataMap("sus-map");
for (String name : existingTables()) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
index 18895ba..7b24e4e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
@@ -77,7 +77,7 @@ public class SQLTemplateActionIT extends ServerCase {
protected TableHelper tArtist;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
index a5ceb73..c051637 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
@@ -49,12 +49,12 @@ public class OrderingTranslatorIT extends ServerCase {
private Connection connection;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
this.connection = dataSourceFactory.getSharedDataSource().getConnection();
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
connection.close();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
index 52ee98f..e4ff4ef 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
@@ -60,12 +60,12 @@ public class QualifierTranslatorIT extends ServerCase {
private Connection connection;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
this.connection = dataSourceFactory.getSharedDataSource().getConnection();
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
connection.close();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
index 42bc4de..006e73c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
@@ -50,13 +50,13 @@ public class QueryAssemblerIT extends ServerCase {
private TstQueryAssembler qa;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
this.connection = dataSourceFactory.getSharedDataSource().getConnection();
this.qa = new TstQueryAssembler(new SelectQuery<Object>(), dataNode, connection);
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
connection.close();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
index 25d62bd..b0ff3f8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
@@ -79,12 +79,12 @@ public class SelectTranslatorIT extends ServerCase {
private Connection connection;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
this.connection = dataSourceFactory.getSharedDataSource().getConnection();
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
connection.close();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
index 8333b73..f90cc54 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
@@ -51,7 +51,7 @@ public class AshwoodEntitySorterIT extends ServerCase {
protected TableHelper tReflexiveAndToOne;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tRelationshipHelper = new TableHelper(dbHelper, "RELATIONSHIP_HELPER");
tRelationshipHelper.setColumns("RELATIONSHIP_HELPER_ID", "NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilderIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilderIT.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilderIT.java
index 27b64e4..1ad342d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilderIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilderIT.java
@@ -18,12 +18,6 @@
****************************************************************/
package org.apache.cayenne.configuration.server;
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import javax.sql.DataSource;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.conn.DataSourceInfo;
import org.apache.cayenne.di.Inject;
@@ -37,6 +31,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import javax.sql.DataSource;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class ServerRuntimeBuilderIT extends ServerCase {
@@ -64,7 +63,7 @@ public class ServerRuntimeBuilderIT extends ServerCase {
}
@Before
- public void testSetUp() throws Exception {
+ public void setUp() 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/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
index e60daac..25774df 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
@@ -49,12 +49,12 @@ public class JdbcPkGeneratorIT extends ServerCase {
private SchemaBuilder schemaBuilder;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
schemaBuilder.dropPKSupport();
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
if (JdbcPkGenerator.class.isAssignableFrom(adapter.getPkGenerator().getClass())) {
// reset PK gen properly before updating PKs in DB
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
index 0ca4283..4a2ea0e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
@@ -49,7 +49,7 @@ public class PkGeneratorIT extends ServerCase {
private DbEntity paintingEntity;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
pkGenerator = node.getAdapter().getPkGenerator();
paintingEntity = node.getEntityResolver().getDbEntity("PAINTING");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
index 7bab993..aebc5cc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
@@ -44,7 +44,7 @@ public class OraclePkGeneratorIT extends ServerCase {
private OraclePkGenerator pkGenerator;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
OracleAdapter adapter = objectFactory.newInstance(OracleAdapter.class, OracleAdapter.class.getName());
pkGenerator = new OraclePkGenerator(adapter);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
index 59dfacd..87afc1f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
@@ -51,7 +51,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
protected TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
index a1e1f1e..4d7eea2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
@@ -62,7 +62,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
protected TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
index 926f2bf..c8d442a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
@@ -46,7 +46,7 @@ public class DbRelationshipIT extends ServerCase {
protected DbEntity galleryEnt;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
artistEnt = runtime.getDataDomain().getEntityResolver().getDbEntity("ARTIST");
paintingEnt = runtime.getDataDomain().getEntityResolver().getDbEntity("PAINTING");
galleryEnt = runtime.getDataDomain().getEntityResolver().getDbEntity("GALLERY");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
index 77aba09..bf9f9e1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
@@ -61,7 +61,7 @@ public class ObjRelationshipIT extends ServerCase {
private DbEntity galleryDBEntity;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
artistDBEntity = resolver.getDbEntity("ARTIST");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
index 77affa8..658ebe4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
@@ -71,7 +71,7 @@ public abstract class MergeCase extends ServerCase {
"PAINTING", "NEW_TABLE", "NEW_TABLE2");
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute();
// this map can't be safely modified in this test, as it is reset by DI
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
index 5ed52a6..fe1f085 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
@@ -72,7 +72,7 @@ public class EJBQLQueryIT extends ServerCase {
private TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryNumericIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryNumericIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryNumericIT.java
index 9dcbeef..746c561 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryNumericIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryNumericIT.java
@@ -46,7 +46,7 @@ public class EJBQLQueryNumericIT extends ServerCase {
private TableHelper tBigIntegerEntity;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tBigIntegerEntity = new TableHelper(dbHelper, "BIGINTEGER_ENTITY");
tBigIntegerEntity.setColumns("ID", "BIG_INTEGER_FIELD");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
index 5b2ed32..d152765 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
@@ -53,7 +53,7 @@ public class SQLTemplateIT extends ServerCase {
private TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tPainting = new TableHelper(dbHelper, "PAINTING");
tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", "ESTIMATED_PRICE").setColumnTypes(
Types.INTEGER, Types.BIGINT, Types.VARCHAR, Types.DECIMAL);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
index 862b7ac..bc18f5d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java
@@ -59,7 +59,7 @@ public class SelectByIdIT extends ServerCase {
private EntityResolver resolver;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java
index 56300c3..5ded018 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java
@@ -46,7 +46,7 @@ public class SelectQueryFetchLimitOrderingIT extends ServerCase {
protected TableHelper tArtist;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java
index e580f88..6a54256 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java
@@ -52,7 +52,7 @@ public class MixedPersistenceStrategyIT extends ServerCase {
protected TableHelper tMixedPersistenceStrategy2;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMixedPersistenceStrategy = new TableHelper(
dbHelper,
"MIXED_PERSISTENCE_STRATEGY");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java
index 74fdd75..811e9f7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java
@@ -31,47 +31,13 @@ public abstract class DICase {
protected abstract Injector getUnitTestInjector();
@Before
- public final void setUp() throws Exception {
+ public final void setUpLifecycleManager() throws Exception {
getUnitTestInjector().getInstance(UnitTestLifecycleManager.class).setUp(this);
- try {
- setUpAfterInjection();
- }
- catch (Exception e) {
-
- // must stop the lifecycle manager (do the same thing we'd normally do in
- // 'tearDown' ), otherwise following tests will end up in
- // a bad state
-
- try {
- getUnitTestInjector()
- .getInstance(UnitTestLifecycleManager.class)
- .tearDown(this);
- }
- catch (Exception x) {
- // swallow...
- }
-
- throw e;
- }
}
@After
- public final void tearDown() throws Exception {
-
- try {
- tearDownBeforeInjection();
- }
- finally {
- getUnitTestInjector().getInstance(UnitTestLifecycleManager.class).tearDown(
- this);
- }
+ public final void tearDownLifecycleManager() throws Exception {
+ getUnitTestInjector().getInstance(UnitTestLifecycleManager.class).tearDown(this);
}
- protected void setUpAfterInjection() throws Exception {
- // noop
- }
-
- protected void tearDownBeforeInjection() throws Exception {
- // noop
- }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java
index 5381f85..2bcf064 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java
@@ -76,8 +76,8 @@ public class DICaseSelfIT extends DICase {
Object singletonScoped = this.singletonScoped;
assertNotNull(singletonScoped);
- tearDown();
- setUp();
+ tearDownLifecycleManager();
+ setUpLifecycleManager();
assertNotSame(testScoped, this.testScoped);
assertNotNull(this.testScoped);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
index 2bd5cc3..af12a3d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
@@ -37,7 +37,6 @@ public class DBCleaner {
private FlavoredDBHelper dbHelper;
private String location;
- private XMLDataChannelDescriptorLoader loader;
@Inject
private SchemaBuilder schemaBuilder;
@@ -54,7 +53,7 @@ public class DBCleaner {
}
public void clean() throws SQLException {
- loader = new XMLDataChannelDescriptorLoader();
+ XMLDataChannelDescriptorLoader loader = new XMLDataChannelDescriptorLoader();
injector.injectMembers(loader);
URL url = getClass().getClassLoader().getResource(location);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java
index d5b5871..0f5181e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.spi.DefaultScope;
import org.apache.cayenne.unit.di.DICase;
+import org.junit.Before;
public class ServerCase extends DICase {
@@ -37,8 +38,8 @@ public class ServerCase extends DICase {
injector.getInstance(SchemaBuilder.class).rebuildSchema();
}
- @Override
- protected void setUpAfterInjection() throws Exception {
+ @Before
+ public void cleanUpDB() throws Exception {
dbCleaner.clean();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java
index 993828b..8bde32c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java
@@ -50,9 +50,9 @@ public class ServerCaseSelfIT extends ServerCase {
assertNotNull(local);
assertSame(local, runtimeProvider.get());
- tearDown();
+ tearDownLifecycleManager();
- setUp();
+ setUpLifecycleManager();
assertNotSame(local, this.runtime);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java
index 2877c3c..a126ceb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java
@@ -56,7 +56,7 @@ public class CAY_115IT extends ServerCase {
protected TableHelper tClobDetail;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tClobMaster = new TableHelper(dbHelper, "CLOB_MASTER");
tClobMaster.setColumns("CLOB_MASTER_ID", "CLOB_COLUMN", "NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java
index fb31bd2..e0aad02 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java
@@ -47,7 +47,7 @@ public class CAY_191IT extends ServerCase {
protected TableHelper tFkOfDifferentType;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tRelationshipHelper = new TableHelper(dbHelper, "RELATIONSHIP_HELPER");
tRelationshipHelper.setColumns("NAME", "RELATIONSHIP_HELPER_ID");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java
index dcd6b6a..704a435 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java
@@ -54,7 +54,7 @@ public class CAY_194IT extends ServerCase {
private DBHelper dbHelper;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
TableHelper tReflexive = new TableHelper(dbHelper, "REFLEXIVE_AND_TO_ONE");
tReflexive.setColumns("REFLEXIVE_AND_TO_ONE_ID", "PARENT_ID");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
index d0e57b9..d79fe8d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.testdo.inheritance_people.Department;
import org.apache.cayenne.testdo.inheritance_people.Employee;
import org.apache.cayenne.testdo.inheritance_people.Manager;
@@ -31,8 +32,11 @@ 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.After;
import org.junit.Test;
+import java.sql.SQLException;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -50,8 +54,12 @@ public class DeepMergeOperationInheritanceIT extends ServerCase {
@Inject
protected DataChannelInterceptor queryInterceptor;
- @Override
- protected void setUpAfterInjection() throws Exception {
+ @Inject
+ private DBHelper dbHelper;
+
+ @After
+ public void tearDown() throws SQLException {
+ dbHelper.deleteAll("PERSON");
}
@Test
@@ -106,7 +114,7 @@ public class DeepMergeOperationInheritanceIT extends ServerCase {
}
@Test
- public void testDeepMergeNonExistentSubclass() {
+ public void testDeepMergeNonExistentSubclass() throws SQLException {
final Department d1 = context.newObject(Department.class);
d1.setName("D1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
index 0f7ec48..111caee 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
@@ -61,7 +61,7 @@ public class ShallowMergeOperationIT extends ServerCase {
private TableHelper tArtist;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");