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/04 18:25:32 UTC

[02/12] 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/exp/parser/ExpressionEvaluateInMemoryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
index 7c4f6c9..b99c369 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryIT.java
@@ -19,9 +19,6 @@
 
 package org.apache.cayenne.exp.parser;
 
-import java.math.BigDecimal;
-import java.sql.Types;
-
 import org.apache.cayenne.Cayenne;
 import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.configuration.server.ServerRuntime;
@@ -38,6 +35,10 @@ 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.TstBean;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.sql.Types;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class ExpressionEvaluateInMemoryIT extends ServerCase {
@@ -80,6 +81,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         tPainting.insert(3, null, "P3", 3000);
     }
 
+    @Test
     public void testEvaluateOBJ_PATH_DataObject() throws Exception {
         ASTObjPath node = new ASTObjPath("artistName");
 
@@ -92,6 +94,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertEquals("123", node.evaluate(a2));
     }
 
+    @Test
     public void testEvaluateOBJ_PATH_JavaBean() throws Exception {
         ASTObjPath node = new ASTObjPath("property2");
 
@@ -104,6 +107,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertEquals(new Integer(-3), node.evaluate(b2));
     }
 
+    @Test
     public void testEvaluateOBJ_PATH_ObjEntity() throws Exception {
         ASTObjPath node = new ASTObjPath("paintingArray.paintingTitle");
 
@@ -113,6 +117,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertTrue(target instanceof ObjAttribute);
     }
 
+    @Test
     public void testEvaluateDB_PATH_DbEntity() throws Exception {
         Expression e = Expression.fromString("db:paintingArray.PAINTING_TITLE");
 
@@ -126,6 +131,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertTrue(dbTarget instanceof DbAttribute);
     }
 
+    @Test
     public void testEvaluateEQUAL_TOBigDecimal() throws Exception {
         BigDecimal bd1 = new BigDecimal("2.0");
         BigDecimal bd2 = new BigDecimal("2.0");
@@ -147,6 +153,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(equalTo.match(p));
     }
 
+    @Test
     public void testEvaluateEQUAL_TO() throws Exception {
         Expression equalTo = new ASTEqual(new ASTObjPath("artistName"), "abc");
         Expression notEqualTo = new ASTNotEqual(new ASTObjPath("artistName"), "abc");
@@ -162,6 +169,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertTrue("Failed: " + notEqualTo, notEqualTo.match(noMatch));
     }
 
+    @Test
     public void testEvaluateEQUAL_TO_Null() throws Exception {
         Expression equalToNull = new ASTEqual(new ASTObjPath("artistName"), null);
         Expression equalToNotNull = new ASTEqual(new ASTObjPath("artistName"), "abc");
@@ -175,6 +183,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(equalToNull.match(noMatch));
     }
 
+    @Test
     public void testEvaluateNOT_EQUAL_TONull() throws Exception {
         Expression notEqualToNull = new ASTNotEqual(new ASTObjPath("artistName"), null);
         Expression notEqualToNotNull = new ASTNotEqual(new ASTObjPath("artistName"), "abc");
@@ -188,6 +197,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertTrue("Failed: " + notEqualToNull, notEqualToNull.match(noMatch));
     }
 
+    @Test
     public void testEvaluateEQUAL_TODataObject() throws Exception {
         Artist a1 = (Artist) context.newObject("Artist");
         Artist a2 = (Artist) context.newObject("Artist");
@@ -213,6 +223,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(e.match(p3));
     }
 
+    @Test
     public void testEvaluateEQUAL_TO_Temp_ObjectId() throws Exception {
         Artist a1 = (Artist) context.newObject("Artist");
         Artist a2 = (Artist) context.newObject("Artist");
@@ -230,6 +241,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(e.match(p3));
     }
 
+    @Test
     public void testEvaluateEQUAL_TO_Id() throws Exception {
 
         createTwoArtistsThreePaintings();
@@ -246,6 +258,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(e.match(p3));
     }
 
+    @Test
     public void testEvaluateAND() throws Exception {
         Expression e1 = new ASTEqual(new ASTObjPath("artistName"), "abc");
         Expression e2 = new ASTEqual(new ASTObjPath("artistName"), "abc");
@@ -261,6 +274,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(e.match(noMatch));
     }
 
+    @Test
     public void testEvaluateOR() throws Exception {
         Expression e1 = new ASTEqual(new ASTObjPath("artistName"), "abc");
         Expression e2 = new ASTEqual(new ASTObjPath("artistName"), "xyz");
@@ -280,6 +294,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse("Failed: " + e, e.match(noMatch));
     }
 
+    @Test
     public void testEvaluateNOT() throws Exception {
         ASTNot e = new ASTNot(new ASTEqual(new ASTObjPath("artistName"), "abc"));
 
@@ -292,6 +307,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertTrue("Failed: " + e, e.match(match));
     }
 
