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:13 UTC
[30/39] cayenne git commit: fixing tests
fixing tests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/dcaea3fb
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/dcaea3fb
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/dcaea3fb
Branch: refs/heads/CAY-1946_1
Commit: dcaea3fb4ae9bd68602b6060ab051fa25b221510
Parents: fba700d
Author: Savva Kolbachev <s....@gmail.com>
Authored: Mon Nov 24 16:36:39 2014 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Mon Nov 24 16:36:39 2014 +0300
----------------------------------------------------------------------
.../CayenneContextClientChannelEventsIT.java | 2 +-
.../apache/cayenne/CayenneContextEJBQLIT.java | 2 +-
.../cayenne/CayenneContextInheritanceIT.java | 2 +-
.../CayenneContextMapRelationshipIT.java | 2 +-
.../cayenne/CayenneContextMeaningfulPKIT.java | 2 +-
.../CayenneContextNamedQueryCachingIT.java | 2 +-
.../CayenneContextPaginatedListCachingIT.java | 2 +-
.../cayenne/CayenneContextPrimitiveIT.java | 2 +-
.../cayenne/CayenneContextRefreshQueryIT.java | 2 +-
.../cayenne/CayenneContextRelationshipsIT.java | 2 +-
.../CayenneContextWithDataContextIT.java | 2 +-
.../cayenne/PersistentObjectInContextIT.java | 2 +-
.../cayenne/access/ClientServerChannelIT.java | 2 +-
.../access/ClientServerChannelQueryIT.java | 2 +-
.../cayenne/query/ClientExpressionIT.java | 2 +-
.../query/ClientSelectQueryExpressionIT.java | 2 +-
.../query/SelectQueryAbstractEntityIT.java | 2 +-
.../cayenne/remote/RemoteCallbacksIT.java | 4 +-
.../cayenne/remote/RemoteCayenneCase.java | 6 +--
.../remote/RemoteIncrementalFaultListIT.java | 2 +-
.../cayenne/unit/di/client/ClientCase.java | 5 ++-
.../unit/di/client/ClientCaseSelfIT.java | 4 +-
.../cayenne/util/ObjectDetachOperationIT.java | 2 +-
.../util/ShallowMergeOperation_ClientIT.java | 2 +-
.../cayenne/CDOCollectionRelationshipIT.java | 2 +-
.../java/org/apache/cayenne/CDOMany2OneIT.java | 2 +-
.../apache/cayenne/CDOMapRelationshipIT.java | 2 +-
.../java/org/apache/cayenne/CDOOne2ManyIT.java | 2 +-
.../apache/cayenne/CDOQualifiedEntitiesIT.java | 2 +-
.../apache/cayenne/CDOReflexiveRelDeleteIT.java | 2 +-
.../apache/cayenne/CDOSetRelationshipIT.java | 2 +-
.../org/apache/cayenne/CayenneCompoundIT.java | 2 +-
.../CayenneDataObjectFlattenedRelIT.java | 2 +-
.../cayenne/CayenneDataObjectInContextIT.java | 2 +-
.../CayenneDataObjectRelationshipsIT.java | 2 +-
.../test/java/org/apache/cayenne/CayenneIT.java | 2 +-
.../cayenne/DataContextMaxIdQualifierIT.java | 2 +-
.../cayenne/FlattenedRelationshipsIT.java | 2 +-
.../apache/cayenne/OneWayRelationshipsIT.java | 2 +-
.../cayenne/access/DataContextCallbacksIT.java | 2 +-
.../cayenne/access/DataContextDelegateIT.java | 2 +-
.../DataContextDelegateSharedCacheIT.java | 2 +-
.../access/DataContextDeleteRulesIT.java | 2 +-
.../DataContextDisjointByIdPrefetchIT.java | 2 +-
...ataContextDisjointByIdPrefetch_ExtrasIT.java | 2 +-
.../access/DataContextEJBQLArrayResultIT.java | 2 +-
.../access/DataContextEJBQLConditionsIT.java | 2 +-
.../DataContextEJBQLConditionsPeopleIT.java | 10 ++---
.../access/DataContextEJBQLDeleteIT.java | 2 +-
.../access/DataContextEJBQLDeletePKIT.java | 2 +-
.../access/DataContextEJBQLFetchJoinIT.java | 2 +-
...ataContextEJBQLFlattenedRelationshipsIT.java | 2 +-
.../access/DataContextEJBQLGroupByHavingIT.java | 2 +-
.../access/DataContextEJBQLInheritanceIT.java | 10 ++---
.../access/DataContextEJBQLIsNullIT.java | 2 +-
.../cayenne/access/DataContextEJBQLJoinsIT.java | 2 +-
.../DataContextEJBQLNumericalFunctionalIT.java | 2 +-
.../access/DataContextEJBQLOrderByIT.java | 2 +-
.../access/DataContextEJBQLQueryCompoundIT.java | 2 +-
.../cayenne/access/DataContextEJBQLQueryIT.java | 2 +-
.../access/DataContextEJBQLSubqueryIT.java | 2 +-
.../DataContextEJBQLUpdateCompoundIT.java | 2 +-
.../access/DataContextEJBQLUpdateIT.java | 2 +-
.../cayenne/access/DataContextExtrasIT.java | 2 +-
.../apache/cayenne/access/DataContextIT.java | 2 +-
.../access/DataContextJoinAliasesIT.java | 2 +-
.../access/DataContextLocalObjectIT.java | 2 +-
.../cayenne/access/DataContextNoPkIT.java | 2 +-
.../access/DataContextObjectTrackingIT.java | 2 +-
.../cayenne/access/DataContextOuterJoinsIT.java | 2 +-
.../access/DataContextPaginatedQueryIT.java | 2 +-
.../access/DataContextPerformQueryAPIIT.java | 2 +-
.../access/DataContextPrefetchExtrasIT.java | 2 +-
.../cayenne/access/DataContextPrefetchIT.java | 2 +-
.../access/DataContextPrefetchMultistepIT.java | 2 +-
.../access/DataContextQualifiedEntityIT.java | 2 +-
.../DataContextQueryCachingEhCacheIT.java | 4 +-
.../access/DataContextQueryCachingIT.java | 4 +-
.../DataContextQueryCachingOSCacheIT.java | 2 +-
.../access/DataContextRefreshQueryIT.java | 2 +-
.../cayenne/access/DataContextRefreshingIT.java | 2 +-
.../access/DataContextRelationshipQueryIT.java | 2 +-
.../DataContextSQLTemplateCompoundIT.java | 2 +-
.../access/DataContextSQLTemplateIT.java | 2 +-
.../DataContextSelectQuerySplitAliasesIT.java | 2 +-
.../access/DataContextSerializationIT.java | 4 +-
.../access/DataContextSharedCacheEmpiricIT.java | 2 +-
.../access/DataContextSharedCacheIT.java | 2 +-
.../cayenne/access/DataDomainQueryActionIT.java | 2 +-
.../cayenne/access/DataNodeQueriesIT.java | 2 +-
.../apache/cayenne/access/DataRowUtilsIT.java | 2 +-
.../apache/cayenne/access/DbGeneratorIT.java | 2 +-
.../org/apache/cayenne/access/DbLoaderIT.java | 4 +-
.../cayenne/access/DbLoaderPartialIT.java | 4 +-
.../apache/cayenne/access/DeleteObjectIT.java | 2 +-
.../org/apache/cayenne/access/EmbeddingIT.java | 2 +-
.../cayenne/access/FlattenedPrefetchIT.java | 2 +-
.../FlattenedRelationshipInContextIT.java | 2 +-
.../cayenne/access/IdentityColumnsIT.java | 2 +-
.../apache/cayenne/access/JointPrefetchIT.java | 2 +-
.../cayenne/access/NestedDataContextReadIT.java | 2 +-
.../access/NestedDataContextWriteIT.java | 2 +-
.../access/NestedDataContext_DeadlockIT.java | 2 +-
.../apache/cayenne/access/NumericTypesIT.java | 2 +-
.../access/ObjectStoreDiffRetainingIT.java | 2 +-
.../cayenne/access/OptimisticLockingIT.java | 2 +-
.../cayenne/access/QuotedIdentifiersIT.java | 2 +-
.../SimpleIdIncrementalFaultListDataRowsIT.java | 2 +-
.../access/SimpleIdIncrementalFaultListIT.java | 2 +-
.../SimpleIdIncrementalFaultListPrefetchIT.java | 2 +-
.../access/SingleTableInheritanceIT.java | 17 ++++-----
.../java/org/apache/cayenne/access/UUIDIT.java | 2 +-
.../access/dbsync/SchemaUpdateStrategyBase.java | 3 +-
.../access/jdbc/SQLTemplateActionIT.java | 2 +-
.../translator/select/OrderingTranslatorIT.java | 4 +-
.../select/QualifierTranslatorIT.java | 4 +-
.../translator/select/QueryAssemblerIT.java | 4 +-
.../translator/select/SelectTranslatorIT.java | 4 +-
.../cayenne/ashwood/AshwoodEntitySorterIT.java | 2 +-
.../server/ServerRuntimeBuilderIT.java | 13 +++----
.../apache/cayenne/dba/JdbcPkGeneratorIT.java | 4 +-
.../org/apache/cayenne/dba/PkGeneratorIT.java | 2 +-
.../cayenne/dba/oracle/OraclePkGeneratorIT.java | 2 +-
.../cayenne/exp/ParsedExpQualifierCompatIT.java | 2 +-
.../parser/ExpressionEvaluateInMemoryIT.java | 2 +-
.../apache/cayenne/map/DbRelationshipIT.java | 2 +-
.../apache/cayenne/map/ObjRelationshipIT.java | 2 +-
.../org/apache/cayenne/merge/MergeCase.java | 2 +-
.../org/apache/cayenne/query/EJBQLQueryIT.java | 2 +-
.../cayenne/query/EJBQLQueryNumericIT.java | 2 +-
.../org/apache/cayenne/query/SQLTemplateIT.java | 2 +-
.../org/apache/cayenne/query/SelectByIdIT.java | 2 +-
.../query/SelectQueryFetchLimitOrderingIT.java | 2 +-
.../reflect/MixedPersistenceStrategyIT.java | 2 +-
.../java/org/apache/cayenne/unit/di/DICase.java | 40 ++------------------
.../apache/cayenne/unit/di/DICaseSelfIT.java | 4 +-
.../cayenne/unit/di/server/DBCleaner.java | 3 +-
.../cayenne/unit/di/server/ServerCase.java | 5 ++-
.../unit/di/server/ServerCaseSelfIT.java | 4 +-
.../org/apache/cayenne/unit/jira/CAY_115IT.java | 2 +-
.../org/apache/cayenne/unit/jira/CAY_191IT.java | 2 +-
.../org/apache/cayenne/unit/jira/CAY_194IT.java | 2 +-
.../util/DeepMergeOperationInheritanceIT.java | 14 +++++--
.../cayenne/util/ShallowMergeOperationIT.java | 2 +-
144 files changed, 193 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
index fd8a569..efe5736 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
@@ -65,7 +65,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase {
private TableHelper tMtJoin45;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
index 7e1048c..a67b90a 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
@@ -46,7 +46,7 @@ public class CayenneContextEJBQLIT extends ClientCase {
private TableHelper tMtTable1;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
index 8fe01b2..1862616 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
@@ -48,7 +48,7 @@ public class CayenneContextInheritanceIT extends ClientCase {
private TableHelper tMtTable1;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns(
"TABLE1_ID",
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
index 00c1760..a7273fc 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
@@ -52,7 +52,7 @@ public class CayenneContextMapRelationshipIT extends ClientCase {
private TableHelper tMapToManyTarget;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMapToMany = new TableHelper(dbHelper, "ID_MAP_TO_MANY");
tMapToMany.setColumns("ID");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMeaningfulPKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMeaningfulPKIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMeaningfulPKIT.java
index cd11d57..25d3994 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMeaningfulPKIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMeaningfulPKIT.java
@@ -47,7 +47,7 @@ public class CayenneContextMeaningfulPKIT extends ClientCase {
private TableHelper tMeaningfulPK;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMeaningfulPK = new TableHelper(dbHelper, "MEANINGFUL_PK");
tMeaningfulPK.setColumns("PK");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
index 82178bf..c5b7bdf 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
@@ -53,7 +53,7 @@ public class CayenneContextNamedQueryCachingIT extends ClientCase {
private TableHelper tMtTable1;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
index ea6ce4e..ee5565a 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
@@ -47,7 +47,7 @@ public class CayenneContextPaginatedListCachingIT extends ClientCase {
private TableHelper tMtTable1;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
index ebfdf68..acc7c69 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
@@ -54,7 +54,7 @@ public class CayenneContextPrimitiveIT extends ClientCase {
private TableHelper tTablePrimitives;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
int bool = accessStackAdapter.supportsBoolean() ? Types.BOOLEAN : Types.INTEGER;
tTablePrimitives = new TableHelper(dbHelper, "TABLE_PRIMITIVES");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
index 23d31b4..92d99e1 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
@@ -44,7 +44,7 @@ public class CayenneContextRefreshQueryIT extends ClientCase {
private TableHelper tMtTable2;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
index a028306..54860ca 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
@@ -51,7 +51,7 @@ public class CayenneContextRelationshipsIT extends ClientCase {
private TableHelper tMtTable2;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
index 3efab4d..25a636c 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
@@ -74,7 +74,7 @@ public class CayenneContextWithDataContextIT extends ClientCase {
private TableHelper tMtTable2;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
index 95806f0..209a8d6 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
@@ -55,7 +55,7 @@ public class PersistentObjectInContextIT extends ClientCase {
private TableHelper tMtTable2;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
index 3a74163..4de2954 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
@@ -86,7 +86,7 @@ public class ClientServerChannelIT extends ClientCase {
private TableHelper tMtTable3;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
index cc42dd3..ae189f7 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
@@ -63,7 +63,7 @@ public class ClientServerChannelQueryIT extends ClientCase {
private TableHelper tMtTable2;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
index b827b04..856dfa5 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
@@ -57,7 +57,7 @@ public class ClientExpressionIT extends ClientCase {
private TableHelper tMtTable2;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
index 91b8ba8..3d0c05a 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
@@ -47,7 +47,7 @@ public class ClientSelectQueryExpressionIT extends ClientCase {
private TableHelper tMtTable1;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
index 389e9f4..865bd54 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
@@ -47,7 +47,7 @@ public class SelectQueryAbstractEntityIT extends ServerCase {
private TableHelper mtTable;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
mtTable = new TableHelper(dbHelper, "MT_TABLE1");
mtTable.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1", "SUBCLASS_ATTRIBUTE1");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
index bbf7fdb..91efda1 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
@@ -54,9 +54,7 @@ public class RemoteCallbacksIT extends RemoteCayenneCase implements LifecycleLis
}
@Before
- public void testSetUp() throws Exception {
- super.setUpAfterInjection();
-
+ public void setUp() throws Exception {
added = 0;
loaded = 0;
prePersisted = 0;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java
index f86b7b1..98e1efa 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCayenneCase.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.event.DefaultEventManager;
import org.apache.cayenne.unit.UnitLocalConnection;
import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.DBCleaner;
+import org.junit.Before;
public abstract class RemoteCayenneCase extends ClientCase {
@@ -43,9 +44,8 @@ public abstract class RemoteCayenneCase extends ClientCase {
*/
protected int serializationPolicy;
- @Override
- public void setUpAfterInjection() throws Exception {
- dbCleaner.clean();
+ @Before
+ public void setUpClientContext() throws Exception {
clientContext = createROPContext();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
index 54859d3..c5df3a6 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
@@ -62,7 +62,7 @@ public class RemoteIncrementalFaultListIT extends ClientCase {
private RemoteIncrementalFaultList list;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMTTable = new TableHelper(dbHelper, "MT_TABLE1");
tMTTable.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1",
"SERVER_ATTRIBUTE1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java
index a8781d2..b6d50df 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCase.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.unit.di.DICase;
import org.apache.cayenne.unit.di.server.DBCleaner;
import org.apache.cayenne.unit.di.server.SchemaBuilder;
import org.apache.cayenne.unit.di.server.ServerCaseModule;
+import org.junit.Before;
public class ClientCase extends DICase {
@@ -45,8 +46,8 @@ public class ClientCase 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-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
index cc79b35..080bab6 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
@@ -45,9 +45,9 @@ public class ClientCaseSelfIT extends ClientCase {
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-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java b/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
index 7537eb9..7bde106 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
@@ -52,7 +52,7 @@ public class ObjectDetachOperationIT extends ClientCase {
private TableHelper tMtTable1;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java b/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
index 2c19a92..761be9f 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
@@ -60,7 +60,7 @@ public class ShallowMergeOperation_ClientIT extends ClientCase {
private TableHelper tMtTable1;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMtTable1 = new TableHelper(dbHelper, "MT_TABLE1");
tMtTable1.setColumns("TABLE1_ID", "GLOBAL_ATTRIBUTE1", "SERVER_ATTRIBUTE1");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
index a24f3ce..5992f4c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
@@ -51,7 +51,7 @@ public class CDOCollectionRelationshipIT extends ServerCase {
private DBHelper dbHelper;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
TableHelper tCollectionToMany = new TableHelper(dbHelper, "COLLECTION_TO_MANY");
tCollectionToMany.setColumns("ID");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
index cdfd183..be9aac4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
@@ -65,7 +65,7 @@ public class CDOMany2OneIT extends ServerCase {
protected TableHelper tGallery;
@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/CDOMapRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
index 4c99936..4451d8d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
@@ -57,7 +57,7 @@ public class CDOMapRelationshipIT extends ServerCase {
protected TableHelper tIdMapToManyTarget;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMapToMany = new TableHelper(dbHelper, "MAP_TO_MANY");
tMapToMany.setColumns("ID");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
index 022e8fd..7eb6155 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
@@ -60,7 +60,7 @@ public class CDOOne2ManyIT 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/CDOQualifiedEntitiesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
index 837d698..729a1d8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
@@ -53,7 +53,7 @@ public class CDOQualifiedEntitiesIT extends ServerCase {
private TableHelper tQualified2;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
int bool = accessStackAdapter.supportsBoolean() ? Types.BOOLEAN : Types.INTEGER;
tQualified1 = new TableHelper(dbHelper, "TEST_QUALIFIED1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java
index 4911092..6a3cd27 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteIT.java
@@ -39,7 +39,7 @@ public class CDOReflexiveRelDeleteIT extends ServerCase {
private ArtGroup childGroup3;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
parentGroup = context.newObject(ArtGroup.class);
parentGroup.setName("parent");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
index 0344ed6..7c33bc8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
@@ -54,7 +54,7 @@ public class CDOSetRelationshipIT extends ServerCase {
protected TableHelper tSetToManyTarget;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tSetToMany = new TableHelper(dbHelper, "SET_TO_MANY");
tSetToMany.setColumns("ID");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/CayenneCompoundIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneCompoundIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneCompoundIT.java
index fe2aa66..48cf051 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneCompoundIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneCompoundIT.java
@@ -53,7 +53,7 @@ public class CayenneCompoundIT extends ServerCase {
protected TableHelper tCharPKTest;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tCompoundPKTest = new TableHelper(dbHelper, "COMPOUND_PK_TEST");
tCompoundPKTest.setColumns("KEY1", "KEY2", "NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
index 5629061..9933066 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
@@ -66,7 +66,7 @@ public class CayenneDataObjectFlattenedRelIT extends ServerCase {
private TableHelper tArtistGroup;
@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/CayenneDataObjectInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
index 074ea27..fe39834 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
@@ -58,7 +58,7 @@ public class CayenneDataObjectInContextIT 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/CayenneDataObjectRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
index 24a4884..35bc8fe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
@@ -62,7 +62,7 @@ public class CayenneDataObjectRelationshipsIT 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/CayenneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
index 301a5ca..7c008e3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
@@ -63,7 +63,7 @@ public class CayenneIT 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/DataContextMaxIdQualifierIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java b/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
index 0efd037..96c5759 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
@@ -61,7 +61,7 @@ public class DataContextMaxIdQualifierIT 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/FlattenedRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
index f716142..000e073 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
@@ -68,7 +68,7 @@ public class FlattenedRelationshipsIT extends ServerCase {
private TableHelper tFlattenedCircularJoin;
@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/OneWayRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
index 6130b5d..e2152e6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
@@ -55,7 +55,7 @@ public class OneWayRelationshipsIT extends ServerCase {
private TableHelper t4Helper;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
t1Helper = new TableHelper(dbHelper, "oneway_table1");
t1Helper.setColumns("ID");
t2Helper = new TableHelper(dbHelper, "oneway_table2");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
index 742b1d9..93c46d6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
@@ -47,7 +47,7 @@ public class DataContextCallbacksIT extends ServerCase {
private ServerRuntime runtime;
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
resolver.getCallbackRegistry().clear();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java
index f758917..e443b3e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java
@@ -50,7 +50,7 @@ public class DataContextDelegateIT extends ServerCase {
private DataContext context;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
// prepare a single gallery record
Gallery gallery = (Gallery) context.newObject("Gallery");
gallery.setGalleryName("version1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
index 2d2c695..79c66a5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
@@ -51,7 +51,7 @@ public class DataContextDelegateSharedCacheIT 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");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/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 6cd67d2..7cf3c23 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
@@ -58,7 +58,7 @@ public class DataContextDeleteRulesIT extends ServerCase {
private DBHelper dbHelper;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/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 582eb04..6e633fb 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
@@ -64,7 +64,7 @@ public class DataContextDisjointByIdPrefetchIT 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/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 ba4b6c2..145f2e2 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
@@ -70,7 +70,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
protected TableHelper tBoxThing;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() 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/dcaea3fb/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 b924325..b3b12ce 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
@@ -47,7 +47,7 @@ public class DataContextEJBQLArrayResultIT extends ServerCase {
protected DBHelper dbHelper;
@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/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 360967e..bb298ea 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
@@ -61,7 +61,7 @@ public class DataContextEJBQLConditionsIT 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/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 73da8a3..05078ee 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
@@ -55,12 +55,7 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase {
protected DBCleaner dbCleaner;
@Override
- protected void setUpAfterInjection() throws Exception {
- }
-
- @Before
- public void testSetUp() throws Exception {
-
+ public void cleanUpDB() throws Exception {
TableHelper tPerson = new TableHelper(dbHelper, "PERSON");
tPerson.setColumns(
"PERSON_ID",
@@ -73,7 +68,10 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase {
// manually break circular deps
tPerson.update().set("DEPARTMENT_ID", null, Types.INTEGER).execute();
dbCleaner.clean();
+ }
+ @Before
+ public void setUp() {
// TODO: use TableHelper to create test data
Department d1 = context.newObject(Department.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/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 fe44df1..ec7a875 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
@@ -54,7 +54,7 @@ public class DataContextEJBQLDeleteIT extends ServerCase {
protected TableHelper tPainting;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tPainting = new TableHelper(dbHelper, "PAINTING");
tPainting.setColumns(
"PAINTING_ID",
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/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 cfe9168..2c51672 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
@@ -48,7 +48,7 @@ public class DataContextEJBQLDeletePKIT extends ServerCase {
protected TableHelper tMeaningfulPKTest1Table;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tMeaningfulPKTest1Table = new TableHelper(dbHelper, "MEANINGFUL_PK_TEST1");
tMeaningfulPKTest1Table.setColumns("PK_ATTRIBUTE", "DESCR");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/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 42f81f4..f802a6d 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
@@ -68,7 +68,7 @@ public class DataContextEJBQLFetchJoinIT extends ServerCase {
protected TableHelper tArtistExhibit;
@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/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 5b2e776..b3733d8 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
@@ -57,7 +57,7 @@ public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
protected TableHelper ft4Helper;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() 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/dcaea3fb/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 1db11fd..11bb93c 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
@@ -58,7 +58,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
protected TableHelper tGallery;
@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/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 e39fe21..5a8068e 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
@@ -51,16 +51,14 @@ public class DataContextEJBQLInheritanceIT extends ServerCase {
protected DBCleaner dbCleaner;
@Override
- protected void setUpAfterInjection() throws Exception {
- }
-
- @Before
- public void testSetUp() throws Exception {
+ public void cleanUpDB() throws Exception {
// manually break circular deps
dbHelper.update("PERSON").set("DEPARTMENT_ID", null, Types.INTEGER).execute();
-
dbCleaner.clean();
+ }
+ @Before
+ public void setUp() throws Exception {
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/dcaea3fb/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 5151e53..f14d21e 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
@@ -53,7 +53,7 @@ public class DataContextEJBQLIsNullIT 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/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 ef6b884..0d3a1a4 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
@@ -54,7 +54,7 @@ public class DataContextEJBQLJoinsIT extends ServerCase {
protected TableHelper tGallery;
@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/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 97f7e22..bc7de1b 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
@@ -55,7 +55,7 @@ public class DataContextEJBQLNumericalFunctionalIT 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/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 b4fe558..22afb42 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
@@ -49,7 +49,7 @@ public class DataContextEJBQLOrderByIT 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/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 73809ac..02d3c8f 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
@@ -56,7 +56,7 @@ public class DataContextEJBQLQueryCompoundIT extends ServerCase {
private TableHelper tCompoundFk;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tCompoundPk = new TableHelper(dbHelper, "COMPOUND_PK_TEST");
tCompoundPk.setColumns("KEY1", "KEY2");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/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 cb27ea5..e29e584 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
@@ -64,7 +64,7 @@ public class DataContextEJBQLQueryIT 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/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 e704c44..2b2b23c 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
@@ -58,7 +58,7 @@ public class DataContextEJBQLSubqueryIT 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/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 5e00532..05ccd01 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
@@ -53,7 +53,7 @@ public class DataContextEJBQLUpdateCompoundIT extends ServerCase {
private TableHelper tCompoundFk;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tCompoundPk = new TableHelper(dbHelper, "COMPOUND_PK_TEST");
tCompoundPk.setColumns("KEY1", "KEY2");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/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 6761132..0d98c4c 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
@@ -50,7 +50,7 @@ public class DataContextEJBQLUpdateIT 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/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 2acc316..958af1f 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
@@ -77,7 +77,7 @@ public class DataContextExtrasIT 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/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 5434fcb..4c0b8db 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
@@ -105,7 +105,7 @@ public class DataContextIT 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/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 bf465c6..d99055c 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
@@ -53,7 +53,7 @@ public class DataContextJoinAliasesIT extends ServerCase {
protected TableHelper tArtistExhibit;
@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/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 461210e..847d716 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
@@ -62,7 +62,7 @@ public class DataContextLocalObjectIT 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/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 4c4f906..1fc1cc3 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
@@ -50,7 +50,7 @@ public class DataContextNoPkIT extends ServerCase {
protected DBHelper dbHelper;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
TableHelper noPkTestTable = new TableHelper(dbHelper, "NO_PK_TEST", "ATTRIBUTE1");
noPkTestTable.deleteAll();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/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 acc61ed..5d48075 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
@@ -67,7 +67,7 @@ public class DataContextObjectTrackingIT 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/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 8029f7c..719e79c 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
@@ -55,7 +55,7 @@ public class DataContextOuterJoinsIT extends ServerCase {
protected TableHelper artistGroupHelper;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() 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/dcaea3fb/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 d86ba38..194f1a7 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
@@ -47,7 +47,7 @@ public class DataContextPaginatedQueryIT 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/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 5304b21..186a6d3 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
@@ -74,7 +74,7 @@ public class DataContextPerformQueryAPIIT 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/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 9eb59ea..77fed66 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
@@ -67,7 +67,7 @@ public class DataContextPrefetchExtrasIT extends ServerCase {
protected TableHelper tCompoundFkTest;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() 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/dcaea3fb/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 0995dfa..a635b21 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
@@ -83,7 +83,7 @@ public class DataContextPrefetchIT extends ServerCase {
protected TableHelper tArtGroup;
@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/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 fb35989..b20f5db 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
@@ -67,7 +67,7 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
protected TableHelper tArtistExhibit;
@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/DataContextQualifiedEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java
index 12069cc..6ac1c65 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java
@@ -53,7 +53,7 @@ public class DataContextQualifiedEntityIT extends ServerCase {
protected TableHelper tPerson;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
// manually break circular deps
dbHelper.update("PERSON").set("DEPARTMENT_ID", null, Types.INTEGER).execute();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingEhCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingEhCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingEhCacheIT.java
index 3e4f068..655b39f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingEhCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingEhCacheIT.java
@@ -32,7 +32,7 @@ public class DataContextQueryCachingEhCacheIT extends DataContextQueryCachingIT
protected EhCacheQueryCache contextCache;
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
@@ -53,7 +53,7 @@ public class DataContextQueryCachingEhCacheIT extends DataContextQueryCachingIT
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
domainCache.shutdown();
contextCache.shutdown();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
index 570a0a3..7628144 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
@@ -65,7 +65,7 @@ public class DataContextQueryCachingIT extends ServerCase {
}
@Before
- public void testSetUp() throws Exception {
+ public void setUp() throws Exception {
tArtist = new TableHelper(dbHelper, "ARTIST");
tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
@@ -83,7 +83,7 @@ public class DataContextQueryCachingIT extends ServerCase {
}
@After
- public void testTearDown() throws Exception {
+ public void tearDown() throws Exception {
domain.setQueryCache(oldCache);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dcaea3fb/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheIT.java
index 1bc77dc..8e582d2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheIT.java
@@ -29,7 +29,7 @@ public class DataContextQueryCachingOSCacheIT extends DataContextQueryCachingIT
// runs super tests with a different setup...
@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/DataContextRefreshQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
index f4ca6fc..a4cb41e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
@@ -60,7 +60,7 @@ public class DataContextRefreshQueryIT 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/DataContextRefreshingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java
index c882dc1..dc8bc8b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java
@@ -65,7 +65,7 @@ public class DataContextRefreshingIT 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");