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/14 18:47:12 UTC

[11/50] [abbrv] cayenne git commit: Apply JUnit4 instead of JUnit3 in IT

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/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 88c15e4..7c7d812 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
@@ -35,6 +35,7 @@ import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.UnitDbAdapter;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.math.BigDecimal;
 import java.sql.Types;
@@ -112,6 +113,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
     /**
      * CAY-899: Checks that aggregate results do not cause callbacks execution.
      */
+    @Test
     public void testSelectAggregatePostLoadCallback() throws Exception {
 
         createFourArtistsTwoPaintings();
@@ -143,6 +145,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         }
     }
 
+    @Test
     public void testSelectAggregate() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -159,6 +162,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         AssertExtras.assertEquals(new BigDecimal(8000d), aggregates[3], 0.01);
     }
 
+    @Test
     public void testSelectAggregateNull() throws Exception {
 
         if (!accessStackAdapter.supportNullRowForAggregateFunctions()) {
@@ -178,6 +182,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(null, aggregates[2]);
     }
 
+    @Test
     public void testSelectEntityPathsScalarResult() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -192,6 +197,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals("P1", data.get(1));
     }
 
+    @Test
     public void testSelectEntityPathsArrayResult() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -215,6 +221,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals("AA2", row1[1]);
     }
 
+    @Test
     public void testSimpleSelect() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -227,6 +234,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertTrue(((Artist) artists.get(0)).getPersistenceState() == PersistenceState.COMMITTED);
     }
 
+    @Test
     public void testFetchLimit() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -238,6 +246,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(2, artists.size());
     }
 
+    @Test
     public void testSelectFromWhereEqual() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -249,6 +258,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals("AA2", ((Artist) artists.get(0)).getArtistName());
     }
 
+    @Test
     public void testSelectFromWhereEqualReverseOrder() throws Exception {
         if (!accessStackAdapter.supportsReverseComparison()) {
             return;
@@ -264,6 +274,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals("AA2", ((Artist) artists.get(0)).getArtistName());
     }
 
+    @Test
     public void testSelectFromWhereNot() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -279,6 +290,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         }
     }
 
+    @Test
     public void testSelectFromWhereNotEquals() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -294,6 +306,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         }
     }
 
+    @Test
     public void testSelectFromWhereOrEqual() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -313,6 +326,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertTrue(names.contains("BB1"));
     }
 
+    @Test
     public void testSelectFromWhereAndEqual() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -328,6 +342,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
     }
 
+    @Test
     public void testSelectFromWhereBetween() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -342,6 +357,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
     }
 
+    @Test
     public void testSelectFromWhereNotBetween() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -356,6 +372,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         AssertExtras.assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
     }
 
+    @Test
     public void testSelectFromWhereGreater() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -370,6 +387,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         AssertExtras.assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
     }
 
+    @Test
     public void testSelectFromWhereGreaterOrEqual() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -380,6 +398,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(2, ps.size());
     }
 
+    @Test
     public void testSelectFromWhereLess() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -394,6 +413,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
     }
 
+    @Test
     public void testSelectFromWhereLessOrEqual() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -404,6 +424,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(2, ps.size());
     }
 
+    @Test
     public void testSelectFromWhereDecimalNumber() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -414,6 +435,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(2, ps.size());
     }
 
+    @Test
     public void testSelectFromWhereDecimalNumberPositional() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -425,6 +447,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(2, ps.size());
     }
 
+    @Test
     public void testSelectFromWhereDecimalNumberNamed() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -436,6 +459,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(2, ps.size());
     }
 
