cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [10/50] [abbrv] cayenne git commit: Apply JUnit4 instead of JUnit3 in IT
Date Fri, 14 Nov 2014 17:47:11 GMT
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java
index 8b512f5..1ba7e74 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java
@@ -19,8 +19,6 @@
 
 package org.apache.cayenne.access;
 
-import java.util.List;
-
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.ValueHolder;
 import org.apache.cayenne.configuration.server.ServerRuntime;
@@ -32,6 +30,9 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.util.List;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataContextRollbackIT extends ServerCase {
@@ -54,6 +55,7 @@ public class DataContextRollbackIT extends ServerCase {
         dbHelper.deleteAll("ARTIST");
     }
 
+    @Test
     public void testRollbackNew() {
         Artist artist = (Artist) context.newObject("Artist");
         artist.setArtistName("a");
@@ -80,6 +82,7 @@ public class DataContextRollbackIT extends ServerCase {
         assertEquals(PersistenceState.TRANSIENT, artist.getPersistenceState());
     }
 
+    @Test
     public void testRollbackNewObject() {
         String artistName = "revertTestArtist";
         Artist artist = (Artist) context.newObject("Artist");
@@ -105,6 +108,7 @@ public class DataContextRollbackIT extends ServerCase {
     // Catches a bug where new objects were unregistered within an object iterator, thus
     // modifying the collection the iterator was iterating over
     // (ConcurrentModificationException)
+    @Test
     public void testRollbackWithMultipleNewObjects() {
         String artistName = "rollbackTestArtist";
         String paintingTitle = "rollbackTestPainting";
@@ -133,6 +137,7 @@ public class DataContextRollbackIT extends ServerCase {
         assertEquals(0, queryResults.size());
     }
 
+    @Test
     public void testRollbackRelationshipModification() {
         String artistName = "relationshipModArtist";
         String paintingTitle = "relationshipTestPainting";
@@ -169,6 +174,7 @@ public class DataContextRollbackIT extends ServerCase {
         assertEquals(artistName, queriedPainting.getToArtist().getArtistName());
     }
 
+    @Test
     public void testRollbackDeletedObject() {
         String artistName = "deleteTestArtist";
         Artist artist = (Artist) context.newObject("Artist");
@@ -195,6 +201,7 @@ public class DataContextRollbackIT extends ServerCase {
         assertEquals(1, queryResults.size());
     }
 
+    @Test
     public void testRollbackModifiedObject() {
         String artistName = "initialTestArtist";
         Artist artist = (Artist) context.newObject("Artist");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 0fef8f7..04c253f 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
@@ -40,6 +40,7 @@ import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
+import org.junit.Test;
 
 import java.sql.Types;
 import java.util.Collections;
@@ -121,6 +122,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         tCompoundFkTest.insert(7, "b1", "b2");
     }
 
+    @Test
     public void testSQLResultSetMappingMixed() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -163,7 +165,8 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(new Integer(0), array4[1]);
         assertTrue("Unexpected DataObject: " + array1[0], array1[0] instanceof Artist);
     }
-    
+
+    @Test
     public void testRootless_DataNodeName() throws Exception {
         createFourArtists();
         
@@ -171,13 +174,15 @@ public class DataContextSQLTemplateIT extends ServerCase {
         query.setDataNodeName("tstmap");
         assertEquals(4, context.performQuery(query).size());
     }
-    
+
+    @Test
     public void testRootless_DefaultDataNode() throws Exception {
         createFourArtists();
         SQLTemplate query = new SQLTemplate("SELECT * FROM ARTIST", true);
         assertEquals(4, context.performQuery(query).size());
     }
 
+    @Test
     public void testSQLResultSetMappingScalar() throws Exception {
         createFourArtists();
 
@@ -205,6 +210,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(4, ((Number) o).intValue());
     }
 
+    @Test
     public void testSQLResultSetMappingScalarArray() throws Exception {
         createFourArtists();
 
@@ -238,6 +244,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(77, ((Number) row[1]).intValue());
     }
 
+    @Test
     public void testColumnNamesCapitalization() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -269,6 +276,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertTrue(row4.containsKey("ARTIST_ID"));
     }
 
+    @Test
     public void testFetchDataRows() throws Exception {
         createFourArtists();
 
@@ -288,6 +296,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(new Integer(101), new Integer(id.toString()));
     }
 
+    @Test
     public void testFetchObjects() throws Exception {
         createFourArtists();
 
@@ -306,6 +315,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals("artist3", artist2.getArtistName());
     }
 
+    @Test
     public void testBindObjectEqualShort() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -324,6 +334,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(7, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testBindObjectNotEqualShort() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -345,6 +356,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(6, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testBindObjectEqualFull() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -363,6 +375,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(7, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testBindObjectEqualFullNonArray() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -381,6 +394,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(7, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testBindObjectEqualNull() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -397,6 +411,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(8, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testBindObjectNotEqualFull() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -417,6 +432,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(6, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testBindObjectEqualCompound() throws Exception {
         createTwoCompoundPKsAndCompoundFKsDataSet();
 
@@ -442,6 +458,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(6, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testBindObjectNotEqualCompound() throws Exception {
         createTwoCompoundPKsAndCompoundFKsDataSet();
 
@@ -467,6 +484,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(7, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testBindObjectNotEqualNull() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -486,6 +504,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(7, Cayenne.intPKForObject(p2));
     }
 
+    @Test
     public void testBindEqualNull() throws Exception {
         createFourArtistsAndThreePaintingsDataSet();
 
@@ -502,6 +521,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals(8, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testFetchLimit() throws Exception {
         createFourArtists();
 
@@ -520,6 +540,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertTrue(objects.get(0) instanceof Artist);
     }
 
+    @Test
     public void testFetchOffset() throws Exception {
         createFourArtists();
 
@@ -538,6 +559,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertTrue(objects.get(0) instanceof Artist);
     }
 
+    @Test
     public void testFetchOffsetFetchLimit() throws Exception {
         createFourArtists();
 
@@ -553,6 +575,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertTrue(objects.get(0) instanceof Artist);
     }
 
+    @Test
     public void testPageSize() throws Exception {
         createFourArtists();
 
@@ -588,6 +611,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         assertEquals("artist" + (pageSize + 2), artist.getArtistName());
     }
 
+    @Test
     public void testIteratedQuery() throws Exception {
         createFourArtists();
 
@@ -616,6 +640,7 @@ public class DataContextSQLTemplateIT extends ServerCase {
         }
     }
 
+    @Test
     public void testQueryWithLineBreakAfterMacro() throws Exception {
         createFourArtists();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 f7e35a3..763e28e 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
@@ -26,6 +26,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 
@@ -72,6 +73,7 @@ public class DataContextSelectQuerySplitAliasesIT extends ServerCase {
         tPainting.insert(3, 2, "X");
     }
 
+    @Test
     public void testAliasPathSplits_SinglePath() throws Exception {
         createTwoArtistsTwoPaintingsDataSet();
 
@@ -85,6 +87,7 @@ public class DataContextSelectQuerySplitAliasesIT extends ServerCase {
         assertEquals("AA", artists.get(0).getArtistName());
     }
 
+    @Test
     public void testAliasPathSplits_SplitJoin() throws Exception {
         createTwoArtistsThreePaintingsDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 4573a1e..bb6970e 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
@@ -19,10 +19,6 @@
 
 package org.apache.cayenne.access;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.cayenne.Cayenne;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.PersistenceState;
@@ -37,6 +33,11 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataContextSerializationIT extends ServerCase {
@@ -78,6 +79,7 @@ public class DataContextSerializationIT extends ServerCase {
         CayenneRuntime.bindThreadInjector(null);
     }
 
+    @Test
     public void testSerializeResolver() throws Exception {
 
         DataContext deserializedContext = Util.cloneViaSerialization(context);
@@ -86,6 +88,7 @@ public class DataContextSerializationIT extends ServerCase {
         assertSame(context.getEntityResolver(), deserializedContext.getEntityResolver());
     }
 
+    @Test
     public void testSerializeChannel() throws Exception {
 
         DataContext deserializedContext = Util.cloneViaSerialization(context);
@@ -94,6 +97,7 @@ public class DataContextSerializationIT extends ServerCase {
         assertSame(context.getChannel(), deserializedContext.getChannel());
     }
 
+    @Test
     public void testSerializeNestedChannel() throws Exception {
 
         ObjectContext child = runtime.newContext(context);
@@ -104,6 +108,7 @@ public class DataContextSerializationIT extends ServerCase {
         assertNotNull(deserializedContext.getEntityResolver());
     }
 
+    @Test
     public void testSerializeWithSharedCache() throws Exception {
 
         createSingleArtistDataSet();
@@ -131,6 +136,7 @@ public class DataContextSerializationIT extends ServerCase {
         deserializedContext.commitChanges();
     }
 
+    @Test
     public void testSerializeWithLocalCache() throws Exception {
 
         createSingleArtistDataSet();
@@ -180,6 +186,7 @@ public class DataContextSerializationIT extends ServerCase {
         deserializedContext.commitChanges();
     }
 
+    @Test
     public void testSerializeNew() throws Exception {
 
         Artist artist = (Artist) context.newObject("Artist");
@@ -204,6 +211,7 @@ public class DataContextSerializationIT extends ServerCase {
         assertSame(deserializedContext, deserializedArtist.getObjectContext());
     }
 
+    @Test
     public void testSerializeCommitted() throws Exception {
 
         Artist artist = (Artist) context.newObject("Artist");
@@ -237,6 +245,7 @@ public class DataContextSerializationIT extends ServerCase {
         assertEquals(0, paintings.size());
     }
 
+    @Test
     public void testSerializeModified() throws Exception {
 
         Artist artist = (Artist) context.newObject("Artist");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 2168565..3103f9c 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
@@ -31,6 +31,7 @@ import org.apache.cayenne.test.parallel.ParallelTestContainer;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.Collections;
 import java.util.List;
@@ -76,6 +77,7 @@ public class DataContextSharedCacheEmpiricIT extends ServerCase {
         tArtist.insert(1, "version1");
     }
 
+    @Test
     public void testSelectSelectCommitRefresh() throws Exception {
 
         SelectQuery query = new SelectQuery(Artist.class);
@@ -96,6 +98,7 @@ public class DataContextSharedCacheEmpiricIT extends ServerCase {
         assertOnCommit(a2);
     }
 
+    @Test
     public void testSelectSelectCommitRefreshReverse() throws Exception {
 
         SelectQuery query = new SelectQuery(Artist.class);
@@ -115,6 +118,7 @@ public class DataContextSharedCacheEmpiricIT extends ServerCase {
         assertOnCommit(a2);
     }
 
+    @Test
     public void testSelectUpdateSelectCommitRefresh() throws Exception {
 
         SelectQuery query = new SelectQuery(Artist.class);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 6428086..b29e55d 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
@@ -19,12 +19,6 @@
 
 package org.apache.cayenne.access;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.PersistenceState;
@@ -40,6 +34,13 @@ import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
+import org.junit.Test;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Test suite for testing behavior of multiple DataContexts that share the same underlying
@@ -84,6 +85,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * Test case to prove that refreshing snapshots as a result of the database fetch will
      * be propagated across DataContexts.
      */
+    @Test
     public void testSnapshotChangePropagationOnSelect() throws Exception {
         String originalName = artist.getArtistName();
         final String newName = "version2";
@@ -136,6 +138,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * to the database will be reflected in the peer ObjectStore using the same
      * DataRowCache.
      */
+    @Test
     public void testSnapshotChangePropagation() throws Exception {
         String originalName = artist.getArtistName();
         final String newName = "version2";
@@ -179,6 +182,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * 
      * @throws Exception
      */
+    @Test
     public void testSnapshotChangePropagationToModifiedObjects() throws Exception {
         String originalName = artist.getArtistName();
         Date originalDate = artist.getDateOfBirth();
@@ -228,6 +232,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * database will be reflected in the peer ObjectStore using the same DataRowCache. By
      * default COMMITTED objects will be changed to TRANSIENT.
      */
+    @Test
     public void testSnapshotDeletePropagationToCommitted() throws Exception {
 
         // make sure we have a fully resolved copy of an artist object
@@ -267,6 +272,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * 
      * @throws Exception
      */
+    @Test
     public void testSnapshotDeletePropagationToHollow() throws Exception {
 
         final Artist altArtist = context1.localObject(artist);
@@ -302,6 +308,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * database will be reflected in the peer ObjectStore using the same DataRowCache. By
      * default MODIFIED objects will be changed to NEW.
      */
+    @Test
     public void testSnapshotDeletePropagationToModified() throws Exception {
 
         // make sure we have a fully resolved copy of an artist object
@@ -354,6 +361,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * 
      * @throws Exception
      */
+    @Test
     public void testSnapshotDeletePropagationToDeleted() throws Exception {
 
         // make sure we have a fully resolved copy of an artist object
@@ -395,6 +403,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * database will be reflected in the peer ObjectStore using the same DataRowCache,
      * including proper processing of deleted object being held in to-many collections.
      */
+    @Test
     public void testSnapshotDeletePropagationToManyRefresh() throws Exception {
 
         Painting painting1 = (Painting) context.newObject("Painting");
@@ -465,6 +474,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * 
      * @throws Exception
      */
+    @Test
     public void testSnapshotInsertPropagationToManyRefresh() throws Exception {
 
         Painting painting1 = (Painting) context.newObject("Painting");
@@ -514,6 +524,7 @@ public class DataContextSharedCacheIT extends ServerCase {
      * Checks that cache is refreshed when a query "refreshingObjects" property is set to
      * true.
      */
+    @Test
     public void testCacheRefreshingOnSelect() throws Exception {
         String originalName = artist.getArtistName();
         final String newName = "version2";
@@ -557,6 +568,7 @@ public class DataContextSharedCacheIT extends ServerCase {
         assertEquals(newName, artist.getArtistName());
     }
 
+    @Test
     public void testSnapshotEvictedForHollow() throws Exception {
         String originalName = artist.getArtistName();
 
@@ -577,6 +589,7 @@ public class DataContextSharedCacheIT extends ServerCase {
         assertEquals(originalName, freshSnapshot.get("ARTIST_NAME"));
     }
 
+    @Test
     public void testSnapshotEvictedAndObjectsHollowedForInvalidate() throws Exception {
         String originalName = artist.getArtistName();
 
@@ -619,6 +632,7 @@ public class DataContextSharedCacheIT extends ServerCase {
 
     }
 
+    @Test
     public void testSnapshotEvictedForCommitted() throws Exception {
         String newName = "version2";
 
@@ -643,6 +657,7 @@ public class DataContextSharedCacheIT extends ServerCase {
         assertEquals(newName, freshSnapshot.get("ARTIST_NAME"));
     }
 
+    @Test
     public void testSnapshotEvictedForModified() throws Exception {
         String newName = "version2";
 
@@ -668,6 +683,7 @@ public class DataContextSharedCacheIT extends ServerCase {
         assertEquals(newName, freshSnapshot.get("ARTIST_NAME"));
     }
 
+    @Test
     public void testSnapshotEvictedAndChangedForModified() throws Exception {
         String originalName = artist.getArtistName();
         String newName = "version2";
@@ -705,6 +721,7 @@ public class DataContextSharedCacheIT extends ServerCase {
         assertEquals(newName, freshSnapshot.get("ARTIST_NAME"));
     }
 
+    @Test
     public void testSnapshotEvictedForDeleted() throws Exception {
         // remember ObjectId
         ObjectId id = artist.getObjectId();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java
index b22daf9..d208844 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.unit.util.ValidationDelegate;
 import org.apache.cayenne.validation.ValidationResult;
+import org.junit.Test;
 
 /**
  */
@@ -50,6 +51,7 @@ public class DataContextValidationIT extends ServerCase {
         dbHelper.deleteAll("ARTIST");
     }
 
+    @Test
     public void testValidatingObjectsOnCommitProperty() throws Exception {
         context.setValidatingObjectsOnCommit(true);
         assertTrue(context.isValidatingObjectsOnCommit());
@@ -58,6 +60,7 @@ public class DataContextValidationIT extends ServerCase {
         assertFalse(context.isValidatingObjectsOnCommit());
     }
 
+    @Test
     public void testValidatingObjectsOnCommit() throws Exception {
         // test that validation is called properly
 
@@ -74,6 +77,7 @@ public class DataContextValidationIT extends ServerCase {
         assertFalse(a2.isValidateForSaveCalled());
     }
 
+    @Test
     public void testValidationModifyingContext() throws Exception {
 
         ValidationDelegate delegate = new ValidationDelegate() {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
index de4fce3..f0fdb46 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataDomainCallbacksIT extends ServerCase {
@@ -60,6 +61,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         dbHelper.deleteAll("GALLERY");
     }
 
+    @Test
     public void testPostLoad() throws Exception {
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
 
@@ -114,6 +116,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertSame(a1, listener.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostLoad_MixedResult() throws Exception {
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
 
@@ -137,6 +140,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertSame(a1, listener.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostLoad_Relationship() throws Exception {
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
 
@@ -171,6 +175,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertSame(a1, listener.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostLoad_Prefetch() throws Exception {
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
 
@@ -200,6 +205,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertSame(a1, listener.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostLoad_LocalObject() throws Exception {
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
 
@@ -226,6 +232,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertSame(a2, listener.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostLoad_ThatModifiesObject() {
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
 
@@ -266,7 +273,8 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertEquals(1, a1.getPostLoaded());
         assertSame(a1, listener.getPublicCalledbackEntity());
     }
-    
+
+    @Test
     public void testPreUpdate() {
 
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -303,6 +311,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertSame(a1, listener2.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostUpdate() {
 
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -341,6 +350,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertSame(a1, listener2.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostRemove() {
 
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -367,6 +377,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertSame(a1, listener2.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostRemove_UpdatedDeleted() {
 
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -398,6 +409,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertSame(a1, listener1.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostRemove_InsertedUpdatedDeleted() {
 
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
@@ -433,6 +445,7 @@ public class DataDomainCallbacksIT extends ServerCase {
         assertNull(listener2.getPublicCalledbackEntity());
     }
 
+    @Test
     public void testPostPersist() {
 
         LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java
index c8fa69c..a0be7ac 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java
@@ -32,6 +32,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.util.ListResponse;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,12 +46,14 @@ public class DataDomainFiltersIT extends ServerCase {
     @Inject
     private ServerRuntime runtime;
 
+    @Test
     public void testDefaultNoFilters() {
 
         DataDomain domain = runtime.getDataDomain();
         assertEquals(0, domain.filters.size());
     }
 
+    @Test
     public void testOnQuery_FilterOrdering() {
 
         DataDomain domain = runtime.getDataDomain();
@@ -100,6 +103,7 @@ public class DataDomainFiltersIT extends ServerCase {
         assertEquals("f2end", results.get(3));
     }
 
+    @Test
     public void testOnSync_FilterOrdering() {
 
         DataDomain domain = runtime.getDataDomain();
@@ -159,6 +163,7 @@ public class DataDomainFiltersIT extends ServerCase {
         assertEquals("f2end", results.get(3));
     }
 
+    @Test
     public void testOnQuery_Blocking() {
 
         DataDomain domain = runtime.getDataDomain();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java
index 8bba81e..0e7779b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java
@@ -36,6 +36,7 @@ import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.testdo.testmap.annotations.Tag1;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -50,6 +51,7 @@ public class DataDomainIT extends ServerCase {
     @Inject
     private JdbcEventLogger logger;
 
+    @Test
     public void testName() throws Exception {
         DataDomain domain = new DataDomain("some name");
         assertEquals("some name", domain.getName());
@@ -57,6 +59,7 @@ public class DataDomainIT extends ServerCase {
         assertEquals("tst_name", domain.getName());
     }
 
+    @Test
     public void testLookupDataNode() {
 
         DataDomain domain = new DataDomain("test");
@@ -83,6 +86,7 @@ public class DataDomainIT extends ServerCase {
         }
     }
 
+    @Test
     public void testLookupDataNode_Default() {
 
         DataDomain domain = new DataDomain("test");
@@ -104,6 +108,7 @@ public class DataDomainIT extends ServerCase {
         assertSame(n1, domain.lookupDataNode(new DataMap("m3")));
     }
 
+    @Test
     public void testNodes() throws Exception {
         DataDomain domain = new DataDomain("dom1");
         assertEquals(0, domain.getDataNodes().size());
@@ -117,6 +122,7 @@ public class DataDomainIT extends ServerCase {
         assertEquals(2, domain.getDataNodes().size());
     }
 
+    @Test
     public void testNodeMaps() throws Exception {
         DataDomain domain = new DataDomain("dom1");
         assertNull(domain.getDataMap("map"));
@@ -129,6 +135,7 @@ public class DataDomainIT extends ServerCase {
         assertNotNull(domain.getDataMap("map"));
     }
 
+    @Test
     public void testMaps() throws Exception {
         DataDomain d1 = new DataDomain("dom1");
 
@@ -140,6 +147,7 @@ public class DataDomainIT extends ServerCase {
         assertNull(d1.getDataMap(m1.getName()));
     }
 
+    @Test
     public void testEntityResolverRefresh() throws Exception {
         DataDomain domain = new DataDomain("dom1");
         org.apache.cayenne.map.EntityResolver resolver = domain.getEntityResolver();
@@ -154,6 +162,7 @@ public class DataDomainIT extends ServerCase {
         assertSame(entity, resolver.getObjEntity("TestEntity"));
     }
 
+    @Test
     public void testEntityResolver() {
         assertNotNull(runtime.getDataDomain().getEntityResolver());
 
@@ -161,6 +170,7 @@ public class DataDomainIT extends ServerCase {
         assertNotNull(domain.getEntityResolver());
     }
 
+    @Test
     public void testInitDataDomainWithSharedCache() throws Exception {
         Map<Object, Object> properties = new HashMap<Object, Object>();
         properties.put(DataDomain.SHARED_CACHE_ENABLED_PROPERTY, Boolean.TRUE.toString());
@@ -169,6 +179,7 @@ public class DataDomainIT extends ServerCase {
         assertTrue(domain.isSharedCacheEnabled());
     }
 
+    @Test
     public void testInitDataDomainWithDedicatedCache() throws Exception {
         Map<Object, Object> properties = new HashMap<Object, Object>();
         properties.put(DataDomain.SHARED_CACHE_ENABLED_PROPERTY, Boolean.FALSE.toString());
@@ -177,6 +188,7 @@ public class DataDomainIT extends ServerCase {
         assertFalse(domain.isSharedCacheEnabled());
     }
 
+    @Test
     public void testInitDataDomainValidation() throws Exception {
         Map<Object, Object> properties = new HashMap<Object, Object>();
         properties.put(DataDomain.VALIDATING_OBJECTS_ON_COMMIT_PROPERTY, Boolean.TRUE.toString());
@@ -185,6 +197,7 @@ public class DataDomainIT extends ServerCase {
         assertTrue(domain.isValidatingObjectsOnCommit());
     }
 
+    @Test
     public void testInitDataDomainNoValidation() throws Exception {
         Map<Object, Object> properties = new HashMap<Object, Object>();
         properties.put(DataDomain.VALIDATING_OBJECTS_ON_COMMIT_PROPERTY, Boolean.FALSE.toString());
@@ -193,6 +206,7 @@ public class DataDomainIT extends ServerCase {
         assertFalse(domain.isValidatingObjectsOnCommit());
     }
 
+    @Test
     public void testShutdownCache() {
         DataDomain domain = new DataDomain("X");
 
@@ -212,6 +226,7 @@ public class DataDomainIT extends ServerCase {
         assertTrue(cacheShutdown[0]);
     }
 
+    @Test
     public void testAddListener() {
 
         DataDomain domain = runtime.getDataDomain();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 5e053a1..4e4323e 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
@@ -31,6 +31,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.io.Serializable;
 import java.util.List;
@@ -62,6 +63,7 @@ public class DataDomainQueryActionIT extends ServerCase {
         runtime.getDataDomain().resetProperties();
     }
 
+    @Test
     public void testCachedQuery() {
 
         DataDomain domain = runtime.getDataDomain();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java
index 86b4005..f41af3d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.di.AdhocObjectFactory;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataNodeIT extends ServerCase {
@@ -31,6 +32,7 @@ public class DataNodeIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testName() throws Exception {
         String tstName = "tst_name";
         DataNode node = new DataNode();
@@ -39,6 +41,7 @@ public class DataNodeIT extends ServerCase {
         assertEquals(tstName, node.getName());
     }
 
+    @Test
     public void testDataSourceLocation() throws Exception {
         String tstName = "tst_name";
         DataNode node = new DataNode();
@@ -47,6 +50,7 @@ public class DataNodeIT extends ServerCase {
         assertEquals(tstName, node.getDataSourceLocation());
     }
 
+    @Test
     public void testDataSourceFactory() throws Exception {
         String tstName = "tst_name";
         DataNode node = new DataNode();
@@ -55,6 +59,7 @@ public class DataNodeIT extends ServerCase {
         assertEquals(tstName, node.getDataSourceFactory());
     }
 
+    @Test
     public void testNodeEntityResolver() {
         DataNode node = new DataNode();
         assertNull(node.getEntityResolver());
@@ -64,6 +69,7 @@ public class DataNodeIT extends ServerCase {
         assertSame(resolver, node.getEntityResolver());
     }
 
+    @Test
     public void testAdapter() throws Exception {
         DataNode node = new DataNode();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 bfe476a..f6e70ba 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
@@ -29,6 +29,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
+import org.junit.Test;
 
 import java.sql.Date;
 import java.util.Collections;
@@ -69,6 +70,7 @@ public class DataNodeQueriesIT extends ServerCase {
         tArtist.insert(3001, "artist5");
     }
 
+    @Test
     public void testCreatePkSupportForMapEntities() throws Exception {
 
         DbEntity artistEnt = node.getEntityResolver().getDbEntity("ARTIST");
@@ -82,6 +84,7 @@ public class DataNodeQueriesIT extends ServerCase {
                 exhibitEnt.getPrimaryKeys().iterator().next()));
     }
 
+    @Test
     public void testPerfomQueriesSQLTemplate() throws Exception {
         String template = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) "
                 + "VALUES (#bind($id), #bind($name), #bind($dob 'DATE'))";
@@ -105,6 +108,7 @@ public class DataNodeQueriesIT extends ServerCase {
         assertEquals("a1", tArtist.getString("ARTIST_NAME").trim());
     }
 
+    @Test
     public void testPerfomQueriesSelectingSQLTemplate1() throws Exception {
         createFourArtists();
 
@@ -121,6 +125,7 @@ public class DataNodeQueriesIT extends ServerCase {
         assertEquals(201, row.get("ARTIST_ID"));
     }
 
+    @Test
     public void testPerfomQueriesSelectingSQLTemplate2() throws Exception {
         createFourArtists();
 
@@ -141,6 +146,7 @@ public class DataNodeQueriesIT extends ServerCase {
         assertEquals(201, id.intValue());
     }
 
+    @Test
     public void testPerfomQueriesSelectingSQLTemplateAlias() throws Exception {
         createFourArtists();
 
@@ -157,6 +163,7 @@ public class DataNodeQueriesIT extends ServerCase {
         assertEquals(201, row.get("A"));
     }
 
+    @Test
     public void testRunMultiLineSQLTemplateUNIX() throws Exception {
         String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME)"
                 + "\n"
@@ -167,6 +174,7 @@ public class DataNodeQueriesIT extends ServerCase {
                 new MockOperationObserver());
     }
 
+    @Test
     public void testRunMultiLineSQLTemplateWindows() throws Exception {
         String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME)"
                 + "\r\n"
@@ -177,6 +185,7 @@ public class DataNodeQueriesIT extends ServerCase {
                 new MockOperationObserver());
     }
 
+    @Test
     public void testRunMultiLineSQLTemplateMac() throws Exception {
         String templateString = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME)"
                 + "\r"

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
index 306b678..0496f5c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
@@ -19,20 +19,22 @@
 
 package org.apache.cayenne.access;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.event.DefaultEventManager;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataRowStoreIT extends ServerCase {
 
+    @Test
     public void testDefaultConstructor() {
         DataRowStore cache = new DataRowStore(
                 "cacheXYZ",
@@ -46,6 +48,7 @@ public class DataRowStoreIT extends ServerCase {
                 .isNotifyingRemoteListeners());
     }
 
+    @Test
     public void testConstructorWithProperties() {
         Map<Object, Object> props = new HashMap<Object, Object>();
         props.put(DataRowStore.REMOTE_NOTIFICATION_PROPERTY, String
@@ -60,6 +63,7 @@ public class DataRowStoreIT extends ServerCase {
                 .isNotifyingRemoteListeners());
     }
 
+    @Test
     public void testNotifyingRemoteListeners() {
         DataRowStore cache = new DataRowStore(
                 "cacheXYZ",
@@ -77,6 +81,7 @@ public class DataRowStoreIT extends ServerCase {
     /**
      * Tests LRU cache behavior.
      */
+    @Test
     public void testMaxSize() throws Exception {
         Map<Object, Object> props = new HashMap<Object, Object>();
         props.put(DataRowStore.SNAPSHOT_CACHE_SIZE_PROPERTY, String.valueOf(2));

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 7d9c18d..e61a4c7 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
@@ -32,6 +32,7 @@ import org.apache.cayenne.testdo.testmap.Gallery;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 
@@ -75,6 +76,7 @@ public class DataRowUtilsIT extends ServerCase {
         tPainting.insert(6, "p_artist2", 11, 1000);
     }
 
+    @Test
     public void testMerge() throws Exception {
         createOneArtist();
 
@@ -99,6 +101,7 @@ public class DataRowUtilsIT extends ServerCase {
         assertEquals(s2.get("DATE_OF_BIRTH"), a1.getDateOfBirth());
     }
 
+    @Test
     public void testIsToOneTargetModified() throws Exception {
         createOneArtist();
 
@@ -131,6 +134,7 @@ public class DataRowUtilsIT extends ServerCase {
         assertTrue(DataRowUtils.isToOneTargetModified(toArtist, painting, diff));
     }
 
+    @Test
     public void testIsToOneTargetModifiedWithNewTarget() throws Exception {
         createOneArtistAndOnePainting();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
index 2e01bd1..f5f8dc4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.CalendarEntity;
 import org.apache.cayenne.testdo.testmap.DateTestEntity;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Time;
 import java.util.Calendar;
@@ -51,6 +52,7 @@ public class DateTimeTypesIT extends ServerCase {
         dbHelper.deleteAll("DATE_TEST");
     }
 
+    @Test
     public void testCalendar() throws Exception {
 
         CalendarEntity test = context.newObject(CalendarEntity.class);
@@ -71,6 +73,7 @@ public class DateTimeTypesIT extends ServerCase {
         context.commitChanges();
     }
 
+    @Test
     public void testDate() throws Exception {
         DateTestEntity test = context.newObject(DateTestEntity.class);
 
@@ -88,6 +91,7 @@ public class DateTimeTypesIT extends ServerCase {
         assertEquals(Date.class, testRead.getDateColumn().getClass());
     }
 
+    @Test
     public void testTime() throws Exception {
         DateTestEntity test = context.newObject(DateTestEntity.class);
 
@@ -112,6 +116,7 @@ public class DateTimeTypesIT extends ServerCase {
         assertTrue("" + delta, Math.abs(delta) <= 1000 * 60 * 60);
     }
 
+    @Test
     public void testTimestamp() throws Exception {
         DateTestEntity test = context.newObject(DateTestEntity.class);
 
@@ -132,6 +137,7 @@ public class DateTimeTypesIT extends ServerCase {
         assertEquals(now, testRead.getTimestampColumn());
     }
 
+    @Test
     public void testSQLTemplateTimestamp() throws Exception {
         DateTestEntity test = context.newObject(DateTestEntity.class);
 
@@ -153,6 +159,7 @@ public class DateTimeTypesIT extends ServerCase {
         assertEquals(now, columnValue);
     }
 
+    @Test
     public void testSQLTemplateDate() throws Exception {
         DateTestEntity test = (DateTestEntity) context.newObject("DateTestEntity");
 
@@ -174,6 +181,7 @@ public class DateTimeTypesIT extends ServerCase {
         assertEquals(now.toString(), new java.sql.Date(columnValue.getTime()).toString());
     }
 
+    @Test
     public void testSQLTemplateTime() throws Exception {
         DateTestEntity test = (DateTestEntity) context.newObject("DateTestEntity");
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 a5db4e9..ab177f3 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
@@ -27,6 +27,7 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DbGeneratorIT extends ServerCase {
@@ -49,10 +50,12 @@ public class DbGeneratorIT extends ServerCase {
                 .getDataMap("tstmap"), logger);
     }
 
+    @Test
     public void testAdapter() throws Exception {
         assertSame(adapter, generator.getAdapter());
     }
 
+    @Test
     public void testPkFilteringLogic() throws Exception {
         DataMap map = runtime.getDataDomain().getDataMap("tstmap");
         DbEntity artistExhibit = map.getDbEntity("ARTIST_EXHIBIT");
@@ -68,6 +71,7 @@ public class DbGeneratorIT extends ServerCase {
         assertFalse(generator.dbEntitiesRequiringAutoPK.contains(artistExhibit));
     }
 
+    @Test
     public void testCreatePkSupport() throws Exception {
         assertTrue(generator.shouldCreatePKSupport());
         generator.setShouldCreatePKSupport(false);
@@ -75,12 +79,14 @@ public class DbGeneratorIT extends ServerCase {
 
     }
 
+    @Test
     public void testShouldCreateTables() throws Exception {
         assertTrue(generator.shouldCreateTables());
         generator.setShouldCreateTables(false);
         assertFalse(generator.shouldCreateTables());
     }
 
+    @Test
     public void testDropPkSupport() throws Exception {
 
         assertFalse(generator.shouldDropPKSupport());
@@ -88,6 +94,7 @@ public class DbGeneratorIT extends ServerCase {
         assertTrue(generator.shouldDropPKSupport());
     }
 
+    @Test
     public void testShouldDropTables() throws Exception {
         assertFalse(generator.shouldDropTables());
         generator.setShouldDropTables(true);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 b294cc8..8ca7676 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
@@ -33,6 +33,7 @@ import org.apache.cayenne.unit.UnitDbAdapter;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Types;
 import java.util.Collection;
@@ -65,6 +66,7 @@ public class DbLoaderIT extends ServerCase {
         loader.getConnection().close();
     }
 
+    @Test
     public void testGetTableTypes() throws Exception {
 
         List<?> tableTypes = loader.getTableTypes();
@@ -82,6 +84,7 @@ public class DbLoaderIT extends ServerCase {
         }
     }
 
+    @Test
     public void testGetTables() throws Exception {
 
         String tableLabel = adapter.tableTypeForTable();
@@ -102,6 +105,7 @@ public class DbLoaderIT extends ServerCase {
         assertTrue("'ARTIST' is missing from the table list: " + tables, foundArtist);
     }
 
+    @Test
     public void testLoadWithMeaningfulPK() throws Exception {
 
         DataMap map = new DataMap();
@@ -128,6 +132,7 @@ public class DbLoaderIT extends ServerCase {
      * individual tests would require multiple reads of metatdata which is
      * extremely slow on some RDBMS (Sybase).
      */
+    @Test
     public void testLoad() throws Exception {
 
         boolean supportsUnique = runtime.getDataDomain().getDataNodes().iterator().next().getAdapter()

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 69a99cc..18ce6d5 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
@@ -27,6 +27,7 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.Collection;
 
@@ -67,6 +68,7 @@ public class DbLoaderPartialIT extends ServerCase {
      * ARTIST and GALLERY should remain unmodified, and all PAINTING relationships should
      * be loaded.
      */
+    @Test
     public void testPartialLoad() throws Exception {
 
         DataMap map = new DataMap();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 cb5783d..bddf3bf 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
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -84,6 +85,7 @@ public class DeleteObjectIT extends ServerCase {
         tPainting.insert(3, "painting3", 1);
     }
 
+    @Test
     public void testDeleteObject() throws Exception {
         createObjectDataSet();
 
@@ -96,6 +98,7 @@ public class DeleteObjectIT extends ServerCase {
         assertNull(artist.getObjectContext());
     }
 
+    @Test
     public void testDeleteObjects1() throws Exception {
         createObjectsDataSet();
 
@@ -115,6 +118,7 @@ public class DeleteObjectIT extends ServerCase {
 
     // Similar to testDeleteObjects2, but extract ObjectContext instead of
     // DataContext.
+    @Test
     public void testDeleteObjects2() throws Exception {
         createObjectsDataSet();
 
@@ -138,6 +142,7 @@ public class DeleteObjectIT extends ServerCase {
         }
     }
 
+    @Test
     public void testDeleteObjectsRelationshipCollection() throws Exception {
         createObjectsRelationshipCollectionDataSet();
 
@@ -167,6 +172,7 @@ public class DeleteObjectIT extends ServerCase {
         }
     }
 
+    @Test
     public void testDeleteObjectInIterator() throws Exception {
         createObjectsRelationshipCollectionDataSet();
 
@@ -198,6 +204,7 @@ public class DeleteObjectIT extends ServerCase {
         }
     }
 
+    @Test
     public void testDeleteHollow() throws Exception {
         createHollowDataSet();
 
@@ -211,6 +218,7 @@ public class DeleteObjectIT extends ServerCase {
         assertEquals(PersistenceState.DELETED, a.getPersistenceState());
     }
 
+    @Test
     public void testDeleteNew() throws Exception {
         Artist artist = context.newObject(Artist.class);
         artist.setArtistName("a");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
index 3a21da1..8dda83f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
@@ -35,6 +35,7 @@ import org.apache.cayenne.testdo.relationship.DeleteRuleTest2;
 import org.apache.cayenne.testdo.relationship.DeleteRuleTest3;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -59,6 +60,7 @@ public class DeleteRulesIT extends ServerCase {
         dbHelper.deleteAll("DELETE_RULE_FLATA");
     }
 
+    @Test
     public void testDenyToOne() {
 
         DeleteRuleTest1 test1 = context.newObject(DeleteRuleTest1.class);
@@ -76,6 +78,7 @@ public class DeleteRulesIT extends ServerCase {
 
     }
 
+    @Test
     public void testNoActionToOne() {
         DeleteRuleTest2 test2 = context.newObject(DeleteRuleTest2.class);
         DeleteRuleTest3 test3 = context.newObject(DeleteRuleTest3.class);
@@ -87,6 +90,7 @@ public class DeleteRulesIT extends ServerCase {
         context.commitChanges();
     }
 
+    @Test
     public void testNoActionToMany() {
         DeleteRuleTest2 test2 = context.newObject(DeleteRuleTest2.class);
         DeleteRuleTest3 test3 = context.newObject(DeleteRuleTest3.class);
@@ -99,6 +103,7 @@ public class DeleteRulesIT extends ServerCase {
         // don't commit, since this will cause a constraint exception
     }
 
+    @Test
     public void testNoActionFlattened() {
         // temporarily set delete rule to NOACTION...
         int oldRule = changeDeleteRule(DeleteRule.NO_ACTION);
@@ -125,6 +130,7 @@ public class DeleteRulesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testNoActionFlattenedNoReverse() {
         // temporarily set delete rule to NOACTION...
         int oldRule = changeDeleteRule(DeleteRule.NO_ACTION);
@@ -151,6 +157,7 @@ public class DeleteRulesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCascadeFlattened() {
         // temporarily set delete rule to CASCADE...
         int oldRule = changeDeleteRule(DeleteRule.CASCADE);
@@ -175,6 +182,7 @@ public class DeleteRulesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCascadeFlattenedNoReverse() {
         // temporarily set delete rule to CASCADE...
         int oldRule = changeDeleteRule(DeleteRule.CASCADE);
@@ -200,6 +208,7 @@ public class DeleteRulesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testNullifyFlattened() {
         // temporarily set delete rule to NULLIFY...
         int oldRule = changeDeleteRule(DeleteRule.NULLIFY);
@@ -224,6 +233,7 @@ public class DeleteRulesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testNullifyFlattenedNoReverse() {
         // temporarily set delete rule to NULLIFY...
         int oldRule = changeDeleteRule(DeleteRule.NULLIFY);
@@ -249,6 +259,7 @@ public class DeleteRulesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testDenyFlattened() {
         // temporarily set delete rule to DENY...
         int oldRule = changeDeleteRule(DeleteRule.DENY);
@@ -271,6 +282,7 @@ public class DeleteRulesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testDenyFlattenedNoReverse() {
         // temporarily set delete rule to DENY...
         int oldRule = changeDeleteRule(DeleteRule.DENY);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 8e9a3db..8f8be6d 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
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.embeddable.EmbedEntity1;
 import org.apache.cayenne.testdo.embeddable.Embeddable1;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 
@@ -64,6 +65,7 @@ public class EmbeddingIT extends ServerCase {
         tEmbedEntity1.insert(1, "n1", "e1", "e2", "e3", "e4");
     }
 
+    @Test
     public void testSelect() throws Exception {
         createSelectDataSet();
 
@@ -100,6 +102,7 @@ public class EmbeddingIT extends ServerCase {
         assertEquals("ex4", e22.getEmbedded20());
     }
 
+    @Test
     public void testInsert() throws Exception {
 
         EmbedEntity1 o1 = context.newObject(EmbedEntity1.class);
@@ -131,6 +134,7 @@ public class EmbeddingIT extends ServerCase {
         assertEquals("E22", row.get("EMBEDDED40"));
     }
 
+    @Test
     public void testUpdateEmbeddedProperties() throws Exception {
         createUpdateDataSet();
 
@@ -153,6 +157,7 @@ public class EmbeddingIT extends ServerCase {
         assertEquals("x1", row.get("EMBEDDED10"));
     }
 
+    @Test
     public void testUpdateEmbedded() throws Exception {
         createUpdateDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java
index 45e15fd..c2a3b9f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Enum1;
 import org.apache.cayenne.testdo.testmap.EnumEntity;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class EnumIT extends ServerCase {
@@ -55,12 +56,14 @@ public class EnumIT extends ServerCase {
         tEnumEntity.insert(2, "one");
     }
 
+    @Test
     public void testInsert() {
         EnumEntity e = context.newObject(EnumEntity.class);
         e.setEnumAttribute(Enum1.one);
         context.commitChanges();
     }
 
+    @Test
     public void testSelectQuery() throws Exception {
         createDataSet();
 
@@ -74,6 +77,7 @@ public class EnumIT extends ServerCase {
         assertSame(Enum1.one, e.getEnumAttribute());
     }
 
+    @Test
     public void testSQLTemplate() throws Exception {
         createDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
index 96c0191..3d60f01 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.relationship.FlattenedTest1;
 import org.apache.cayenne.testdo.relationship.FlattenedTest3;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
 public class FlattenedArcKeyIT extends ServerCase {
@@ -34,6 +35,7 @@ public class FlattenedArcKeyIT extends ServerCase {
     @Inject
     private EntityResolver entityResolver;
 
+    @Test
     public void testAttributes() {
         ObjectId src = new ObjectId("X");
         ObjectId target = new ObjectId("Y");
@@ -47,6 +49,7 @@ public class FlattenedArcKeyIT extends ServerCase {
         assertSame(r1, update.relationship);
     }
 
+    @Test
     public void testHashCode() {
         ObjectId src = new ObjectId("X");
         ObjectId target = new ObjectId("Y");
@@ -69,6 +72,7 @@ public class FlattenedArcKeyIT extends ServerCase {
         assertFalse(h == h2);
     }
 
+    @Test
     public void testEquals() {
         ObjectId src = new ObjectId("X");
         ObjectId target = new ObjectId("Y");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 92cea2f..aa4d9ff 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
@@ -34,6 +34,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor;
 import org.apache.cayenne.unit.di.UnitTestClosure;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Types;
 import java.util.HashSet;
@@ -116,6 +117,7 @@ public class FlattenedPrefetchIT extends ServerCase {
         tPainting.insert(33003, "P_artist21", 33002, 3000);
     }
 
+    @Test
     public void testManyToMany() throws Exception {
         createPrefetchDataSet1();
 
@@ -150,6 +152,7 @@ public class FlattenedPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testMultiPrefetch() throws Exception {
         createPrefetchDataSet2();
 
@@ -187,6 +190,7 @@ public class FlattenedPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testJointManyToMany() throws Exception {
         createPrefetchDataSet1();
 
@@ -223,6 +227,7 @@ public class FlattenedPrefetchIT extends ServerCase {
 
     }
 
+    @Test
     public void testJointMultiPrefetch() throws Exception {
         createPrefetchDataSet2();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 b3fbc2e..7f81b24 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
@@ -30,6 +30,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.relationship.FlattenedTest3;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 
@@ -71,6 +72,7 @@ public class FlattenedRelationshipInContextIT extends ServerCase {
         tFlattenedTest3.insert(1, 1, "ft3");
     }
 
+    @Test
     public void testIsToOneTargetModifiedFlattenedFault1() throws Exception {
 
         createFlattenedTestDataSet();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 b637efd..22adb11 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
@@ -39,6 +39,7 @@ import org.apache.cayenne.testdo.testmap.GeneratedF1;
 import org.apache.cayenne.testdo.testmap.GeneratedF2;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 
@@ -75,6 +76,7 @@ public class IdentityColumnsIT extends ServerCase {
      * Tests a bug casued by the ID Java type mismatch vs the default JDBC type
      * of the ID column.
      */
+    @Test
     public void testCAY823() throws Exception {
 
         GeneratedColumnTestEntity idObject = context.newObject(GeneratedColumnTestEntity.class);
@@ -96,6 +98,7 @@ public class IdentityColumnsIT extends ServerCase {
         assertEquals(id, ((Persistent) results.get(0)).getObjectId());
     }
 
+    @Test
     public void testNewObject() throws Exception {
 
         GeneratedColumnTestEntity idObject = context.newObject(GeneratedColumnTestEntity.class);
@@ -117,6 +120,7 @@ public class IdentityColumnsIT extends ServerCase {
         assertEquals(name, object.getName());
     }
 
+    @Test
     public void testGeneratedJoinInFlattenedRelationship() throws Exception {
 
         // before saving objects, let's manually access PKGenerator to get a
@@ -149,6 +153,7 @@ public class IdentityColumnsIT extends ServerCase {
     /**
      * Tests CAY-422 bug.
      */
+    @Test
     public void testUnrelatedUpdate() throws Exception {
 
         GeneratedColumnTestEntity m = context.newObject(GeneratedColumnTestEntity.class);
@@ -175,6 +180,7 @@ public class IdentityColumnsIT extends ServerCase {
      * Tests that insert in two tables with identity pk does not generate a
      * conflict. See CAY-341 for the original bug.
      */
+    @Test
     public void testMultipleNewObjectsSeparateTables() throws Exception {
 
         GeneratedColumnTestEntity idObject1 = context.newObject(GeneratedColumnTestEntity.class);
@@ -186,6 +192,7 @@ public class IdentityColumnsIT extends ServerCase {
         context.commitChanges();
     }
 
+    @Test
     public void testMultipleNewObjects() throws Exception {
 
         String[] names = new String[] { "n1_" + System.currentTimeMillis(), "n2_" + System.currentTimeMillis(),
@@ -216,6 +223,7 @@ public class IdentityColumnsIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCompoundPKWithGeneratedColumn() throws Exception {
         if (adapter.supportsGeneratedKeys()) {
             // only works for generated keys, as the entity tested has one
@@ -263,6 +271,7 @@ public class IdentityColumnsIT extends ServerCase {
         }
     }
 
+    @Test
     public void testUpdateDependentWithNewMaster() throws Exception {
 
         GeneratedColumnTestEntity master1 = context.newObject(GeneratedColumnTestEntity.class);
@@ -295,6 +304,7 @@ public class IdentityColumnsIT extends ServerCase {
         assertNotNull(Cayenne.objectForPK(context, GeneratedColumnDep.class, id2));
     }
 
+    @Test
     public void testGeneratedDefaultValue() throws Exception {
 
         // fail("TODO: test insert with DEFAULT generated column...need custom
@@ -302,6 +312,7 @@ public class IdentityColumnsIT extends ServerCase {
         // build such table");
     }
 
+    @Test
     public void testPropagateToDependent() throws Exception {
 
         GeneratedColumnTestEntity idObject = context.newObject(GeneratedColumnTestEntity.class);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
index c233c59..6c954b2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.util.Util;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class IncrementalFaultListIT extends ServerCase {
@@ -31,6 +32,7 @@ public class IncrementalFaultListIT extends ServerCase {
 	@Inject
 	protected DataContext context;
 
+    @Test
 	public void testSerialization() throws Exception {
 		SelectQuery query = new SelectQuery(Artist.class);
 		query.setPageSize(10);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 0fbfdc7..c4a0216 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
@@ -44,6 +44,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor;
 import org.apache.cayenne.unit.di.UnitTestClosure;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Date;
 import java.util.Collections;
@@ -120,6 +121,7 @@ public class JointPrefetchIT extends ServerCase {
         tPainting.insert(33003, "P_artist21", 33002, 3000, 33002);
     }
 
+    @Test
     public void testJointPrefetch_ToOne_FetchLimit() throws Exception {
         createJointPrefetchDataSet1();
 
@@ -148,6 +150,7 @@ public class JointPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testJointPrefetch_ToMany_FetchLimit() throws Exception {
         createJointPrefetchDataSet1();
 
@@ -180,6 +183,7 @@ public class JointPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testJointPrefetchDataRows() throws Exception {
         createJointPrefetchDataSet1();
 
@@ -229,6 +233,7 @@ public class JointPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testJointPrefetchSQLTemplate() throws Exception {
         createJointPrefetchDataSet1();
 
@@ -283,6 +288,7 @@ public class JointPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testJointPrefetchToOne() throws Exception {
         createJointPrefetchDataSet1();
 
@@ -313,6 +319,7 @@ public class JointPrefetchIT extends ServerCase {
     /**
      * Tests that joined entities can have non-standard type mappings.
      */
+    @Test
     public void testJointPrefetchDataTypes() throws Exception {
         // prepare... can't load from XML, as it doesn't yet support dates..
         SQLTemplate artistSQL = new SQLTemplate(
@@ -364,6 +371,7 @@ public class JointPrefetchIT extends ServerCase {
         }
     }
 
+    @Test
     public void testJointPrefetchToMany() throws Exception {
         createJointPrefetchDataSet1();
 
@@ -399,6 +407,7 @@ public class JointPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testJointPrefetchToManyNonConflictingQualifier() throws Exception {
         createJointPrefetchDataSet1();
 
@@ -440,6 +449,7 @@ public class JointPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testJointPrefetchMultiStep() throws Exception {
         createJointPrefetchDataSet2();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java
index 3ed721f..731d8c8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.SerializableEntity;
 import org.apache.cayenne.unit.UnitDbAdapter;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.lang.reflect.Array;
 
@@ -54,6 +55,7 @@ public class MiscTypesIT extends ServerCase {
         dbHelper.deleteAll("CHARACTER_ENTITY");
     }
 
+    @Test
     public void testSerializable() throws Exception {
         
         // this test requires BLOB support
@@ -77,6 +79,7 @@ public class MiscTypesIT extends ServerCase {
         context.commitChanges();
     }
 
+    @Test
     public void testByteArray() {
         ArraysEntity test = context.newObject(ArraysEntity.class);
 
@@ -95,6 +98,7 @@ public class MiscTypesIT extends ServerCase {
         context.commitChanges();
     }
 
+    @Test
     public void testCharArray() {
         ArraysEntity test = context.newObject(ArraysEntity.class);
 
@@ -113,6 +117,7 @@ public class MiscTypesIT extends ServerCase {
         context.commitChanges();
     }
 
+    @Test
     public void testCharacterArray() {
         ArraysEntity test = context.newObject(ArraysEntity.class);
 
@@ -130,7 +135,8 @@ public class MiscTypesIT extends ServerCase {
         test.setCharWrapperArray(null);
         context.commitChanges();
     }
-    
+
+    @Test
     public void testCharacter() {
         CharacterEntity test = context.newObject(CharacterEntity.class);
 
@@ -146,6 +152,7 @@ public class MiscTypesIT extends ServerCase {
         context.commitChanges();
     }
 
+    @Test
     public void testByteWrapperArray() {
         ArraysEntity test = context.newObject(ArraysEntity.class);
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java
index 01bf924..c492165 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 
@@ -54,6 +55,7 @@ public class NestedDataContextLocalCacheIT extends ServerCase {
         dbHelper.deleteAll("GALLERY");
     }
 
+    @Test
     public void testLocalCacheStaysLocal() {
 
         SelectQuery query = new SelectQuery(Artist.class);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
index fa87bc8..6665160 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.test.parallel.ParallelTestContainer;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class NestedDataContextParentEventsIT extends ServerCase {
@@ -36,6 +37,7 @@ public class NestedDataContextParentEventsIT extends ServerCase {
     @Inject
     private DataContext context;
 
+    @Test
     public void testParentUpdatedId() throws Exception {
         ObjectContext child1 = runtime.newContext(context);
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
index cf2454a..5273235 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.relationship.Child;
 import org.apache.cayenne.testdo.relationship.Master;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
 public class NestedDataContextParentPeerEventsIT extends ServerCase {
@@ -40,6 +41,7 @@ public class NestedDataContextParentPeerEventsIT extends ServerCase {
     @Inject
     private DataContext parentContext2;
 
+    @Test
     public void testPeerObjectUpdatedSimpleProperty() throws Exception {
         Master a = parentContext1.newObject(Master.class);
         a.setName("X");
@@ -67,6 +69,7 @@ public class NestedDataContextParentPeerEventsIT extends ServerCase {
         }.runTest(2000);
     }
 
+    @Test
     public void testPeerObjectUpdatedToOneRelationship() throws Exception {
         Master a = parentContext1.newObject(Master.class);
         Master altA = parentContext1.newObject(Master.class);
@@ -102,6 +105,7 @@ public class NestedDataContextParentPeerEventsIT extends ServerCase {
         }.runTest(2000);
     }
 
+    @Test
     public void testPeerObjectUpdatedToManyRelationship() throws Exception {
         Master a = parentContext1.newObject(Master.class);
         a.setName("X");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
index 9afd2c7..3da5090 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class NestedDataContextPeerEventsIT extends ServerCase {
@@ -38,6 +39,7 @@ public class NestedDataContextPeerEventsIT extends ServerCase {
 	@Inject
 	private ServerRuntime runtime;
 
+    @Test
 	public void testPeerObjectUpdatedTempOID() throws Exception {
 
 		ObjectContext peer1 = runtime.newContext(context);
@@ -66,6 +68,7 @@ public class NestedDataContextPeerEventsIT extends ServerCase {
 		}.runTest(2000);
 	}
 
+    @Test
 	public void testPeerObjectUpdatedSimpleProperty() throws Exception {
 		Artist a = context.newObject(Artist.class);
 		a.setArtistName("X");
@@ -95,6 +98,7 @@ public class NestedDataContextPeerEventsIT extends ServerCase {
 
 	}
 
+    @Test
 	public void testPeerObjectUpdatedToOneRelationship() throws Exception {
 
 		Artist a = context.newObject(Artist.class);
@@ -135,6 +139,7 @@ public class NestedDataContextPeerEventsIT extends ServerCase {
 
 	}
 
+    @Test
 	public void testPeerObjectUpdatedToManyRelationship() throws Exception {
 
 		Artist a = context.newObject(Artist.class);


Mime
View raw message