+    @Test
     public void testEvaluateLESS_THAN() throws Exception {
         Expression e = new ASTLess(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
 
@@ -307,7 +323,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         match.setEstimatedPrice(new BigDecimal(9999));
         assertTrue("Failed: " + e, e.match(match));
     }
-    
+
+    @Test
     public void testEvaluateLESS_THAN_Null() throws Exception {
         Expression ltNull = new ASTLess(new ASTObjPath("estimatedPrice"), null);
         Expression ltNotNull = new ASTLess(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -317,6 +334,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(ltNotNull.match(noMatch));
     }
 
+    @Test
     public void testEvaluateLESS_THAN_EQUAL_TO() throws Exception {
         Expression e = new ASTLessOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
 
@@ -332,7 +350,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         match.setEstimatedPrice(new BigDecimal(9999));
         assertTrue("Failed: " + e, e.match(match));
     }
-    
+
+    @Test
     public void testEvaluateLESS_THAN_EQUAL_TO_Null() throws Exception {
         Expression ltNull = new ASTLessOrEqual(new ASTObjPath("estimatedPrice"), null);
         Expression ltNotNull = new ASTLessOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -342,6 +361,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(ltNotNull.match(noMatch));
     }
 
+    @Test
     public void testEvaluateGREATER_THAN() throws Exception {
         Expression e = new ASTGreater(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
 
@@ -357,7 +377,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         match.setEstimatedPrice(new BigDecimal(10001));
         assertTrue("Failed: " + e, e.match(match));
     }
-    
+
+    @Test
     public void testEvaluateGREATER_THAN_Null() throws Exception {
         Expression gtNull = new ASTGreater(new ASTObjPath("estimatedPrice"), null);
         Expression gtNotNull = new ASTGreater(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -367,6 +388,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(gtNotNull.match(noMatch));
     }
 
+    @Test
     public void testEvaluateGREATER_THAN_EQUAL_TO() throws Exception {
         Expression e = new ASTGreaterOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
 
@@ -382,7 +404,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         match.setEstimatedPrice(new BigDecimal(10001));
         assertTrue("Failed: " + e, e.match(match));
     }
-    
+
+    @Test
     public void testEvaluateGREATER_THAN_EQUAL_TO_Null() throws Exception {
         Expression gtNull = new ASTGreaterOrEqual(new ASTObjPath("estimatedPrice"), null);
         Expression gtNotNull = new ASTGreaterOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d));
@@ -392,6 +415,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(gtNotNull.match(noMatch));
     }
 
+    @Test
     public void testEvaluateBETWEEN() throws Exception {
         // evaluate both BETWEEN and NOT_BETWEEN
         Expression between = new ASTBetween(new ASTObjPath("estimatedPrice"), new BigDecimal(10d), new BigDecimal(20d));
@@ -418,7 +442,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertTrue("Failed: " + between, between.match(match3));
         assertFalse("Failed: " + notBetween, notBetween.match(match3));
     }
-    
+
+    @Test
     public void testEvaluateBETWEEN_Null() throws Exception {
         Expression btNull = new ASTBetween(new ASTObjPath("estimatedPrice"), new BigDecimal(10d), new BigDecimal(20d));
         Expression btNotNull = new ASTNotBetween(new ASTObjPath("estimatedPrice"), new BigDecimal(10d),
@@ -429,6 +454,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(btNotNull.match(noMatch));
     }
 
+    @Test
     public void testEvaluateIN() throws Exception {
         Expression in = new ASTIn(new ASTObjPath("estimatedPrice"), new ASTList(new Object[] { new BigDecimal("10"),
                 new BigDecimal("20") }));
@@ -456,7 +482,8 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertTrue("Failed: " + in, in.match(match2));
         assertFalse("Failed: " + notIn, notIn.match(match2));
     }
-    
+
+    @Test
     public void testEvaluateIN_Null() throws Exception {
         Expression in = new ASTIn(new ASTObjPath("estimatedPrice"), new ASTList(new Object[] {
                 new BigDecimal("10"), new BigDecimal("20") }));
@@ -468,6 +495,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse(notIn.match(noMatch));
     }
 
+    @Test
     public void testEvaluateLIKE1() throws Exception {
         Expression like = new ASTLike(new ASTObjPath("artistName"), "abc%d");
         Expression notLike = new ASTNotLike(new ASTObjPath("artistName"), "abc%d");
@@ -488,6 +516,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse("Failed: " + notLike, notLike.match(match2));
     }
 
+    @Test
     public void testEvaluateLIKE2() throws Exception {
         Expression like = new ASTLike(new ASTObjPath("artistName"), "abc?d");
         Expression notLike = new ASTNotLike(new ASTObjPath("artistName"), "abc?d");
@@ -508,6 +537,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse("Failed: " + notLike, notLike.match(match));
     }
 
+    @Test
     public void testEvaluateLIKE3() throws Exception {
         // test special chars
         Expression like = new ASTLike(new ASTObjPath("artistName"), "/./");
@@ -521,6 +551,7 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertTrue("Failed: " + like, like.match(match));
     }
 
+    @Test
     public void testEvaluateLIKE_IGNORE_CASE() throws Exception {
         Expression like = new ASTLikeIgnoreCase(new ASTObjPath("artistName"), "aBcD");
         Expression notLike = new ASTNotLikeIgnoreCase(new ASTObjPath("artistName"), "aBcD");
@@ -541,35 +572,42 @@ public class ExpressionEvaluateInMemoryIT extends ServerCase {
         assertFalse("Failed: " + notLike, notLike.match(match2));
     }
 
+    @Test
     public void testEvaluateADD() throws Exception {
         Expression add = new ASTAdd(new Object[] { new Integer(1), new Double(5.5) });
         assertEquals(6.5, ((Number) add.evaluate(null)).doubleValue(), 0.0001);
     }
 
+    @Test
     public void testEvaluateSubtract() throws Exception {
         Expression subtract = new ASTSubtract(new Object[] { new Integer(1), new Double(0.1), new Double(0.2) });
         assertEquals(0.7, ((Number) subtract.evaluate(null)).doubleValue(), 0.0001);
     }
 
+    @Test
     public void testEvaluateMultiply() throws Exception {
         Expression multiply = new ASTMultiply(new Object[] { new Integer(2), new Double(3.5) });
         assertEquals(7, ((Number) multiply.evaluate(null)).doubleValue(), 0.0001);
     }
 
+    @Test
     public void testEvaluateDivide() throws Exception {
         Expression divide = new ASTDivide(new Object[] { new BigDecimal("7.0"), new BigDecimal("2.0") });
         assertEquals(3.5, ((Number) divide.evaluate(null)).doubleValue(), 0.0001);
     }
 
+    @Test
     public void testEvaluateNegate() throws Exception {
         assertEquals(-3, ((Number) new ASTNegate(new Integer(3)).evaluate(null)).intValue());
         assertEquals(5, ((Number) new ASTNegate(new Integer(-5)).evaluate(null)).intValue());
     }
 
+    @Test
     public void testEvaluateTrue() throws Exception {
         assertEquals(Boolean.TRUE, new ASTTrue().evaluate(null));
     }
 
+    @Test
     public void testEvaluateFalse() throws Exception {
         assertEquals(Boolean.FALSE, new ASTFalse().evaluate(null));
     }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
index 68a4f33..df0466a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
@@ -19,15 +19,16 @@
 
 package org.apache.cayenne.map;
 
-import java.util.Collection;
-import java.util.Collections;
-
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.testdo.mt.ClientMtTable1;
 import org.apache.cayenne.testdo.mt.MtTable1;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.util.Collection;
+import java.util.Collections;
 
 @UseServerRuntime(ServerCase.MULTI_TIER_PROJECT)
 public class ClientEntityResolverIT extends ServerCase {
@@ -35,6 +36,7 @@ public class ClientEntityResolverIT extends ServerCase {
     @Inject
     private EntityResolver serverResolver;
 
+    @Test
     public void testGetClientEntityResolver() {
 
         EntityResolver clientResolver = serverResolver.getClientEntityResolver();
@@ -52,6 +54,7 @@ public class ClientEntityResolverIT extends ServerCase {
         assertNull(clientResolver.getObjEntity(MtTable1.class));
     }
 
+    @Test
     public void testConstructor() {
         ObjEntity entity = new ObjEntity("test_entity");
         entity.setClassName("java.lang.String");
@@ -64,6 +67,7 @@ public class ClientEntityResolverIT extends ServerCase {
         assertNotNull(resolver.getObjEntity(entity.getName()));
     }
 
+    @Test
     public void testInheritance() {
         ObjEntity superEntity = new ObjEntity("super_entity");
         superEntity.setClassName("java.lang.Object");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java
index 9e40bf0..fc9b747 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbEntityIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.exp.Expression;
 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.Collection;
 
@@ -34,6 +35,7 @@ public class DbEntityIT extends ServerCase {
     @Inject
     private ServerRuntime runtime;
 
+    @Test
     public void testSerializability() throws Exception {
         DbEntity entity = new DbEntity("entity");
 
@@ -62,16 +64,19 @@ public class DbEntityIT extends ServerCase {
         assertTrue(d2.getGeneratedAttributes().contains(generated2));
     }
 
+    @Test
     public void testConstructor1() {
         DbEntity ent = new DbEntity();
         assertNull(ent.getName());
     }
 
+    @Test
     public void testConstructor2() {
         DbEntity ent = new DbEntity("abc");
         assertEquals("abc", ent.getName());
     }
 
+    @Test
     public void testCatalog() {
         String tstName = "tst_name";
         DbEntity ent = new DbEntity("abc");
@@ -79,6 +84,7 @@ public class DbEntityIT extends ServerCase {
         assertEquals(tstName, ent.getCatalog());
     }
 
+    @Test
     public void testSchema() {
         String tstName = "tst_name";
         DbEntity ent = new DbEntity("abc");
@@ -86,6 +92,7 @@ public class DbEntityIT extends ServerCase {
         assertEquals(tstName, ent.getSchema());
     }
 
+    @Test
     public void testFullyQualifiedName() {
 
         DbEntity e1 = new DbEntity("e1");
@@ -108,6 +115,7 @@ public class DbEntityIT extends ServerCase {
         assertEquals("c4.e4", e4.getFullyQualifiedName());
     }
 
+    @Test
     public void testGetPrimaryKey() {
         DbEntity ent = new DbEntity("abc");
 
@@ -127,6 +135,7 @@ public class DbEntityIT extends ServerCase {
         assertSame(a2, pk.iterator().next());
     }
 
+    @Test
     public void testAddPKAttribute() {
         DbEntity ent = new DbEntity("abc");
 
@@ -139,6 +148,7 @@ public class DbEntityIT extends ServerCase {
         assertTrue(ent.getPrimaryKeys().isEmpty());
     }
 
+    @Test
     public void testChangeAttributeToPK() {
         DbEntity ent = new DbEntity("abc");
 
@@ -152,6 +162,7 @@ public class DbEntityIT extends ServerCase {
         assertTrue(ent.getPrimaryKeys().contains(a1));
     }
 
+    @Test
     public void testChangePKAttribute() {
         DbEntity ent = new DbEntity("abc");
 
@@ -165,6 +176,7 @@ public class DbEntityIT extends ServerCase {
         assertFalse(ent.getPrimaryKeys().contains(a1));
     }
 
+    @Test
     public void testRemoveAttribute() {
         DbEntity ent = new DbEntity("abc");
 
@@ -207,6 +219,7 @@ public class DbEntityIT extends ServerCase {
         assertEquals(0, rel.getJoins().size());
     }
 
+    @Test
     public void testTranslateToRelatedEntityIndependentPath() {
         DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity("ARTIST");
 
@@ -215,6 +228,7 @@ public class DbEntityIT extends ServerCase {
         assertEquals("failure: " + translated, Expression.fromString("db:toArtist.paintingArray"), translated);
     }
 
+    @Test
     public void testTranslateToRelatedEntityTrimmedPath() {
         DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity("ARTIST");
 
@@ -224,6 +238,7 @@ public class DbEntityIT extends ServerCase {
                 translated);
     }
 
+    @Test
     public void testTranslateToRelatedEntitySplitHalfWay() {
         DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity("ARTIST");
 
@@ -233,6 +248,7 @@ public class DbEntityIT extends ServerCase {
                 Expression.fromString("db:paintingArray.toArtist.paintingArray.toPaintingInfo.TEXT_REVIEW"), translated);
     }
 
+    @Test
     public void testTranslateToRelatedEntityMatchingPath() {
         DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity("ARTIST");
 
@@ -243,6 +259,7 @@ public class DbEntityIT extends ServerCase {
                 Expression.fromString("db:artistExhibitArray.toArtist.artistExhibitArray.toExhibit"), translated);
     }
 
+    @Test
     public void testTranslateToRelatedEntityToOne() {
         DbEntity paintingE = runtime.getDataDomain().getEntityResolver().getDbEntity("PAINTING");
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
index 71a192a..fbe1b24 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.configuration.server.ServerRuntime;
 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;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -44,6 +45,7 @@ public class DbRelationshipIT extends ServerCase {
         galleryEnt = runtime.getDataDomain().getEntityResolver().getDbEntity("GALLERY");
     }
 
+    @Test
     public void testSrcFkSnapshotWithTargetSnapshot() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         Integer id = new Integer(44);
@@ -54,6 +56,7 @@ public class DbRelationshipIT extends ServerCase {
         assertEquals(id, targetMap.get("GALLERY_ID"));
     }
 
+    @Test
     public void testGetReverseRelationship1() throws Exception {
         // start with "to many"
         DbRelationship r1 = artistEnt.getRelationship("paintingArray");
@@ -63,6 +66,7 @@ public class DbRelationshipIT extends ServerCase {
         assertSame(paintingEnt.getRelationship("toArtist"), r2);
     }
 
+    @Test
     public void testGetReverseRelationship2() throws Exception {
         // start with "to one"
         DbRelationship r1 = paintingEnt.getRelationship("toArtist");
@@ -72,6 +76,7 @@ public class DbRelationshipIT extends ServerCase {
         assertSame(artistEnt.getRelationship("paintingArray"), r2);
     }
 
+    @Test
     public void testGetReverseRelationshipToSelf() {
 
         // assemble mockup entity

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java
index b235267..7f9ab16 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityIT.java
@@ -19,9 +19,6 @@
 
 package org.apache.cayenne.map;
 
-import java.util.Collection;
-import java.util.Iterator;
-
 import org.apache.cayenne.configuration.server.ServerRuntime;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.exp.Expression;
@@ -30,6 +27,10 @@ import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.util.CayenneMapEntry;
 import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import java.util.Collection;
+import java.util.Iterator;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class EntityIT extends ServerCase {
@@ -37,6 +38,7 @@ public class EntityIT extends ServerCase {
     @Inject
     private ServerRuntime runtime;
 
+    @Test
     public void testSerializability() throws Exception {
         Entity entity = new MockEntity("entity");
 
@@ -66,6 +68,7 @@ public class EntityIT extends ServerCase {
         assertSame(d2.getRelationship("xyz"), d2.getRelationshipMap().get("xyz"));
     }
 
+    @Test
     public void testName() {
         Entity entity = new MockEntity();
         String tstName = "tst_name";
@@ -73,6 +76,7 @@ public class EntityIT extends ServerCase {
         assertEquals(tstName, entity.getName());
     }
 
+    @Test
     public void testAttribute() {
         Entity entity = new MockEntity();
         Attribute attribute = new MockAttribute("tst_name");
@@ -88,6 +92,7 @@ public class EntityIT extends ServerCase {
         assertNull(entity.getAttribute(attribute.getName()));
     }
 
+    @Test
     public void testRelationship() {
         Entity entity = new MockEntity();
         Relationship rel = new MockRelationship("tst_name");
@@ -103,6 +108,7 @@ public class EntityIT extends ServerCase {
         assertNull(entity.getRelationship(rel.getName()));
     }
 
+    @Test
     public void testAttributeClashWithRelationship() {
         Entity entity = new MockEntity();
         Relationship rel = new MockRelationship("tst_name");
@@ -119,6 +125,7 @@ public class EntityIT extends ServerCase {
         }
     }
 
+    @Test
     public void testRelationshipClashWithAttribute() {
         Entity entity = new MockEntity();
         Attribute attribute = new MockAttribute("tst_name");
@@ -135,6 +142,7 @@ public class EntityIT extends ServerCase {
         }
     }
 
+    @Test
     public void testResolveBadObjPath1() {
         // test invalid expression path
         Expression pathExpr = ExpressionFactory.expressionOfType(Expression.OBJ_PATH);
@@ -154,6 +162,7 @@ public class EntityIT extends ServerCase {
         }
     }
 
+    @Test
     public void testResolveBadObjPath2() {
         // test invalid expression type
         Expression badPathExpr = ExpressionFactory.expressionOfType(Expression.IN);
@@ -168,6 +177,7 @@ public class EntityIT extends ServerCase {
         }
     }
 
+    @Test
     public void testResolveObjPath1() {
         Expression pathExpr = ExpressionFactory.expressionOfType(Expression.OBJ_PATH);
         pathExpr.setOperand(0, "galleryName");
@@ -184,6 +194,7 @@ public class EntityIT extends ServerCase {
         assertSame(galleryEnt.getAttribute("galleryName"), next);
     }
 
+    @Test
     public void testRemoveAttribute() {
         Entity entity = new MockEntity();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java
index 6cb3bcb..68f9df8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.mt.MtTable1;
 import org.apache.cayenne.testdo.mt.MtTable2;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -40,6 +41,7 @@ public class EntityResolverClassDescriptorIT extends ServerCase {
     @Inject
     private ServerRuntime runtime;
 
+    @Test
     public void testServerDescriptorCaching() {
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
         resolver.getClassDescriptorMap().clearDescriptors();
@@ -54,6 +56,7 @@ public class EntityResolverClassDescriptorIT extends ServerCase {
         assertNotSame(descriptor, descriptor1);
     }
 
+    @Test
     public void testServerDescriptorFactory() {
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
         resolver.getClassDescriptorMap().clearDescriptors();
@@ -74,6 +77,7 @@ public class EntityResolverClassDescriptorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testArcProperties() {
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
         resolver.getClassDescriptorMap().clearDescriptors();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java
index 3497f47..69553ad 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.CayenneRuntimeException;
 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;
 
 import java.util.Collections;
 
@@ -32,6 +33,7 @@ public class EntityResolverGenericStackIT extends ServerCase {
     @Inject
     private EntityResolver resolver;
 
+    @Test
     public void testObjEntityLookupDuplicates() {
 
         DataMap generic = resolver.getDataMap("generic");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
index 910c10f..cd4bf49 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.query.Query;
 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.Collection;
@@ -43,27 +44,32 @@ public class EntityResolverIT extends ServerCase {
     @Inject
     private DataContext context;
 
+    @Test
     public void testGetObjEntity() {
         EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
         assertIsArtistObjEntity(resolver.getObjEntity("Artist"));
     }
 
+    @Test
     public void testLookupObjEntityByClass() {
         EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
         assertIsArtistObjEntity(resolver.getObjEntity(Artist.class));
     }
 
+    @Test
     public void testLookupObjEntityByInstance() {
         EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
         assertIsArtistObjEntity(resolver.getObjEntity(new Artist()));
     }
 
+    @Test
     public void testLookupObjEntityByDataobject() {
         EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
         Artist artist = (Artist) context.newObject("Artist");
         assertIsArtistObjEntity(resolver.getObjEntity(artist));
     }
 
+    @Test
     public void testGetDataMapList() {
         DataMap m1 = new DataMap();
         DataMap m2 = new DataMap();
@@ -78,6 +84,7 @@ public class EntityResolverIT extends ServerCase {
         assertTrue(maps.containsAll(list));
     }
 
+    @Test
     public void testAddDataMap() {
 
         // create empty resolver
@@ -97,6 +104,7 @@ public class EntityResolverIT extends ServerCase {
         assertEquals(resolver, m1.getNamespace());
     }
 
+    @Test
     public void testRemoveDataMap() {
         // create a resolver with a single map
         DataMap m1 = new DataMap();
@@ -116,6 +124,7 @@ public class EntityResolverIT extends ServerCase {
         assertNull(resolver.getObjEntity(Object.class));
     }
 
+    @Test
     public void testAddObjEntity() {
         // create a resolver with a single map
         DataMap m1 = new DataMap();
@@ -135,6 +144,7 @@ public class EntityResolverIT extends ServerCase {
         assertSame(oe2, resolver.getObjEntity(String.class));
     }
 
+    @Test
     public void testGetQuery() {
         // create a resolver with a single map
         DataMap m1 = new DataMap();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java
index 15c81e8..55071d4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.map;
 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.PEOPLE_PROJECT)
 public class EntityResolverInheritanceIT extends ServerCase {
@@ -29,6 +30,7 @@ public class EntityResolverInheritanceIT extends ServerCase {
     @Inject
     private EntityResolver resolver;
 
+    @Test
     public void testGetAbstractPersonTree() throws Exception {
         EntityInheritanceTree tree = resolver.getInheritanceTree("AbstractPerson");
         assertNotNull(tree);
@@ -36,6 +38,7 @@ public class EntityResolverInheritanceIT extends ServerCase {
         assertSame(resolver.getObjEntity("AbstractPerson"), tree.getEntity());
     }
 
+    @Test
     public void testGetEmployeeTree() throws Exception {
         EntityInheritanceTree tree = resolver.getInheritanceTree("Employee");
         assertNotNull(tree);
@@ -43,12 +46,14 @@ public class EntityResolverInheritanceIT extends ServerCase {
         assertSame(resolver.getObjEntity("Employee"), tree.getEntity());
     }
 
+    @Test
     public void testGetManagerTree() throws Exception {
         EntityInheritanceTree tree = resolver.getInheritanceTree("Manager");
         assertNotNull(tree);
         assertEquals(0, tree.getChildrenCount());
     }
 
+    @Test
     public void testLookupTreeRefresh() throws Exception {
         ObjEntity super1 = new ObjEntity("super1");
         ObjEntity sub1 = new ObjEntity("sub1");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
index e7d8847..575cae5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
@@ -19,10 +19,6 @@
 
 package org.apache.cayenne.map;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.cayenne.CayenneDataObject;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.ObjectContext;
@@ -36,6 +32,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.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class ObjEntityIT extends ServerCase {
@@ -58,6 +59,7 @@ public class ObjEntityIT extends ServerCase {
         dbHelper.deleteAll("ARTIST");
     }
 
+    @Test
     public void testGetAttributeWithOverrides() {
 
         DataMap map = new DataMap("dm");
@@ -91,6 +93,7 @@ public class ObjEntityIT extends ServerCase {
         assertSame(subEntity, a3.getEntity());
     }
 
+    @Test
     public void testGetPrimaryKeys() {
         ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
         Collection<ObjAttribute> pks = artistE.getPrimaryKeys();
@@ -129,6 +132,7 @@ public class ObjEntityIT extends ServerCase {
         assertTrue(clientMeaningfulPKE.getAttributes().contains(clientmpk));
     }
 
+    @Test
     public void testAttributes() {
         ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
         ObjAttribute attr = artistE.getAttribute("artistName");
@@ -137,6 +141,7 @@ public class ObjEntityIT extends ServerCase {
         assertEquals(attr.isMandatory(), attr.getDbAttribute().isMandatory());
     }
 
+    @Test
     public void testLastPathComponent() {
         ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
 
@@ -164,6 +169,7 @@ public class ObjEntityIT extends ServerCase {
         assertEquals("toGallery", lastAliasedRelationship.getRelationship().getName());
     }
 
+    @Test
     public void testGeneric() {
         ObjEntity e1 = new ObjEntity("e1");
         assertTrue(e1.isGeneric());
@@ -184,6 +190,7 @@ public class ObjEntityIT extends ServerCase {
         assertTrue(e1.isGeneric());
     }
 
+    @Test
     public void testServerOnly() {
         ObjEntity e1 = new ObjEntity("e1");
 
@@ -192,6 +199,7 @@ public class ObjEntityIT extends ServerCase {
         assertTrue(e1.isServerOnly());
     }
 
+    @Test
     public void testClientAllowed() {
         ObjEntity e1 = new ObjEntity("e1");
 
@@ -209,6 +217,7 @@ public class ObjEntityIT extends ServerCase {
         assertFalse(e1.isClientAllowed());
     }
 
+    @Test
     public void testGetPrimaryKeyNames() {
         ObjEntity entity = new ObjEntity("entity");
         DbEntity dbentity = new DbEntity("dbe");
@@ -244,6 +253,7 @@ public class ObjEntityIT extends ServerCase {
         assertTrue(entity.getPrimaryKeyNames().contains(pk2.getName()));
     }
 
+    @Test
     public void testGetClientEntity() {
 
         DataMap map = new DataMap();
@@ -281,6 +291,7 @@ public class ObjEntityIT extends ServerCase {
         assertEquals(e1.getRelationships().size(), e2.getRelationships().size());
     }
 
+    @Test
     public void testSerializability() throws Exception {
         ObjEntity entity = new ObjEntity("entity");
 
@@ -288,6 +299,7 @@ public class ObjEntityIT extends ServerCase {
         assertEquals(entity.getName(), d1.getName());
     }
 
+    @Test
     public void testDbEntityName() {
         ObjEntity entity = new ObjEntity("entity");
         assertNull(entity.getDbEntityName());
@@ -299,6 +311,7 @@ public class ObjEntityIT extends ServerCase {
         assertNull(entity.getDbEntityName());
     }
 
+    @Test
     public void testDbEntity() {
         ObjEntity entity = new ObjEntity("entity");
         DbEntity dbentity = new DbEntity("dbe");
@@ -320,6 +333,7 @@ public class ObjEntityIT extends ServerCase {
         assertSame(dbentity, entity.getDbEntity());
     }
 
+    @Test
     public void testDbEntityNoContainer() {
         ObjEntity entity = new ObjEntity("entity");
         entity.setDbEntityName("dbe");
@@ -332,6 +346,7 @@ public class ObjEntityIT extends ServerCase {
         }
     }
 
+    @Test
     public void testClassName() {
         ObjEntity entity = new ObjEntity("entity");
         String tstName = "tst_name";
@@ -339,6 +354,7 @@ public class ObjEntityIT extends ServerCase {
         assertEquals(tstName, entity.getClassName());
     }
 
+    @Test
     public void testSuperClassName() {
         ObjEntity entity = new ObjEntity("entity");
         String tstName = "super_tst_name";
@@ -346,6 +362,7 @@ public class ObjEntityIT extends ServerCase {
         assertEquals(tstName, entity.getSuperClassName());
     }
 
+    @Test
     public void testAttributeForDbAttribute() throws Exception {
         ObjEntity ae = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
         DbEntity dae = ae.getDbEntity();
@@ -354,6 +371,7 @@ public class ObjEntityIT extends ServerCase {
         assertNotNull(ae.getAttributeForDbAttribute(dae.getAttribute("ARTIST_NAME")));
     }
 
+    @Test
     public void testRelationshipForDbRelationship() throws Exception {
         ObjEntity ae = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
         DbEntity dae = ae.getDbEntity();
@@ -362,6 +380,7 @@ public class ObjEntityIT extends ServerCase {
         assertNotNull(ae.getRelationshipForDbRelationship(dae.getRelationship("paintingArray")));
     }
 
+    @Test
     public void testReadOnly() throws Exception {
         ObjEntity entity = new ObjEntity("entity");
         assertFalse(entity.isReadOnly());
@@ -369,6 +388,7 @@ public class ObjEntityIT extends ServerCase {
         assertTrue(entity.isReadOnly());
     }
 
+    @Test
     public void testTranslateToRelatedEntityIndependentPath() throws Exception {
         ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
 
@@ -377,6 +397,7 @@ public class ObjEntityIT extends ServerCase {
         assertEquals("failure: " + translated, Expression.fromString("db:toArtist.paintingArray"), translated);
     }
 
+    @Test
     public void testTranslateToRelatedEntityTrimmedPath() throws Exception {
         ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
 
@@ -386,6 +407,7 @@ public class ObjEntityIT extends ServerCase {
                 translated);
     }
 
+    @Test
     public void testTranslateToRelatedEntitySplitHalfWay() throws Exception {
         ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
 
@@ -395,6 +417,7 @@ public class ObjEntityIT extends ServerCase {
                 Expression.fromString("db:paintingArray.toArtist.paintingArray.toPaintingInfo.TEXT_REVIEW"), translated);
     }
 
+    @Test
     public void testTranslateToRelatedEntityMatchingPath() throws Exception {
         ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
         Expression e1 = Expression.fromString("artistExhibitArray.toExhibit");
@@ -403,6 +426,7 @@ public class ObjEntityIT extends ServerCase {
                 Expression.fromString("db:artistExhibitArray.toArtist.artistExhibitArray.toExhibit"), translated);
     }
 
+    @Test
     public void testTranslateToRelatedEntityMultiplePaths() throws Exception {
         ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
 
@@ -411,7 +435,8 @@ public class ObjEntityIT extends ServerCase {
         assertEquals("failure: " + translated, Expression.fromString("db:toArtist.paintingArray = $p "
                 + "and db:toArtist.artistExhibitArray.toExhibit.CLOSING_DATE = $d"), translated);
     }
-    
+
+    @Test
     public void testTranslateToRelatedEntityOuterJoin_Flattened() throws Exception {
         ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class);
 
@@ -420,6 +445,7 @@ public class ObjEntityIT extends ServerCase {
         assertEquals("failure: " + translated, Expression.fromString("db:toArtist.artistGroupArray+.toGroup+.NAME"), translated);
     }
 
+    @Test
     public void testTranslateNullArg() {
         ObjEntity entity = context.getEntityResolver().getObjEntity("Artist");
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
index 783481f..4ae579e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.util.Util;
 import org.apache.cayenne.util.XMLEncoder;
+import org.junit.Test;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -60,6 +61,7 @@ public class ObjRelationshipIT extends ServerCase {
         galleryDBEntity = resolver.getDbEntity("GALLERY");
     }
 
+    @Test
     public void testEncodeAsXML() {
         StringWriter buffer = new StringWriter();
         PrintWriter out = new PrintWriter(buffer);
@@ -86,6 +88,7 @@ public class ObjRelationshipIT extends ServerCase {
                 + "collection-type=\"java.util.Map\" map-key=\"bla\"/>" + lineBreak, buffer.getBuffer().toString());
     }
 
+    @Test
     public void testCollectionType() {
         ObjRelationship r = new ObjRelationship("X");
         assertNull(r.getCollectionType());
@@ -93,6 +96,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertEquals("java.util.Map", r.getCollectionType());
     }
 
+    @Test
     public void testSerializability() throws Exception {
         ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
 
@@ -104,6 +108,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertEquals(r1.getDbRelationshipPath(), r2.getDbRelationshipPath());
     }
 
+    @Test
     public void testGetClientRelationship() {
         final ObjEntity target = new ObjEntity("te1");
         ObjRelationship r1 = new ObjRelationship("r1") {
@@ -124,6 +129,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertEquals(r1.getDeleteRule(), r2.getDeleteRule());
     }
 
+    @Test
     public void testGetReverseDbRelationshipPath() {
         ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
         ObjEntity paintingObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Painting");
@@ -138,6 +144,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertEquals("paintingArray", r2.getReverseDbRelationshipPath());
     }
 
+    @Test
     public void testSetDbRelationshipPath() {
         ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
 
@@ -147,6 +154,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertEquals(r.getDbRelationshipPath(), "paintingArray");
     }
 
+    @Test
     public void testRefreshFromPath() {
         ObjRelationship relationship = new ObjRelationship();
 
@@ -198,6 +206,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertSame(pathR, resolvedPath.get(1));
     }
 
+    @Test
     public void testCalculateToMany() {
         // assemble fixture....
         DataMap map = new DataMap();
@@ -247,6 +256,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertTrue(relationship.isToMany());
     }
 
+    @Test
     public void testCalculateToManyFromPath() {
         // assemble fixture....
         DataMap map = new DataMap();
@@ -298,6 +308,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertTrue(relationship.isToMany());
     }
 
+    @Test
     public void testTargetEntity() throws Exception {
         ObjRelationship relationship = new ObjRelationship("some_rel");
         relationship.setTargetEntityName("targ");
@@ -323,6 +334,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertSame(target, relationship.getTargetEntity());
     }
 
+    @Test
     public void testGetReverseRel1() {
 
         ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
@@ -336,6 +348,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertSame(paintingObjEnt.getRelationship("toArtist"), r2);
     }
 
+    @Test
     public void testGetReverseRel2() {
         ObjEntity artistEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
         ObjEntity paintingEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Painting");
@@ -348,6 +361,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertSame(artistEnt.getRelationship("paintingArray"), r2);
     }
 
+    @Test
     public void testSingleDbRelationship() {
         ObjRelationship relationship = new ObjRelationship();
         DbRelationship r1 = new DbRelationship("X");
@@ -361,6 +375,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertEquals(0, relationship.getDbRelationships().size());
     }
 
+    @Test
     public void testFlattenedRelationship() {
         DbRelationship r1 = new DbRelationship("X");
         DbRelationship r2 = new DbRelationship("Y");
@@ -393,6 +408,7 @@ public class ObjRelationshipIT extends ServerCase {
 
     }
 
+    @Test
     public void testReadOnly_Flattened1_1__N_1() {
 
         // check common vertical inheritance relationships
@@ -408,6 +424,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertFalse(x.isReadOnly());
     }
 
+    @Test
     public void testReadOnlyMoreThan3DbRelsRelationship() {
         // Readonly is a flattened relationship that isn't over a single
         // many->many link
@@ -440,6 +457,7 @@ public class ObjRelationshipIT extends ServerCase {
     // Test for a read-only flattened relationship that is readonly because it's
     // dbrel
     // sequence is "incorrect" (or rather, unsupported)
+    @Test
     public void testIncorrectSequenceReadOnlyRelationship() {
         DbRelationship r1 = new DbRelationship("X");
         DbRelationship r2 = new DbRelationship("Y");
@@ -462,6 +480,7 @@ public class ObjRelationshipIT extends ServerCase {
 
     // Test a relationship loaded from the test datamap that we know should be
     // flattened
+    @Test
     public void testKnownFlattenedRelationship() {
         ObjEntity artistEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
         ObjRelationship theRel = artistEnt.getRelationship("groupArray");
@@ -470,6 +489,7 @@ public class ObjRelationshipIT extends ServerCase {
         assertFalse(theRel.isReadOnly());
     }
 
+    @Test
     public void testBadDeleteRuleValue() {
         ObjRelationship relationship = new ObjRelationship();
 
@@ -481,6 +501,7 @@ public class ObjRelationshipIT extends ServerCase {
         }
     }
 
+    @Test
     public void testOkDeleteRuleValue() {
         ObjRelationship relationship = new ObjRelationship();
         try {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java
index db7c086..ddc96ef 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/AddColumnToModelIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
 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;
@@ -31,6 +32,7 @@ import java.util.List;
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class AddColumnToModelIT extends MergeCase {
 
+    @Test
     public void testAddColumn() throws Exception {
         dropTableIfPresent("NEW_TABLE");
         assertTokensAndExecute(0, 0);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java
index d0012a1..bcb58b2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/CreateTableToModelIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.ObjEntity;
 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;
@@ -30,6 +31,7 @@ import java.util.List;
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class CreateTableToModelIT extends MergeCase {
 
+    @Test
     public void testAddTable() throws Exception {
         dropTableIfPresent("NEW_TABLE");
         assertTokensAndExecute(0, 0);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java
index b11d765..e308b77 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropColumnToModelIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
 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;
@@ -34,6 +35,7 @@ import java.util.List;
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DropColumnToModelIT extends MergeCase {
 
+    @Test
     public void testSimpleColumn() throws Exception {
         dropTableIfPresent("NEW_TABLE");
 
@@ -91,6 +93,7 @@ public class DropColumnToModelIT extends MergeCase {
         assertTokensAndExecute(0, 0);
     }
 
+    @Test
     public void testRemoveFKColumnWithoutRelationshipInDb() throws Exception {
         dropTableIfPresent("NEW_TABLE");
         dropTableIfPresent("NEW_TABLE2");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java
index cbfe05d..20dff04 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
 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;
@@ -34,6 +35,7 @@ import java.util.List;
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DropRelationshipToModelIT extends MergeCase {
 
+    @Test
     public void testForeignKey() throws Exception {
         dropTableIfPresent("NEW_TABLE");
         dropTableIfPresent("NEW_TABLE2");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java
index bec6005..64ef6ad 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/DropTableToModelIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
 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;
@@ -31,6 +32,7 @@ import java.util.List;
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DropTableToModelIT extends MergeCase {
 
+    @Test
     public void testDropTable() throws Exception {
         dropTableIfPresent("NEW_TABLE");
         assertTokensAndExecute(0, 0);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java
index 298acec..40233d5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/MergerFactoryIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Types;
 
@@ -38,6 +39,7 @@ public class MergerFactoryIT extends MergeCase {
     @Inject
     private DataContext context;
 
+    @Test
     public void testAddAndDropColumnToDb() throws Exception {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);
@@ -59,6 +61,7 @@ public class MergerFactoryIT extends MergeCase {
         assertTokensAndExecute(0, 0);
     }
 
+    @Test
     public void testChangeVarcharSizeToDb() throws Exception {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);
@@ -89,6 +92,7 @@ public class MergerFactoryIT extends MergeCase {
         assertTokensAndExecute(0, 0);
     }
 
+    @Test
     public void testMultipleTokensToDb() throws Exception {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);
@@ -124,6 +128,7 @@ public class MergerFactoryIT extends MergeCase {
         assertTokensAndExecute(0, 0);
     }
 
+    @Test
     public void testAddTableToDb() throws Exception {
         dropTableIfPresent("NEW_TABLE");
 
@@ -173,6 +178,7 @@ public class MergerFactoryIT extends MergeCase {
         assertTokensAndExecute(0, 0);
     }
 
+    @Test
     public void testAddForeignKeyWithTable() throws Exception {
         dropTableIfPresent("NEW_TABLE");
 
@@ -237,6 +243,7 @@ public class MergerFactoryIT extends MergeCase {
         assertTokensAndExecute(0, 0);
     }
 
+    @Test
     public void testAddForeignKeyAfterTable() throws Exception {
         dropTableIfPresent("NEW_TABLE");
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java
index 067303b..d3f815e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetAllowNullToDbIT.java
@@ -22,12 +22,14 @@ import org.apache.cayenne.map.DbAttribute;
 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;
 
 import java.sql.Types;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class SetAllowNullToDbIT extends MergeCase {
 
+    @Test
     public void test() throws Exception {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java
index 28b134c..2656a52 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetNotNullToDbIT.java
@@ -18,14 +18,15 @@
  ****************************************************************/
 package org.apache.cayenne.merge;
 
-import java.sql.Types;
-
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
+
+import java.sql.Types;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class SetNotNullToDbIT extends MergeCase {
@@ -43,6 +44,7 @@ public class SetNotNullToDbIT extends MergeCase {
         dbHelper.deleteAll("PAINTING");
     }
 
+    @Test
     public void test() throws Exception {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java
index 9654046..a4a4e25 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbIT.java
@@ -18,16 +18,18 @@
  ****************************************************************/
 package org.apache.cayenne.merge;
 
-import java.sql.Types;
-
 import org.apache.cayenne.map.DbAttribute;
 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;
+
+import java.sql.Types;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class SetPrimaryKeyToDbIT extends MergeCase {
 
+    @Test
     public void test() throws Exception {
         dropTableIfPresent("NEW_TABLE");
         assertTokensAndExecute(0, 0);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java
index abcef98..ec3effe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/ValueForNullIT.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.query.SelectQuery;
 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;
@@ -45,6 +46,7 @@ public class ValueForNullIT extends MergeCase {
     @Inject
     private DataContext context;
 
+    @Test
     public void test() throws Exception {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
index af76334..350a774 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
@@ -18,11 +18,6 @@
  ****************************************************************/
 package org.apache.cayenne.query;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.configuration.server.ServerRuntime;
@@ -41,6 +36,12 @@ 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.apache.cayenne.util.XMLEncoder;
+import org.junit.Test;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.Map;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class EJBQLQueryIT extends ServerCase {
@@ -97,6 +98,7 @@ public class EJBQLQueryIT extends ServerCase {
         tBigIntegerEntity.insert(44001, new Long(744073709551715l));
     }
 
+    @Test
     public void testLongParameter() throws Exception {
         createBigIntegerEntitiesDataSet();
         String ejbql = "SELECT bie FROM BigIntegerEntity bie WHERE bie.bigIntegerField > ?1";
@@ -106,6 +108,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(1, result.size());
     }
 
+    @Test
     public void testLongLiteral() throws Exception {
         createBigIntegerEntitiesDataSet();
         String ejbql = "SELECT bie FROM BigIntegerEntity bie WHERE bie.bigIntegerField > 744073709551615";
@@ -114,6 +117,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(1, result.size());
     }
 
+    @Test
     public void testParameters() {
         String ejbql = "select a FROM Artist a WHERE a.artistName = ?1 OR a.artistName = :name";
         EJBQLQuery query = new EJBQLQuery(ejbql);
@@ -128,6 +132,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals("Y", parameters.get("name"));
     }
 
+    @Test
     public void testCacheParameters() {
         String ejbql1 = "select a FROM Artist a WHERE a.artistName = ?1 OR a.artistName = :name";
         EJBQLQuery q1 = new EJBQLQuery(ejbql1);
@@ -152,6 +157,7 @@ public class EJBQLQueryIT extends ServerCase {
                 .getCacheKey());
     }
 
+    @Test
     public void testCacheStrategy() throws Exception {
 
         // insertValue();
@@ -178,6 +184,7 @@ public class EJBQLQueryIT extends ServerCase {
 
     }
 
+    @Test
     public void testDataRows() throws Exception {
 
         // insertValue();
@@ -195,6 +202,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(artistName, artist.getArtistName());
     }
 
+    @Test
     public void testGetExpression() {
         String ejbql = "select a FROM Artist a";
         EJBQLQuery query = new EJBQLQuery(ejbql);
@@ -205,6 +213,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(ejbql, parsed.getSource());
     }
 
+    @Test
     public void testGetName() {
         String ejbql = "select a FROM Artist a";
         EJBQLQuery query = new EJBQLQuery(ejbql);
@@ -214,6 +223,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals("XYZ", query.getName());
     }
 
+    @Test
     public void testUniqueKeyEntity() {
         // insertValue();
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -230,6 +240,7 @@ public class EJBQLQueryIT extends ServerCase {
                 .getCacheKey());
     }
 
+    @Test
     public void testGetMetadata() {
 
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -250,6 +261,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(QueryCacheStrategy.NO_CACHE, md.getCacheStrategy());
     }
 
+    @Test
     public void testSelectRelationship() throws Exception {
 
         // insertPaintValue();
@@ -290,6 +302,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(String.class, ((Object[]) result3.get(0))[1].getClass());
     }
 
+    @Test
     public void testEncodeAsXML() {
 
         String ejbql = "select a FROM Artist a";
@@ -323,6 +336,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(w.getBuffer().toString(), s.toString());
     }
 
+    @Test
     public void testInWithMultipleStringPositionalParameters_withBrackets() throws Exception {
         createPaintingsDataSet();
         EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.paintingTitle in (?1,?2,?3)");
@@ -333,6 +347,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(2, paintings.size());
     }
 
+    @Test
     public void testInWithSingleStringPositionalParameter_withoutBrackets() throws Exception {
         createPaintingsDataSet();
         EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.paintingTitle in ?1");
@@ -341,6 +356,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(1, paintings.size());
     }
 
+    @Test
     public void testInWithSingleCollectionNamedParameter_withoutBrackets() throws Exception {
         createPaintingsDataSet();
         EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.toArtist in :artists");
@@ -349,6 +365,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(3, paintings.size());
     }
 
+    @Test
     public void testInWithSingleCollectionPositionalParameter_withoutBrackets() throws Exception {
         createPaintingsDataSet();
         EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.toArtist in ?1");
@@ -357,6 +374,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(3, paintings.size());
     }
 
+    @Test
     public void testInWithSingleCollectionNamedParameter_withBrackets() throws Exception {
         createPaintingsDataSet();
         EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.toArtist in (:artists)");
@@ -365,6 +383,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(3, paintings.size());
     }
 
+    @Test
     public void testInWithSingleCollectionPositionalParameter_withBrackets() throws Exception {
         createPaintingsDataSet();
         EJBQLQuery query = new EJBQLQuery("select p from Painting p where p.toArtist in (?1)");
@@ -373,24 +392,28 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals(3, paintings.size());
     }
 
+    @Test
     public void testNullParameter() {
         EJBQLQuery query = new EJBQLQuery("select p from Painting p WHERE p.toArtist=:x");
         query.setParameter("x", null);
         context.performQuery(query);
     }
 
+    @Test
     public void testNullNotEqualsParameter() {
         EJBQLQuery query = new EJBQLQuery("select p from Painting p WHERE p.toArtist<>:x");
         query.setParameter("x", null);
         context.performQuery(query);
     }
 
+    @Test
     public void testNullPositionalParameter() {
         EJBQLQuery query = new EJBQLQuery("select p from Painting p WHERE p.toArtist=?1");
         query.setParameter(1, null);
         context.performQuery(query);
     }
 
+    @Test
     public void testNullAndNotNullParameter() {
         EJBQLQuery query = new EJBQLQuery(
                 "select p from Painting p WHERE p.toArtist=:x OR p.toArtist.artistName=:b");
@@ -399,6 +422,7 @@ public class EJBQLQueryIT extends ServerCase {
         context.performQuery(query);
     }
 
+    @Test
     public void testLikeWithExplicitEscape() throws Exception {
         createPaintingsDataSet();
         EJBQLQuery query = new EJBQLQuery("SELECT p FROM Painting p WHERE p.paintingTitle LIKE '|%|%?|_title|%|%|_' ESCAPE '|'");
@@ -407,12 +431,14 @@ public class EJBQLQueryIT extends ServerCase {
         assertEquals("%%?_title%%_", paintings.get(0).getPaintingTitle());
     }
 
+    @Test
     public void testJoinToJoined() {
         EJBQLQuery query = new EJBQLQuery(
                 "select g from Gallery g inner join g.paintingArray p where p.toArtist.artistName like '%a%'");
         context.performQuery(query);
     }
 
+    @Test
     public void testJoinAndCount() {
         EJBQLQuery query = new EJBQLQuery(
                 "select count(p) from Painting p where p.toGallery.galleryName LIKE '%a%' AND ("
@@ -433,6 +459,7 @@ public class EJBQLQueryIT extends ServerCase {
     // or p.partNumber like '%rimadyl%'
     // )
 
+    @Test
     public void testRelationshipWhereClause() throws Exception {
         Artist a = context.newObject(Artist.class);
         a.setArtistName("a");
@@ -449,6 +476,7 @@ public class EJBQLQueryIT extends ServerCase {
         assertSame(p, paintings.get(0));
     }
 
+    @Test
     public void testRelationshipWhereClause2() throws Exception {
         Expression exp = ExpressionFactory.matchExp(Painting.TO_GALLERY_PROPERTY, null);
         EJBQLQuery query = new EJBQLQuery("select p.toArtist from Painting p where "
@@ -457,6 +485,7 @@ public class EJBQLQueryIT extends ServerCase {
         context.performQuery(query);
     }
 
+    @Test
     public void testOrBrackets() throws Exception {
         Artist a = context.newObject(Artist.class);
         a.setArtistName("testOrBrackets");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java
index 61ec8f0..4a1f94d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryCacheKeyIT.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.map.EntityResolver;
 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 ProcedureQueryCacheKeyIT extends ServerCase {
@@ -31,6 +32,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
     @Inject
     private ServerRuntime runtime;
 
+    @Test
     public void testNoCache() {
 
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -47,6 +49,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
         assertNull(md2.getCacheKey());
     }
 
+    @Test
     public void testLocalCache() {
 
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -60,6 +63,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
         assertNotNull(md1.getCacheKey());
     }
 
+    @Test
     public void testSharedCache() {
 
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -73,6 +77,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
         assertNotNull(md1.getCacheKey());
     }
 
+    @Test
     public void testNamedQuery() {
 
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -87,6 +92,7 @@ public class ProcedureQueryCacheKeyIT extends ServerCase {
         assertEquals("proc:", md1.getCacheKey());
     }
 
+    @Test
     public void testCacheFetchOffsetAndLimit() {
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
         

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java
index ee23624..2348b45 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.di.Inject;
 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 QueryChainIT extends ServerCase {
@@ -30,6 +31,7 @@ public class QueryChainIT extends ServerCase {
     @Inject
     private ServerRuntime runtime;
 
+    @Test
     public void testSelectQuery() {
 
         QueryChain chain = new QueryChain();
@@ -43,6 +45,7 @@ public class QueryChainIT extends ServerCase {
         assertNull(md.getObjEntity());
     }
 
+    @Test
     public void testSelectQueryDataRows() {
 
         QueryChain chain = new QueryChain();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
index 0d7acf0..b7bfdd6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
@@ -18,8 +18,6 @@
  ****************************************************************/
 package org.apache.cayenne.query;
 
-import java.util.List;
-
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.di.Inject;
@@ -28,6 +26,9 @@ 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;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class SQLSelectIT extends ServerCase {
@@ -58,6 +59,7 @@ public class SQLSelectIT extends ServerCase {
 		}
 	}
 
+    @Test
 	public void test_DataRows_DataMapNameRoot() throws Exception {
 
 		createArtistsDataSet();
@@ -70,6 +72,7 @@ public class SQLSelectIT extends ServerCase {
 		assertTrue(result.get(0) instanceof DataRow);
 	}
 
+    @Test
 	public void test_DataRows_DefaultRoot() throws Exception {
 
 		createArtistsDataSet();
@@ -82,6 +85,7 @@ public class SQLSelectIT extends ServerCase {
 		assertTrue(result.get(0) instanceof DataRow);
 	}
 
+    @Test
 	public void test_DataRows_ClassRoot() throws Exception {
 
 		createArtistsDataSet();
@@ -93,6 +97,7 @@ public class SQLSelectIT extends ServerCase {
 		assertTrue(result.get(0) instanceof Artist);
 	}
 
+    @Test
 	public void test_DataRows_ClassRoot_Parameters() throws Exception {
 
 		createArtistsDataSet();
@@ -105,6 +110,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals("artist3", a.getArtistName());
 	}
 
+    @Test
 	public void test_DataRows_ClassRoot_Bind() throws Exception {
 
 		createArtistsDataSet();
@@ -117,6 +123,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals(2, result.size());
 	}
 
+    @Test
 	public void test_DataRows_ColumnNameCaps() throws Exception {
 
 		SQLSelect<DataRow> q1 = SQLSelect.dataRowQuery("SELECT * FROM ARTIST WHERE ARTIST_NAME = 'artist2'");
@@ -130,6 +137,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals(CapsStrategy.LOWER, r2.getColumnNamesCapitalization());
 	}
 
+    @Test
 	public void test_DataRows_FetchLimit() throws Exception {
 
 		createArtistsDataSet();
@@ -140,6 +148,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals(5, context.select(q1).size());
 	}
 
+    @Test
 	public void test_DataRows_FetchOffset() throws Exception {
 
 		createArtistsDataSet();
@@ -150,6 +159,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals(16, context.select(q1).size());
 	}
 
+    @Test
 	public void test_Append() throws Exception {
 
 		createArtistsDataSet();
@@ -161,6 +171,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals(1, result.size());
 	}
 
+    @Test
 	public void test_Select() throws Exception {
 
 		createArtistsDataSet();
@@ -171,6 +182,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals(1, result.size());
 	}
 
+    @Test
 	public void test_SelectOne() throws Exception {
 
 		createArtistsDataSet();
@@ -181,6 +193,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals("artist3", a.getArtistName());
 	}
 
+    @Test
 	public void test_SelectLong() throws Exception {
 
 		createArtistsDataSet();
@@ -191,6 +204,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals(3l, id);
 	}
 
+    @Test
 	public void test_SelectLongArray() throws Exception {
 
 		createArtistsDataSet();
@@ -202,6 +216,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals(2l, ids.get(1).longValue());
 	}
 
+    @Test
 	public void test_SelectCount() throws Exception {
 
 		createArtistsDataSet();
@@ -211,6 +226,7 @@ public class SQLSelectIT extends ServerCase {
 		assertEquals(20, c);
 	}
 
+    @Test
 	public void testSQLTemplate_PositionalParams() throws Exception {
 
 		createArtistsDataSet();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java
index 3a8c440..f223657 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.map.EntityResolver;
 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 SQLTemplateCacheKeyIT extends ServerCase {
@@ -30,6 +31,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
     @Inject
     private EntityResolver resolver;
 
+    @Test
     public void testNoCache() {
 
         SQLTemplate query = new SQLTemplate(Artist.class, "SELECT ME");
@@ -44,6 +46,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
         assertNull(md2.getCacheKey());
     }
 
+    @Test
     public void testLocalCache() {
 
         SQLTemplate query = new SQLTemplate(Artist.class, "SELECT ME");
@@ -55,6 +58,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
         assertNotNull(md1.getCacheKey());
     }
 
+    @Test
     public void testSharedCache() {
 
         SQLTemplate query = new SQLTemplate(Artist.class, "SELECT ME");
@@ -66,6 +70,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
         assertNotNull(md1.getCacheKey());
     }
 
+    @Test
     public void testNamedQuery() {
 
         SQLTemplate query = new SQLTemplate(Artist.class, "SELECT ME");
@@ -78,6 +83,7 @@ public class SQLTemplateCacheKeyIT extends ServerCase {
         assertFalse("XYZ".equals(md1.getCacheKey()));
     }
 
+    @Test
     public void testCacheFetchLimitAndOffset() {
         SQLTemplate q1 = new SQLTemplate(Artist.class, "SELECT ME");
         q1.setFetchOffset(5);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
index 5696eba..b71b70e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
@@ -19,10 +19,6 @@
 
 package org.apache.cayenne.query;
 
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.List;
-
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.access.DataContext;
@@ -33,6 +29,11 @@ import org.apache.cayenne.test.jdbc.TableHelper;
 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.SQLException;
+import java.sql.Types;
+import java.util.List;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class SQLTemplateIT extends ServerCase {
@@ -58,6 +59,7 @@ public class SQLTemplateIT extends ServerCase {
 				Types.INTEGER, Types.BIGINT, Types.VARCHAR, Types.DECIMAL);
 	}
 
+    @Test
 	public void testSQLTemplateForDataMap() {
 		DataMap testDataMap = context.getEntityResolver().getDataMap("tstmap");
 		SQLTemplate q1 = new SQLTemplate(testDataMap, "SELECT * FROM ARTIST", true);
@@ -65,6 +67,7 @@ public class SQLTemplateIT extends ServerCase {
 		assertEquals(0, result.size());
 	}
 
+    @Test
 	public void testSQLTemplateForDataMapWithInsert() {
 		DataMap testDataMap = context.getEntityResolver().getDataMap("tstmap");
 		String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
@@ -76,6 +79,7 @@ public class SQLTemplateIT extends ServerCase {
 		assertEquals(1, result.size());
 	}
 
+    @Test
 	public void testSQLTemplateForDataMapWithInsertException() {
 		DataMap testDataMap = context.getEntityResolver().getDataMap("tstmap");
 		String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
@@ -93,6 +97,7 @@ public class SQLTemplateIT extends ServerCase {
 				gotRuntimeException);
 	}
 
+    @Test
 	public void testSQLTemplate_PositionalParams() throws SQLException {
 
 		String sql = "INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) "
@@ -107,6 +112,7 @@ public class SQLTemplateIT extends ServerCase {
 		assertEquals(10005.d, tPainting.getDouble("ESTIMATED_PRICE"), 0.001);
 	}
 
+    @Test
 	public void testSQLTemplate_PositionalParams_RepeatingVars() throws SQLException {
 
 		String sql = "INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) "
@@ -121,6 +127,7 @@ public class SQLTemplateIT extends ServerCase {
 		assertEquals(4567.d, tPainting.getDouble("ESTIMATED_PRICE"), 0.001);
 	}
 
+    @Test
 	public void testSQLTemplate_PositionalParams_ToFewParams() throws SQLException {
 
 		String sql = "INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) "
@@ -137,6 +144,7 @@ public class SQLTemplateIT extends ServerCase {
 		}
 	}
 
+    @Test
 	public void testSQLTemplate_PositionalParams_ToManyParams() throws SQLException {
 
 		String sql = "INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) "