+    @Test
     public void testSelectFromWhereMatchOnObject() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -452,6 +476,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(33002, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testSelectFromWhereMatchRelationshipAndScalar() throws Exception {
         createFourArtistsTwoPaintings();
 
@@ -465,6 +490,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(33002, Cayenne.intPKForObject(p));
     }
 
+    @Test
     public void testSelectFromWhereMatchOnMultiColumnObject() throws Exception {
         createTwoCompoundPKTwoFK();
 
@@ -487,6 +513,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(33002, Cayenne.intPKForObject(o1));
     }
 
+    @Test
     public void testSelectFromWhereMatchOnMultiColumnObjectReverse() throws Exception {
         if (!accessStackAdapter.supportsReverseComparison()) {
             return;
@@ -513,6 +540,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
         assertEquals(33002, Cayenne.intPKForObject(o1));
     }
 
+    @Test
     public void testSelectFromWhereNoMatchOnMultiColumnObject() throws Exception {
         createTwoCompoundPKTwoFK();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 37054c4..7b42a27 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
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.UnitDbAdapter;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Types;
 import java.util.HashSet;
@@ -84,6 +85,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
         tPainting.insert(33004, null, "P4", 6000);
     }
 
+    @Test
     public void testSubqueryNoQualifier() throws Exception {
         if (!accessStackAdapter.supportsAllAnySome()) {
             return;
@@ -110,6 +112,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
         assertTrue(ids.contains(new Integer(33004)));
     }
 
+    @Test
     public void testDifferentEntity() throws Exception {
         createTwoArtistsFourPaintings();
 
@@ -135,6 +138,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
         assertTrue("" + objects.get(0), objects.get(0) instanceof Artist);
     }
 
+    @Test
     public void testExists() throws Exception {
         createTwoArtistsFourPaintings();
 
@@ -160,6 +164,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
         assertTrue(ids.contains(new Integer(33003)));
     }
 
+    @Test
     public void testAll() throws Exception {
         if (!accessStackAdapter.supportsAllAnySome()) {
             return;
@@ -188,6 +193,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
         assertTrue(ids.contains(new Integer(33004)));
     }
 
+    @Test
     public void testAny() throws Exception {
         if (!accessStackAdapter.supportsAllAnySome()) {
             return;
@@ -217,6 +223,7 @@ public class DataContextEJBQLSubqueryIT extends ServerCase {
         assertTrue(ids.contains(new Integer(33004)));
     }
 
+    @Test
     public void testSome() throws Exception {
         if (!accessStackAdapter.supportsAllAnySome()) {
             return;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 a3ba28b..d16eb51 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
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.testmap.BooleanTestEntity;
 import org.apache.cayenne.testdo.testmap.CompoundPkTestEntity;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Types;
 import java.util.HashMap;
@@ -96,6 +97,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
         tCompoundFk.insert(33002, "b1", "b2");
     }
 
+    @Test
     public void testUpdateQualifier() throws Exception {
         createThreeArtistsTwoPaintings();
 
@@ -119,6 +121,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
         assertEquals(new Long(1l), notUpdated);
     }
 
+    @Test
     public void testUpdateNoQualifierString() throws Exception {
         createThreeArtistsTwoPaintings();
 
@@ -142,6 +145,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
         assertEquals(new Long(0l), notUpdated);
     }
 
+    @Test
     public void testUpdateNoQualifierNull() throws Exception {
         createThreeArtistsTwoPaintings();
 
@@ -191,6 +195,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
     // assertEquals(new Long(0l), notUpdated);
     // }
 
+    @Test
     public void testUpdateNoQualifierMultipleItems() throws Exception {
         createThreeArtistsTwoPaintings();
 
@@ -214,6 +219,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
         assertEquals(new Long(0l), notUpdated);
     }
 
+    @Test
     public void testUpdateNoQualifierDecimal() throws Exception {
         createThreeArtistsTwoPaintings();
 
@@ -237,6 +243,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
         assertEquals(new Long(0l), notUpdated);
     }
 
+    @Test
     public void testUpdateNoQualifierBoolean() throws Exception {
 
         BooleanTestEntity o1 = context.newObject(BooleanTestEntity.class);
@@ -270,6 +277,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
         assertEquals(new Long(3l), notUpdated);
     }
 
+    @Test
     public void testUpdateNoQualifierToOne() throws Exception {
         createThreeArtistsTwoPaintings();
 
@@ -297,6 +305,7 @@ public class DataContextEJBQLUpdateIT extends ServerCase {
         assertEquals(new Long(0l), notUpdated);
     }
 
+    @Test
     public void testUpdateNoQualifierToOneCompoundPK() throws Exception {
         createTwoCompoundPKTwoFK();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
index d8c3366..6ee1311 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.MeaningfulPKDep;
 import org.apache.cayenne.testdo.testmap.MeaningfulPKTest1;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -53,6 +54,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
         dbHelper.deleteAll("MEANINGFUL_PK_TEST1");
     }
 
+    @Test
     public void testInsertWithMeaningfulPK() throws Exception {
         MeaningfulPKTest1 obj = context.newObject(MeaningfulPKTest1.class);
         obj.setPkAttribute(1000);
@@ -65,6 +67,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
         assertEquals(1, context.performQuery(q).size());
     }
 
+    @Test
     public void testGeneratedKey() throws Exception {
         MeaningfulPKTest1 obj = context.newObject(MeaningfulPKTest1.class);
         obj.setDescr("aaa-aaa");
@@ -84,6 +87,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
                 .get(MeaningfulPKTest1.PK_ATTRIBUTE_PK_COLUMN));
     }
 
+    @Test
     public void testChangeKey() throws Exception {
         MeaningfulPKTest1 obj = (MeaningfulPKTest1) context
                 .newObject("MeaningfulPKTest1");
@@ -99,6 +103,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
         assertEquals(new Integer(2000), id.getIdSnapshot().get("PK_ATTRIBUTE"));
     }
 
+    @Test
     public void testToManyRelationshipWithMeaningfulPK1() throws Exception {
         MeaningfulPKTest1 obj = (MeaningfulPKTest1) context
                 .newObject("MeaningfulPKTest1");
@@ -114,6 +119,7 @@ public class DataContextEntityWithMeaningfulPKIT extends ServerCase {
         assertEquals(0, obj.getMeaningfulPKDepArray().size());
     }
 
+    @Test
     public void testToManyRelationshipWithMeaningfulPK2() throws Exception {
         MeaningfulPKTest1 obj = (MeaningfulPKTest1) context
                 .newObject("MeaningfulPKTest1");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
index 9caaf2b..05a8ece 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.testmap.ExtendedTypeEntity;
 import org.apache.cayenne.testdo.testmap.StringET1;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.Arrays;
 
@@ -47,6 +48,7 @@ public class DataContextExtendedTypeOperationsIT extends ServerCase {
         dbHelper.deleteAll("EXTENDED_TYPE_TEST");
     }
 
+    @Test
     public void testStoreExtendedType() {
         ExtendedTypeEntity e1 = context.newObject(ExtendedTypeEntity.class);
         e1.setName(new StringET1("X"));
@@ -60,6 +62,7 @@ public class DataContextExtendedTypeOperationsIT extends ServerCase {
         assertEquals(1, e1.getObjectContext().performQuery(checkQ).size());
     }
 
+    @Test
     public void testInExpressionExtendedTypeArray() {
         ExtendedTypeEntity e1 = context.newObject(ExtendedTypeEntity.class);
         e1.setName(new StringET1("X"));
@@ -80,6 +83,7 @@ public class DataContextExtendedTypeOperationsIT extends ServerCase {
         assertEquals(2, e1.getObjectContext().performQuery(query).size());
     }
 
+    @Test
     public void testInExpressionExtendedTypeList() {
         ExtendedTypeEntity e1 = context.newObject(ExtendedTypeEntity.class);
         e1.setName(new StringET1("X"));

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 1c6e13e..f8b2ba4 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
@@ -41,6 +41,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.sql.Types;
 import java.util.Date;
@@ -108,6 +109,7 @@ public class DataContextExtrasIT extends ServerCase {
         tPainting.insert(33001, 33001, "P1", 3000);
     }
 
+    @Test
     public void testManualIdProcessingOnCommit() throws Exception {
 
         Artist object = context.newObject(Artist.class);
@@ -125,6 +127,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertEquals(manualId, object.getObjectId());
     }
 
+    @Test
     public void testResolveFault() {
 
         Artist o1 = context.newObject(Artist.class);
@@ -140,6 +143,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertEquals("a", o1.readPropertyDirectly("artistName"));
     }
 
+    @Test
     public void testResolveFaultFailure() {
 
         Persistent o1 = context.findOrCreateObject(new ObjectId(
@@ -156,6 +160,7 @@ public class DataContextExtrasIT extends ServerCase {
         }
     }
 
+    @Test
     public void testUserProperties() {
 
         assertNull(context.getUserProperty("ABC"));
@@ -165,6 +170,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertSame(object, context.getUserProperty("ABC"));
     }
 
+    @Test
     public void testHasChangesNew() {
 
         assertTrue("No changes expected in context", !context.hasChanges());
@@ -174,6 +180,7 @@ public class DataContextExtrasIT extends ServerCase {
                 context.hasChanges());
     }
 
+    @Test
     public void testNewObject() {
 
         Artist a1 = (Artist) context.newObject("Artist");
@@ -181,6 +188,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertTrue(context.newObjects().contains(a1));
     }
 
+    @Test
     public void testNewObjectWithClass() {
 
         Artist a1 = context.newObject(Artist.class);
@@ -188,6 +196,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertTrue(context.newObjects().contains(a1));
     }
 
+    @Test
     public void testIdObjectFromDataRow() {
 
         DataRow row = new DataRow(10);
@@ -200,6 +209,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertNull(context.getObjectStore().getCachedSnapshot(obj.getObjectId()));
     }
 
+    @Test
     public void testPartialObjectFromDataRow() {
 
         DataRow row = new DataRow(10);
@@ -212,6 +222,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertNull(context.getObjectStore().getCachedSnapshot(obj.getObjectId()));
     }
 
+    @Test
     public void testFullObjectFromDataRow() {
 
         DataRow row = new DataRow(10);
@@ -226,6 +237,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertEquals("ArtistXYZ", obj.getArtistName());
     }
 
+    @Test
     public void testCommitChangesError() {
 
         DataDomain domain = context.getParentDataDomain();
@@ -273,6 +285,7 @@ public class DataContextExtrasIT extends ServerCase {
     /**
      * Testing behavior of Cayenne when a database exception is thrown in SELECT query.
      */
+    @Test
     public void testSelectException() {
 
         SQLTemplate q = new SQLTemplate(Artist.class, "SELECT * FROM NON_EXISTENT_TABLE");
@@ -287,10 +300,12 @@ public class DataContextExtrasIT extends ServerCase {
 
     }
 
+    @Test
     public void testEntityResolver() {
         assertNotNull(context.getEntityResolver());
     }
 
+    @Test
     public void testPhantomModificationsValidate() throws Exception {
 
         createPhantomModificationDataSet();
@@ -323,6 +338,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertFalse(a1.isValidateForSaveCalled());
     }
 
+    @Test
     public void testPhantomModificationsValidateToOne() throws Exception {
 
         createPhantomModificationsValidateToOneDataSet();
@@ -339,6 +355,7 @@ public class DataContextExtrasIT extends ServerCase {
                 p1.isValidateForSaveCalled());
     }
 
+    @Test
     public void testValidateOnToManyChange() throws Exception {
 
         createValidateOnToManyChangeDataSet();
@@ -355,6 +372,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertFalse(a1.isValidateForSaveCalled());
     }
 
+    @Test
     public void testPhantomAttributeModificationCommit() throws Exception {
 
         createPhantomModificationDataSet();
@@ -371,6 +389,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertEquals(PersistenceState.COMMITTED, a1.getPersistenceState());
     }
 
+    @Test
     public void testPhantomRelationshipModificationCommit() throws Exception {
 
         createPhantomRelationshipModificationCommitDataSet();
@@ -396,6 +415,7 @@ public class DataContextExtrasIT extends ServerCase {
         assertEquals(PersistenceState.COMMITTED, newArtist.getPersistenceState());
     }
 
+    @Test
     public void testPhantomRelationshipModificationValidate() throws Exception {
 
         createPhantomRelationshipModificationCommitDataSet();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
index 6cb1ec4..3357d28 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
@@ -34,6 +34,7 @@ import org.apache.cayenne.testdo.testmap.CompoundPaintingLongNames;
 import org.apache.cayenne.testdo.testmap.Gallery;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.math.BigDecimal;
 import java.sql.Types;
@@ -112,6 +113,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
 
     }
 
+    @Test
     public void testSelectCompound1() throws Exception {
         createTestDataSet();
         SelectQuery query = new SelectQuery(CompoundPainting.class);
@@ -162,6 +164,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
     // attributes, while
     // EJBQLQuery does an OUTER JOIN... which seems like a better idea...
     // 14/01/2010 now it uses LEFT JOIN
+    @Test
     public void testSelectCompound2() throws Exception {
         createTestDataSet();
         SelectQuery query = new SelectQuery(
@@ -196,6 +199,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
      * {@link PersistentDescriptor}[105] That forced an error during the building of the
      * SelectQuery statement, CAY-1484
      */
+    @Test
     public void testSelectCompoundLongNames() throws Exception {
         createTestDataSet();
         SelectQuery query = new SelectQuery(CompoundPaintingLongNames.class);
@@ -204,6 +208,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
         assertNotNull(objects);
     }
 
+    @Test
     public void testSelectEJQBQL() throws Exception {
         createTestDataSet();
         EJBQLQuery query = new EJBQLQuery(
@@ -222,6 +227,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testSelectEJQBQLCollectionTheta() throws Exception {
         createTestDataSet();
         EJBQLQuery query = new EJBQLQuery(
@@ -241,6 +247,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testSelectEJQBQLLike() throws Exception {
         createTestDataSet();
         EJBQLQuery query = new EJBQLQuery(
@@ -260,6 +267,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testSelectEJQBQLBetween() throws Exception {
         createTestDataSet();
         EJBQLQuery query = new EJBQLQuery("SELECT a FROM CompoundPainting a "
@@ -279,6 +287,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
         }
     }
 
+    @Test
     public void testSelectEJQBQLSubquery() throws Exception {
         createTestDataSet();
         EJBQLQuery query = new EJBQLQuery(
@@ -294,6 +303,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
 
     }
 
+    @Test
     public void testSelectEJQBQLHaving() throws Exception {
         createTestDataSet();
         EJBQLQuery query = new EJBQLQuery(
@@ -311,6 +321,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
         assertEquals(3L, galleryItem[1]);
     }
 
+    @Test
     public void testInsert() {
         CompoundPainting o1 = context.newObject(CompoundPainting.class);
         o1.setArtistName("A1");
@@ -333,6 +344,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
         assertEquals(1, galleryCount.intValue());
     }
 
+    @Test
     public void testDelete() throws Exception {
         // throw in a bit of random overlapping data, to make sure FK/PK correspondence is
         // not purely coincidental
@@ -364,6 +376,7 @@ public class DataContextFlattenedAttributesIT extends ServerCase {
         assertEquals(0, galleryCount.intValue());
     }
 
+    @Test
     public void testUpdate() {
         CompoundPainting o1 = context.newObject(CompoundPainting.class);
         o1.setArtistName("A1");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 ca4f923..fcc66db 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
@@ -54,6 +54,7 @@ import org.apache.cayenne.unit.di.UnitTestClosure;
 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.math.BigDecimal;
 import java.sql.Timestamp;
@@ -164,6 +165,7 @@ public class DataContextIT extends ServerCase {
         tPainting.insert(33007, "P_artist21", 33007, 21000);
     }
 
+    @Test
     public void testCurrentSnapshot1() throws Exception {
         createSingleArtistDataSet();
 
@@ -176,6 +178,7 @@ public class DataContextIT extends ServerCase {
         assertEquals(artist.getDateOfBirth(), snapshot.get("DATE_OF_BIRTH"));
     }
 
+    @Test
     public void testCurrentSnapshot2() throws Exception {
         createSingleArtistDataSet();
 
@@ -195,6 +198,7 @@ public class DataContextIT extends ServerCase {
         assertNull(snapshot.get("DATE_OF_BIRTH"));
     }
 
+    @Test
     public void testCurrentSnapshot3() throws Exception {
         createSingleArtistDataSet();
 
@@ -216,6 +220,7 @@ public class DataContextIT extends ServerCase {
     /**
      * Testing snapshot with to-one fault. This was a bug CAY-96.
      */
+    @Test
     public void testCurrentSnapshotWithToOneFault() throws Exception {
 
         createGalleriesAndExhibitsDataSet();
@@ -244,6 +249,7 @@ public class DataContextIT extends ServerCase {
      * would pad a CHAR column with extra spaces, returned to the client.
      * Cayenne should trim it.
      */
+    @Test
     public void testCharFetch() throws Exception {
         createSingleArtistDataSet();
 
@@ -257,6 +263,7 @@ public class DataContextIT extends ServerCase {
      * databases (Oracle...) would pad a CHAR column with extra spaces, returned
      * to the client. Cayenne should trim it.
      */
+    @Test
     public void testCharInQualifier() throws Exception {
         createArtistsDataSet();
 
@@ -270,6 +277,7 @@ public class DataContextIT extends ServerCase {
      * Test fetching query with multiple relationship paths between the same 2
      * entities used in qualifier.
      */
+    @Test
     public void testMultiObjRelFetch() throws Exception {
         createArtistsAndPaintingsDataSet();
 
@@ -285,6 +293,7 @@ public class DataContextIT extends ServerCase {
      * Test fetching query with multiple relationship paths between the same 2
      * entities used in qualifier.
      */
+    @Test
     public void testMultiDbRelFetch() throws Exception {
         createArtistsAndPaintingsDataSet();
 
@@ -296,6 +305,7 @@ public class DataContextIT extends ServerCase {
         assertEquals(2, results.size());
     }
 
+    @Test
     public void testSelectDate() throws Exception {
         createGalleriesAndExhibitsDataSet();
 
@@ -306,6 +316,7 @@ public class DataContextIT extends ServerCase {
         assertEquals(java.util.Date.class, e1.getClosingDate().getClass());
     }
 
+    @Test
     public void testCaseInsensitiveOrdering() throws Exception {
         if (!accessStackAdapter.supportsCaseInsensitiveOrder()) {
             return;
@@ -337,6 +348,7 @@ public class DataContextIT extends ServerCase {
         assertEquals("aRtist5", objects.get(4).getArtistName());
     }
 
+    @Test
     public void testSelect_DataRows() throws Exception {
         createArtistsAndPaintingsDataSet();
 
@@ -348,6 +360,7 @@ public class DataContextIT extends ServerCase {
         assertTrue("DataRow expected, got " + objects.get(0).getClass(), objects.get(0) instanceof DataRow);
     }
 
+    @Test
     public void testPerformSelectQuery1() throws Exception {
         createArtistsAndPaintingsDataSet();
 
@@ -359,6 +372,7 @@ public class DataContextIT extends ServerCase {
         assertTrue("Artist expected, got " + objects.get(0).getClass(), objects.get(0) instanceof Artist);
     }
 
+    @Test
     public void testPerformSelectQuery2() throws Exception {
         createArtistsAndPaintingsDataSet();
 
@@ -377,6 +391,7 @@ public class DataContextIT extends ServerCase {
         assertTrue("Artist expected, got " + objects.get(0).getClass(), objects.get(0) instanceof Artist);
     }
 
+    @Test
     public void testPerformQuery_Routing() {
         Query query = mock(Query.class);
         QueryMetadata md = mock(QueryMetadata.class);
@@ -385,6 +400,7 @@ public class DataContextIT extends ServerCase {
         verify(query).route(any(QueryRouter.class), eq(context.getEntityResolver()), (Query) isNull());
     }
 
+    @Test
     public void testPerformNonSelectingQuery() throws Exception {
 
         createSingleArtistDataSet();
@@ -400,6 +416,7 @@ public class DataContextIT extends ServerCase {
         assertEquals(1, context.performQuery(select).size());
     }
 
+    @Test
     public void testPerformNonSelectingQueryCounts1() throws Exception {
         createArtistsDataSet();
 
@@ -422,6 +439,7 @@ public class DataContextIT extends ServerCase {
         assertEquals(1, counts[0]);
     }
 
+    @Test
     public void testPerformNonSelectingQueryCounts2() throws Exception {
 
         createArtistsDataSet();
@@ -456,6 +474,7 @@ public class DataContextIT extends ServerCase {
         assertEquals(3, counts[0]);
     }
 
+    @Test
     public void testPerformPaginatedQuery() throws Exception {
         createArtistsDataSet();
 
@@ -470,6 +489,7 @@ public class DataContextIT extends ServerCase {
         assertTrue(objects.get(0) instanceof Artist);
     }
 
+    @Test
     public void testPerformPaginatedQuery1() throws Exception {
         createArtistsDataSet();
 
@@ -484,6 +504,7 @@ public class DataContextIT extends ServerCase {
         assertTrue(objects.get(0) instanceof Artist);
     }
 
+    @Test
     public void testPerformPaginatedQueryBigPage() throws Exception {
         createArtistsDataSet();
 
@@ -501,6 +522,7 @@ public class DataContextIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPerformDataRowQuery() throws Exception {
 
         createArtistsDataSet();
@@ -514,6 +536,7 @@ public class DataContextIT extends ServerCase {
         assertTrue("Map expected, got " + objects.get(0).getClass(), objects.get(0) instanceof Map<?, ?>);
     }
 
+    @Test
     public void testCommitChangesRO1() throws Exception {
 
         ROArtist a1 = (ROArtist) context.newObject("ROArtist");
@@ -529,6 +552,7 @@ public class DataContextIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCommitChangesRO2() throws Exception {
         createArtistsDataSet();
 
@@ -546,6 +570,7 @@ public class DataContextIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCommitChangesRO3() throws Exception {
 
         createArtistsDataSet();
@@ -564,6 +589,7 @@ public class DataContextIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCommitChangesRO4() throws Exception {
         createArtistsDataSet();
 
@@ -585,6 +611,7 @@ public class DataContextIT extends ServerCase {
         assertEquals(PersistenceState.COMMITTED, a1.getPersistenceState());
     }
 
+    @Test
 	public void testIterate() throws Exception {
 
 		createArtistsDataSet();
@@ -605,6 +632,7 @@ public class DataContextIT extends ServerCase {
 		 assertEquals(7, count[0]);
 	}
 
+    @Test
     public void testIterateDataRows() throws Exception {
 
         createArtistsDataSet();
@@ -624,6 +652,7 @@ public class DataContextIT extends ServerCase {
         assertEquals(7, count[0]);
     }
 
+    @Test
     public void testIterator() throws Exception {
 
         createArtistsDataSet();
@@ -644,6 +673,7 @@ public class DataContextIT extends ServerCase {
         }
     }
 
+    @Test
     public void testPerformIteratedQuery1() throws Exception {
 
         createArtistsDataSet();
@@ -664,6 +694,7 @@ public class DataContextIT extends ServerCase {
         }
     }
 
+    @Test
     public void testPerformIteratedQuery2() throws Exception {
         createArtistsAndPaintingsDataSet();
 
@@ -693,6 +724,7 @@ public class DataContextIT extends ServerCase {
      * Tests that hasChanges performs correctly when an object is "modified" and
      * the property is simply set to the same value (an unreal modification)
      */
+    @Test
     public void testHasChangesPhantom() {
 
         String artistName = "ArtistName";
@@ -716,6 +748,7 @@ public class DataContextIT extends ServerCase {
      * Tests that hasChanges performs correctly when an object is "modified" and
      * the property is simply set to the same value (an unreal modification)
      */
+    @Test
     public void testHasChangesRealModify() {
         Artist artist = (Artist) context.newObject("Artist");
         artist.setArtistName("ArtistName");
@@ -725,6 +758,7 @@ public class DataContextIT extends ServerCase {
         assertTrue(context.hasChanges());
     }
 
+    @Test
     public void testInvalidateObjects_Vararg() throws Exception {
 
         DataRow row = new DataRow(10);
@@ -747,6 +781,7 @@ public class DataContextIT extends ServerCase {
         assertSame(object, context.getObjectStore().getNode(oid));
     }
 
+    @Test
     public void testInvalidateObjects() throws Exception {
 
         DataRow row = new DataRow(10);
@@ -769,6 +804,7 @@ public class DataContextIT extends ServerCase {
         assertSame(object, context.getObjectStore().getNode(oid));
     }
 
+    @Test
     public void testBeforeHollowDeleteShouldChangeStateToCommited() throws Exception {
         createSingleArtistDataSet();
 
@@ -784,6 +820,7 @@ public class DataContextIT extends ServerCase {
         assertEquals(PersistenceState.DELETED, hollow.getPersistenceState());
     }
 
+    @Test
     public void testCommitUnchangedInsert() throws Exception {
 
         // see CAY-1444 - reproducible on DB's that support auto incremented PK

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 b6ba8ee..a3ec14f 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
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Gallery;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Timestamp;
 import java.util.List;
@@ -92,6 +93,7 @@ public class DataContextJoinAliasesIT extends ServerCase {
         tArtistExhibit.insert(5, 2);
     }
 
+    @Test
     public void testMatchAll() throws Exception {
         // select all galleries that have exhibits by both Picasso and Dali...
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 c0cd1c1..5bccd04 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
@@ -31,6 +31,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor;
 import org.apache.cayenne.unit.di.UnitTestClosure;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataContextLocalObjectIT extends ServerCase {
@@ -66,6 +67,7 @@ public class DataContextLocalObjectIT extends ServerCase {
         tArtist.setColumns("ARTIST_ID", "ARTIST_NAME");
     }
 
+    @Test
     public void testLocalObject_InCache() throws Exception {
         tArtist.insert(456, "Bla");
 
@@ -82,6 +84,7 @@ public class DataContextLocalObjectIT extends ServerCase {
         });
     }
 
+    @Test
     public void testLocalObject_SameContext() throws Exception {
         tArtist.insert(456, "Bla");
 
@@ -96,6 +99,7 @@ public class DataContextLocalObjectIT extends ServerCase {
         });
     }
 
+    @Test
     public void testLocalObject_NotInCache() throws Exception {
         tArtist.insert(456, "Bla");
 
@@ -112,6 +116,7 @@ public class DataContextLocalObjectIT extends ServerCase {
         });
     }
 
+    @Test
     public void testLocalObject_FFE_InvalidID() throws Exception {
         tArtist.insert(777, "AA");
 
@@ -137,6 +142,7 @@ public class DataContextLocalObjectIT extends ServerCase {
 
     }
 
+    @Test
     public void testLocalObject_TempId() throws Exception {
 
         final Artist a1 = context1.newObject(Artist.class);
@@ -163,6 +169,7 @@ public class DataContextLocalObjectIT extends ServerCase {
         });
     }
 
+    @Test
     public void testLocalObject_TempId_NestedContext() throws Exception {
 
         final Artist a1 = context1.newObject(Artist.class);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 88dc6a5..3719e69 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
@@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.NoPkTestEntity;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -50,6 +51,7 @@ public class DataContextNoPkIT extends ServerCase {
         noPkTestTable.insert(2);
     }
 
+    @Test
     public void testNoPkFetchObjects() throws Exception {
         try {
             List objects = context.performQuery(new SelectQuery(NoPkTestEntity.class));
@@ -62,6 +64,7 @@ public class DataContextNoPkIT extends ServerCase {
         }
     }
 
+    @Test
     public void testNoPkFetchDataRows() throws Exception {
         SelectQuery query = new SelectQuery(NoPkTestEntity.class);
         query.setFetchingDataRows(true);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java
index f9536e9..fbbec3c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.Collections;
 import java.util.Date;
@@ -50,6 +51,7 @@ public class DataContextObjectIdQueryIT extends ServerCase {
         dbHelper.deleteAll("ARTIST");
     }
 
+    @Test
     public void testRefreshNullifiedValuesNew() {
 
         Artist a = context.newObject(Artist.class);
@@ -73,6 +75,7 @@ public class DataContextObjectIdQueryIT extends ServerCase {
         assertEquals("X", a1.getArtistName());
     }
 
+    @Test
     public void testNoRefreshValuesNew() {
 
         Artist a = context.newObject(Artist.class);
@@ -94,6 +97,7 @@ public class DataContextObjectIdQueryIT extends ServerCase {
         assertEquals("X", a1.getArtistName());
     }
 
+    @Test
     public void testRefreshNullifiedValuesExisting() {
 
         SQLTemplate insert = new SQLTemplate(

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 3b2f043..8b5b1c0 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
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.DataChannelInterceptor;
 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.Collections;
@@ -93,6 +94,7 @@ public class DataContextObjectTrackingIT extends ServerCase {
         tPainting.insert(33003, 33003, "P_artist3", 3000);
     }
 
+    @Test
     public void testUnregisterObject() {
 
         DataRow row = new DataRow(10);
@@ -115,6 +117,7 @@ public class DataContextObjectTrackingIT extends ServerCase {
         assertNull(context.getObjectStore().getCachedSnapshot(oid));
     }
 
+    @Test
     public void testInvalidateObjects_Vararg() {
 
         DataRow row = new DataRow(10);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
index 9d40879..9d9471e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.math.BigDecimal;
 import java.util.Calendar;
@@ -51,6 +52,7 @@ public class DataContextOrderingIT extends ServerCase {
         dbHelper.deleteAll("ARTIST");
     }
 
+    @Test
     public void testMultipleOrdering() throws Exception {
 
         Calendar c = Calendar.getInstance();
@@ -82,6 +84,7 @@ public class DataContextOrderingIT extends ServerCase {
         assertSame(a1, list.get(2));
     }
 
+    @Test
     public void testMultipleOrderingInSelectClauseCAY_1074() throws Exception {
 
         Calendar c = Calendar.getInstance();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 a081b86..0b8fd4e 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
@@ -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.sql.Types;
 import java.util.List;
@@ -77,6 +78,7 @@ public class DataContextOuterJoinsIT extends ServerCase {
         artistHelper.deleteAll();
     }
 
+    @Test
     public void testSelectWithOuterJoinFlattened() throws Exception {
 
         artistHelper.insert(33001, "AA1");
@@ -101,6 +103,7 @@ public class DataContextOuterJoinsIT extends ServerCase {
         assertEquals("BB1", artists.get(0).getArtistName());
     }
 
+    @Test
     public void testSelectWithOuterJoin() throws Exception {
 
         artistHelper.insert(33001, "AA1");
@@ -137,6 +140,7 @@ public class DataContextOuterJoinsIT extends ServerCase {
         assertEquals("BB2", artists.get(2).getArtistName());
     }
 
+    @Test
     public void testSelectWithOuterJoinFromString() throws Exception {
 
         artistHelper.insert(33001, "AA1");
@@ -171,6 +175,7 @@ public class DataContextOuterJoinsIT extends ServerCase {
         assertEquals("BB2", artists.get(2).getArtistName());
     }
 
+    @Test
     public void testSelectWithOuterOrdering() throws Exception {
 
         artistHelper.insert(33001, "AA1");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 4299b02..cd22677 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
@@ -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;
 
@@ -64,6 +65,7 @@ public class DataContextPaginatedQueryIT extends ServerCase {
         tArtist.insert(33010, "artist10");
     }
 
+    @Test
     public void testLocalCache() throws Exception {
 
         createArtistsDataSet();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 b6298be..ac06353 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
@@ -35,6 +35,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.math.BigDecimal;
 import java.sql.Types;
@@ -97,6 +98,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
         tPainting.insert(7, 11, "p_artist2", 2000);
     }
 
+    @Test
     public void testObjectQueryStringBoolean() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -105,6 +107,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
         assertEquals(2, paintings.size());
     }
 
+    @Test
     public void testObjectQueryStringMapBoolean() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -116,6 +119,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
         assertEquals(1, paintings.size());
     }
 
+    @Test
     public void testProcedureQueryStringMapBoolean() throws Exception {
 
         if (!accessStackAdapter.supportsStoredProcedures()) {
@@ -151,6 +155,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
         assertEquals(11, ((Number) artist.getObjectId().getIdSnapshot().get(Artist.ARTIST_ID_PK_COLUMN)).intValue());
     }
 
+    @Test
     public void testNonSelectingQueryString() throws Exception {
 
         int[] counts = context.performNonSelectingQuery("NonSelectingQuery");
@@ -163,6 +168,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
         assertEquals("No Painting Like This", p.getPaintingTitle());
     }
 
+    @Test
     public void testNonSelectingQueryStringMap() throws Exception {
 
         Map<String, Object> parameters = new HashMap<String, Object>();
@@ -180,6 +186,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
         assertEquals("Go Figure", p.getPaintingTitle());
     }
 
+    @Test
     public void testPerfomQueryNonSelecting() throws Exception {
 
         Artist a = context.newObject(Artist.class);
@@ -196,6 +203,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
         assertEquals(0, result.size());
     }
 
+    @Test
     public void testObjectQueryWithLocalCache() throws Exception {
         createTwoArtists();
 
@@ -211,6 +219,7 @@ public class DataContextPerformQueryAPIIT extends ServerCase {
         });
     }
 
+    @Test
     public void testObjectQueryWithSharedCache() throws Exception {
         createTwoArtists();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
index a6d632a..0534635 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.testdo.testmap.PaintingInfo;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 
@@ -66,6 +67,7 @@ public class DataContextPrefetchExtras1IT extends ServerCase {
         }
     }
 
+    @Test
     public void testPrefetchToOne() throws Exception {
         createDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 2676819..524251d 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
@@ -37,6 +37,7 @@ import org.apache.cayenne.testdo.testmap.CompoundFkTestEntity;
 import org.apache.cayenne.testdo.testmap.CompoundPkTestEntity;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 
@@ -99,6 +100,7 @@ public class DataContextPrefetchExtrasIT extends ServerCase {
         tCompoundFkTest.insert(303, "101", "201", "CFK3");
     }
 
+    @Test
     public void testPrefetchToManyOnCharKey() throws Exception {
         createPrefetchToManyOnCharKeyDataSet();
 
@@ -124,6 +126,7 @@ public class DataContextPrefetchExtrasIT extends ServerCase {
     /**
      * Tests to-one prefetching over relationships with compound keys.
      */
+    @Test
     public void testPrefetch10() throws Exception {
         createCompoundDataSet();
 
@@ -149,6 +152,7 @@ public class DataContextPrefetchExtrasIT extends ServerCase {
     /**
      * Tests to-many prefetching over relationships with compound keys.
      */
+    @Test
     public void testPrefetch11() throws Exception {
         createCompoundDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 39525fd..ec04fb0 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
@@ -43,6 +43,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.Timestamp;
 import java.sql.Types;
@@ -149,6 +150,7 @@ public class DataContextPrefetchIT extends ServerCase {
         tArtistExhibit.insert(101, 4);
     }
 
+    @Test
     public void testPrefetchToMany_ViaProperty() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -177,6 +179,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetchToMany_WithQualfier() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -216,6 +219,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetchToManyNoQualifier() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -248,6 +252,7 @@ public class DataContextPrefetchIT extends ServerCase {
      * Test that a to-many relationship is initialized when a target entity has
      * a compound PK only partially involved in relationship.
      */
+    @Test
     public void testPrefetchToMany_OnJoinTableDisjoinedPrefetch() throws Exception {
 
         createTwoArtistsWithExhibitsDataSet();
@@ -288,6 +293,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetchToManyOnJoinTableJoinedPrefetch_ViaProperty() throws Exception {
         createTwoArtistsWithExhibitsDataSet();
 
@@ -332,6 +338,7 @@ public class DataContextPrefetchIT extends ServerCase {
      * Test that a to-many relationship is initialized when a target entity has
      * a compound PK only partially involved in relationship.
      */
+    @Test
     public void testPrefetchToManyOnJoinTableJoinedPrefetch() throws Exception {
         createTwoArtistsWithExhibitsDataSet();
 
@@ -376,6 +383,7 @@ public class DataContextPrefetchIT extends ServerCase {
      * Test that a to-many relationship is initialized when there is no inverse
      * relationship
      */
+    @Test
     public void testPrefetch_ToManyNoReverse() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -403,6 +411,7 @@ public class DataContextPrefetchIT extends ServerCase {
         }
     }
 
+    @Test
     public void testPrefetch_ToManyNoReverseWithQualifier() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -434,6 +443,7 @@ public class DataContextPrefetchIT extends ServerCase {
         }
     }
 
+    @Test
     public void testPrefetch_ToOne() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -459,6 +469,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetch_ToOne_DbPath() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -471,6 +482,7 @@ public class DataContextPrefetchIT extends ServerCase {
         assertEquals(1, results.size());
     }
 
+    @Test
     public void testPrefetch_ToOne_ObjPath() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -482,6 +494,7 @@ public class DataContextPrefetchIT extends ServerCase {
         assertEquals(1, results.size());
     }
 
+    @Test
     public void testPrefetch_ReflexiveRelationship() throws Exception {
         ArtGroup parent = (ArtGroup) context.newObject("ArtGroup");
         parent.setName("parent");
@@ -508,6 +521,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetch_ToOneWithQualifierOverlappingPrefetchPath() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -530,7 +544,8 @@ public class DataContextPrefetchIT extends ServerCase {
             }
         });
     }
-    
+
+    @Test
     public void testPrefetch_ToOneWith_OuterJoinFlattenedQualifier() throws Exception {
 
         tArtGroup.insert(1, "AG");
@@ -564,6 +579,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetch9() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -595,6 +611,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetch_OneToOneWithQualifier() throws Exception {
         createArtistWithTwoPaintingsAndTwoInfosDataSet();
 
@@ -629,6 +646,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetchToMany_DateInQualifier() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -642,6 +660,7 @@ public class DataContextPrefetchIT extends ServerCase {
         context.performQuery(q);
     }
 
+    @Test
     public void testPrefetchingToOneNull() throws Exception {
 
         tPainting.insert(6, "p_Xty", null, 1000);
@@ -662,6 +681,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetchToOneSharedCache() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -697,6 +717,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetchToOneLocalCache() throws Exception {
         createTwoArtistsAndTwoPaintingsDataSet();
 
@@ -732,6 +753,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetchToOneWithBackRelationship() throws Exception {
         createArtistWithTwoPaintingsAndTwoInfosDataSet();
 
@@ -754,6 +776,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetchPaintingOverToOneAndToMany() throws Exception {
         createArtistWithTwoPaintingsAndTwoInfosDataSet();
 
@@ -777,6 +800,7 @@ public class DataContextPrefetchIT extends ServerCase {
         });
     }
 
+    @Test
     public void testPrefetchToOneWithBackRelationship_Joint() throws Exception {
         createArtistWithTwoPaintingsAndTwoInfosDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 7adfbbf..82dfb55 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
@@ -36,6 +36,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.sql.Timestamp;
 import java.util.Collections;
@@ -111,6 +112,7 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
         tGallery.insert(45, "gallery3");
     }
 
+    @Test
     public void testToManyToManyFirstStepUnresolved() throws Exception {
 
         createTwoArtistsWithExhibitsDataSet();
@@ -160,6 +162,7 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
         assertEquals(PersistenceState.COMMITTED, ae2.getPersistenceState());
     }
 
+    @Test
     public void testToManyToManyFirstStepResolved() throws Exception {
 
         createTwoArtistsWithExhibitsDataSet();
@@ -195,6 +198,7 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
         assertEquals(PersistenceState.COMMITTED, ae1.getPersistenceState());
     }
 
+    @Test
     public void testMixedPrefetch1() throws Exception {
 
         createTwoArtistsWithExhibitsDataSet();
@@ -231,6 +235,7 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
         assertEquals(PersistenceState.COMMITTED, ae1.getPersistenceState());
     }
 
+    @Test
     public void testMixedPrefetch2() throws Exception {
 
         createTwoArtistsWithExhibitsDataSet();
@@ -268,7 +273,8 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
         ArtistExhibit ae1 = aexhibits.get(0);
         assertEquals(PersistenceState.COMMITTED, ae1.getPersistenceState());
     }
-    
+
+    @Test
     public void testToManyToOne_EmptyToMany() throws Exception {
 
         createGalleriesAndArtists();
@@ -288,7 +294,8 @@ public class DataContextPrefetchMultistepIT extends ServerCase {
         assertFalse(((ValueHolder) exhibits).isFault());
         assertEquals(0, exhibits.size());
     }
-    
+
+    @Test
     public void testToManyToOne_EmptyToMany_NoRootQualifier() throws Exception {
 
         createGalleriesAndArtists();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java
index dd6e52e..7c3915e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java
@@ -28,6 +28,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;
 
@@ -65,6 +66,7 @@ public class DataContextPrefetchQualifierOverlapIT extends ServerCase {
         tPainting.insert(3, "ACC", 1);
     }
 
+    @Test
     public void testToManyDisjointOverlappingQualifierWithInnerJoin() throws Exception {
         createTwoArtistsThreePaintingsDataSet();
 
@@ -81,6 +83,7 @@ public class DataContextPrefetchQualifierOverlapIT extends ServerCase {
         assertEquals(3, a.getPaintingArray().size());
     }
 
+    @Test
     public void testToManyJointOverlappingQualifierWithInnerJoin() throws Exception {
         createTwoArtistsThreePaintingsDataSet();
 
@@ -97,6 +100,7 @@ public class DataContextPrefetchQualifierOverlapIT extends ServerCase {
         assertEquals(3, a.getPaintingArray().size());
     }
 
+    @Test
     public void testToManyJointOverlappingQualifierWithOuterJoin() throws Exception {
         createTwoArtistsThreePaintingsDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
index 2937935..8660d20 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
@@ -35,6 +35,7 @@ import org.apache.cayenne.tx.ExternalTransaction;
 import org.apache.cayenne.unit.UnitDbAdapter;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.math.BigDecimal;
 import java.sql.Types;
@@ -75,6 +76,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         dbHelper.deleteAll("ARTIST");
     }
 
+    @Test
     public void testUpdate() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -111,6 +113,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         assertEquals(2000, p.getEstimatedPrice().intValue());
     }
 
+    @Test
     public void testUpdateNoParam() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -146,6 +149,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         assertEquals(2000, p.getEstimatedPrice().intValue());
     }
 
+    @Test
     public void testSelect1() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -171,6 +175,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         assertEquals(2000, p.getEstimatedPrice().intValue());
     }
 
+    @Test
     public void testSelect2() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -197,6 +202,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         assertEquals(2000, p.getEstimatedPrice().intValue());
     }
 
+    @Test
     public void testSelect3() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -225,6 +231,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         assertEquals(2000, p.getEstimatedPrice().intValue());
     }
 
+    @Test
     public void testFetchLimit() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -244,6 +251,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         assertEquals(2, artists.size());
     }
 
+    @Test
     public void testFetchOffset() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -263,6 +271,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         assertEquals(1, artists.size());
     }
 
+    @Test
     public void testColumnNameCapitalization() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -290,6 +299,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
 
     }
 
+    @Test
     public void testOutParams() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -310,6 +320,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         assertEquals(40, price.intValue());
     }
 
+    @Test
     public void testSelectDataObject() throws Exception {
         if (!accessStackAdapter.supportsStoredProcedures()) {
             return;
@@ -338,6 +349,7 @@ public class DataContextProcedureQueryIT extends ServerCase {
         assertEquals(1101.01, p.getEstimatedPrice().doubleValue(), 0.02);
     }
 
+    @Test
     public void testSelectWithRowDescriptor() throws Exception {
 
         if (!accessStackAdapter.supportsStoredProcedures()) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 3d61ee6..7f692f5 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
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.inherit.Employee;
 import org.apache.cayenne.testdo.inherit.Manager;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Types;
 import java.util.List;
@@ -85,6 +86,7 @@ public class DataContextQualifiedEntityIT extends ServerCase {
         tPerson.insert(null, null, null, "c1", 6, "C", null);
     }
 
+    @Test
     public void testSelect() throws Exception {
         createPersonsDataSet();
 
@@ -109,6 +111,7 @@ public class DataContextQualifiedEntityIT extends ServerCase {
         assertEquals(2, managers.size());
     }
 
+    @Test
     public void testPrefetch() throws Exception {
         createPersonsDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 14c1954..54137ac 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
@@ -32,6 +32,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.ArrayList;
 import java.util.List;
@@ -97,6 +98,7 @@ public class DataContextQueryCachingIT extends ServerCase {
         tArtist.update().set("ARTIST_NAME", "ccc").where("ARTIST_ID", 33001).execute();
     }
 
+    @Test
     public void testLocalCacheDataRowsRefresh() throws Exception {
         SelectQuery select = new SelectQuery(Artist.class);
         select.setFetchingDataRows(true);
@@ -135,6 +137,7 @@ public class DataContextQueryCachingIT extends ServerCase {
         }
     }
 
+    @Test
     public void testSharedCacheDataRowsRefresh() throws Exception {
 
         SelectQuery select = new SelectQuery(Artist.class);
@@ -176,6 +179,7 @@ public class DataContextQueryCachingIT extends ServerCase {
         }
     }
 
+    @Test
     public void testLocalCacheDataObjectsRefresh() throws Exception {
 
         SelectQuery select = new SelectQuery(Artist.class);
@@ -216,6 +220,7 @@ public class DataContextQueryCachingIT extends ServerCase {
         }
     }
 
+    @Test
     public void testLocalCacheRefreshObjectsRefresh() throws Exception {
         createInsertDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java
index 97dd1b0..4e190f9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.List;
 
@@ -49,6 +50,7 @@ public class DataContextQueryChainIT extends ServerCase {
         dbHelper.deleteAll("ARTIST");
     }
 
+    @Test
     public void testSelectQuery() {
         Artist a1 = context.newObject(Artist.class);
         a1.setArtistName("X");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 bbbb8ba..cdac918 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
@@ -18,8 +18,6 @@
  ****************************************************************/
 package org.apache.cayenne.access;
 
-import java.util.List;
-
 import org.apache.cayenne.Cayenne;
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.ValueHolder;
@@ -36,6 +34,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 DataContextRefreshQueryIT extends ServerCase {
@@ -89,6 +90,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
         tPainting.delete().where("PAINTING_ID", 33001).execute();
     }
 
+    @Test
     public void testRefreshCollection() throws Exception {
         createRefreshCollectionDataSet();
 
@@ -132,6 +134,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
                 .isFault());
     }
 
+    @Test
     public void testRefreshCollectionToOne() throws Exception {
         createRefreshCollectionDataSet();
 
@@ -176,6 +179,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
         assertEquals("b", p1.getToArtist().getArtistName());
     }
 
+    @Test
     public void testRefreshSingleObject() throws Exception {
         createRefreshCollectionDataSet();
 
@@ -206,6 +210,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
                 .isFault());
     }
 
+    @Test
     public void testRefreshObjectToMany() throws Exception {
         createRefreshObjectToManyDataSet();
 
@@ -220,6 +225,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
         assertEquals(1, a.getPaintingArray().size());
     }
 
+    @Test
     public void testRefreshQueryResultsLocalCache() throws Exception {
         createRefreshCollectionDataSet();
 
@@ -274,6 +280,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
         assertEquals("b", p2.getToArtist().getArtistName());
     }
 
+    @Test
     public void testRefreshQueryResultsSharedCache() throws Exception {
         createRefreshCollectionDataSet();
 
@@ -328,6 +335,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
         assertEquals("b", p2.getToArtist().getArtistName());
     }
 
+    @Test
     public void testRefreshQueryResultGroupLocal() throws Exception {
         createRefreshCollectionDataSet();
 
@@ -383,6 +391,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
         assertEquals("b", p2.getToArtist().getArtistName());
     }
 
+    @Test
     public void testRefreshAll() throws Exception {
         createRefreshCollectionDataSet();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/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 91fb0ef..620507d 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
@@ -31,6 +31,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor;
 import org.apache.cayenne.unit.di.UnitTestClosure;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Types;
 import java.util.Date;
@@ -99,6 +100,7 @@ public class DataContextRefreshingIT extends ServerCase {
         tPainting.insert(4, "p", 5, 1000);
     }
 
+    @Test
     public void testRefetchRootWithUpdatedAttributes() throws Exception {
 
         createSingleArtistDataSet();
@@ -128,6 +130,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals(nameAfter, artist.getArtistName());
     }
 
+    @Test
     public void testRefetchRootWithNullifiedToOne() throws Exception {
         createSingleArtistAndPaintingDataSet();
 
@@ -147,6 +150,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertNull(painting.getToArtist());
     }
 
+    @Test
     public void testRefetchRootWithChangedToOneTarget() throws Exception {
         createTwoArtistsAndPaintingDataSet();
 
@@ -167,6 +171,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals("artist3", painting.getToArtist().getArtistName());
     }
 
+    @Test
     public void testRefetchRootWithNullToOneTargetChangedToNotNull() throws Exception {
         createSingleArtistAndUnrelatedPaintingDataSet();
 
@@ -185,6 +190,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals("artist2", painting.getToArtist().getArtistName());
     }
 
+    @Test
     public void testRefetchRootWithDeletedToMany() throws Exception {
         createSingleArtistAndPaintingDataSet();
 
@@ -208,6 +214,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals(0, artist.getPaintingArray().size());
     }
 
+    @Test
     public void testRefetchRootWithAddedToMany() throws Exception {
 
         createSingleArtistDataSet();
@@ -229,6 +236,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals(artist.getPaintingArray().size(), 1);
     }
 
+    @Test
     public void testInvalidateRootWithUpdatedAttributes() throws Exception {
         createSingleArtistDataSet();
 
@@ -247,6 +255,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals(nameAfter, artist.getArtistName());
     }
 
+    @Test
     public void testInvalidateRootWithNullifiedToOne() throws Exception {
 
         createSingleArtistAndPaintingDataSet();
@@ -263,6 +272,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertNull(painting.getToArtist());
     }
 
+    @Test
     public void testInvalidateRootWithChangedToOneTarget() throws Exception {
         createTwoArtistsAndPaintingDataSet();
 
@@ -279,6 +289,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals("artist3", painting.getToArtist().getArtistName());
     }
 
+    @Test
     public void testInvalidateRootWithNullToOneTargetChangedToNotNull() throws Exception {
         createSingleArtistAndUnrelatedPaintingDataSet();
 
@@ -293,6 +304,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals("artist2", painting.getToArtist().getArtistName());
     }
 
+    @Test
     public void testInvalidateRootWithDeletedToMany() throws Exception {
         createSingleArtistAndPaintingDataSet();
 
@@ -306,6 +318,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals(artist.getPaintingArray().size(), 0);
     }
 
+    @Test
     public void testInvaliateRootWithAddedToMany() throws Exception {
 
         createSingleArtistDataSet();
@@ -321,6 +334,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals(artist.getPaintingArray().size(), 1);
     }
 
+    @Test
     public void testInvalidateThenModify() throws Exception {
 
         createSingleArtistDataSet();
@@ -345,6 +359,7 @@ public class DataContextRefreshingIT extends ServerCase {
         assertEquals(PersistenceState.MODIFIED, artist.getPersistenceState());
     }
 
+    @Test
     public void testModifyHollow() throws Exception {
 
         createSingleArtistAndPaintingDataSet();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
index bb38882..68067b3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
@@ -27,6 +27,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.List;
 
@@ -63,6 +64,7 @@ public class DataContextRelationshipQueryIT extends ServerCase {
         tPainting.insert(1, "p1", 1);
     }
 
+    @Test
     public void testUnrefreshingToOne() throws Exception {
 
         createOneArtistOnePaintingDataSet();
@@ -99,6 +101,7 @@ public class DataContextRelationshipQueryIT extends ServerCase {
                 a.getPropertyWrittenDirectly());
     }
 
+    @Test
     public void testRefreshingToOne() throws Exception {
 
         createOneArtistOnePaintingDataSet();