cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [08/50] [abbrv] cayenne git commit: Apply JUnit4 instead of JUnit3 in IT
Date Fri, 14 Nov 2014 17:47:09 GMT
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
index e43e8bd..6384c07 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
 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.util.Arrays;
 import java.util.Collection;
@@ -54,6 +55,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testConstructor() throws Exception {
         DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
 
@@ -62,6 +64,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
         assertSame(adapter, builder.adapter);
     }
 
+    @Test
     public void testCreateSqlString() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();
@@ -77,6 +80,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
         assertEquals("DELETE FROM " + entity.getName() + " WHERE LOCKING_TEST_ID = ?", generatedSql);
     }
 
+    @Test
     public void testCreateSqlStringWithNulls() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();
@@ -95,6 +99,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
         assertEquals("DELETE FROM " + entity.getName() + " WHERE LOCKING_TEST_ID = ? AND NAME IS NULL", generatedSql);
     }
 
+    @Test
     public void testCreateSqlStringWithIdentifiersQuote() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();
@@ -120,6 +125,7 @@ public class DeleteBatchTranslatorIT extends ServerCase {
 
     }
 
+    @Test
     public void testCreateSqlStringWithNullsWithIdentifiersQuote() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
index 1a631db..ad28d6e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
 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 static org.mockito.Mockito.mock;
 
@@ -47,6 +48,7 @@ public class InsertBatchTranslatorIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testConstructor() throws Exception {
         DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
 
@@ -55,6 +57,7 @@ public class InsertBatchTranslatorIT extends ServerCase {
         assertSame(adapter, builder.adapter);
     }
 
+    @Test
     public void testCreateSqlString() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();
@@ -68,6 +71,7 @@ public class InsertBatchTranslatorIT extends ServerCase {
                 generatedSql);
     }
 
+    @Test
     public void testCreateSqlStringWithIdentifiersQuote() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java
index 1309e7c..1860cc1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorIT.java
@@ -36,6 +36,7 @@ import org.apache.cayenne.testdo.locking.SoftDelete;
 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.util.Arrays;
 import java.util.Collection;
@@ -69,6 +70,7 @@ public class SoftDeleteBatchTranslatorIT extends ServerCase {
         return (DeleteBatchTranslator) new SoftDeleteTranslatorFactory().translator(query, adapter, null);
     }
 
+    @Test
     public void testCreateSqlString() throws Exception {
         DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
 
@@ -81,6 +83,7 @@ public class SoftDeleteBatchTranslatorIT extends ServerCase {
         assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE ID = ?", generatedSql);
     }
 
+    @Test
     public void testCreateSqlStringWithNulls() throws Exception {
         DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
 
@@ -95,6 +98,7 @@ public class SoftDeleteBatchTranslatorIT extends ServerCase {
         assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE ID = ? AND NAME IS NULL", generatedSql);
     }
 
+    @Test
     public void testCreateSqlStringWithIdentifiersQuote() throws Exception {
         DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
         try {
@@ -121,6 +125,7 @@ public class SoftDeleteBatchTranslatorIT extends ServerCase {
 
     }
 
+    @Test
     public void testUpdate() throws Exception {
 
         final DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
index 4b77c84..8f3eea2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
 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.util.Arrays;
 import java.util.Collection;
@@ -53,12 +54,14 @@ public class UpdateBatchTranslatorIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testConstructor() throws Exception {
         DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
         UpdateBatchTranslator builder = new UpdateBatchTranslator(mock(UpdateBatchQuery.class), adapter, null);
         assertSame(adapter, builder.adapter);
     }
 
+    @Test
     public void testCreateSqlString() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();
@@ -76,6 +79,7 @@ public class UpdateBatchTranslatorIT extends ServerCase {
         assertEquals("UPDATE " + entity.getName() + " SET DESCRIPTION = ? WHERE LOCKING_TEST_ID = ?", generatedSql);
     }
 
+    @Test
     public void testCreateSqlStringWithNulls() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();
@@ -97,6 +101,7 @@ public class UpdateBatchTranslatorIT extends ServerCase {
                 generatedSql);
     }
 
+    @Test
     public void testCreateSqlStringWithIdentifiersQuote() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();
@@ -125,6 +130,7 @@ public class UpdateBatchTranslatorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCreateSqlStringWithNullsWithIdentifiersQuote() throws Exception {
         DbEntity entity = runtime.getDataDomain().getEntityResolver().getObjEntity(SimpleLockingTestEntity.class)
                 .getDbEntity();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java
index 0da0982..7db9fe3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.query.EJBQLQuery;
 import org.apache.cayenne.query.SQLTemplate;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -63,6 +64,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         return tr.getQuery();
     }
 
+    @Test
     public void testSelectFrom() {
         SQLTemplate query = translateSelect("select a from Artist a");
         String sql = query.getDefaultTemplate();
@@ -76,6 +78,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.endsWith(" FROM ARTIST t0"));
     }
 
+    @Test
     public void testSelectMultipleJoinsToTheSameTable() throws Exception {
         SQLTemplate query = translateSelect("SELECT a "
                 + "FROM Artist a JOIN a.paintingArray b JOIN a.paintingArray c "
@@ -88,6 +91,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.indexOf("INNER JOIN PAINTING t2 ON (t0.ARTIST_ID = t2.ARTIST_ID)") > 0);
     }
 
+    @Test
     public void testSelectImplicitColumnJoins() throws Exception {
         SQLTemplate query = translateSelect("SELECT a.paintingArray.toGallery.galleryName "
                 + "FROM Artist a JOIN a.paintingArray b");
@@ -109,6 +113,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         // assertTrue(sql, i2 < 0);
     }
 
+    @Test
     public void testSelectDistinct() {
         SQLTemplate query = translateSelect("select distinct a from Artist a");
         String sql = query.getDefaultTemplate();
@@ -116,6 +121,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.startsWith("SELECT DISTINCT "));
     }
 
+    @Test
     public void testSelectFromWhereEqual() {
         SQLTemplate query = translateSelect("select a from Artist a where a.artistName = 'Dali'");
         String sql = query.getDefaultTemplate();
@@ -125,6 +131,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.endsWith(" FROM ARTIST t0 WHERE t0.ARTIST_NAME =" + " #bind('Dali' 'VARCHAR')"));
     }
 
+    @Test
     public void testSelectFromWhereOrEqual() {
         SQLTemplate query = translateSelect("select a from Artist a where a.artistName = 'Dali' "
                 + "or a.artistName = 'Malevich'");
@@ -143,6 +150,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertEquals(2, countDelimiters(sql1, " OR ", sql.indexOf("WHERE ")));
     }
 
+    @Test
     public void testSelectFromWhereAndEqual() {
 
         SQLTemplate query = translateSelect("select a from Artist a where a.artistName = 'Dali' "
@@ -162,6 +170,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertEquals(2, countDelimiters(sql1, " AND ", sql1.indexOf("WHERE ")));
     }
 
+    @Test
     public void testSelectFromWhereNot() {
         SQLTemplate query = translateSelect("select a from Artist a where not (a.artistName = 'Dali')");
         String sql = query.getDefaultTemplate();
@@ -170,6 +179,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.endsWith("WHERE NOT " + "t0.ARTIST_NAME = #bind('Dali' 'VARCHAR')"));
     }
 
+    @Test
     public void testSelectFromWhereGreater() {
         SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice > 1.0");
         String sql = query.getDefaultTemplate();
@@ -178,24 +188,28 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.endsWith("WHERE t0.ESTIMATED_PRICE > #bind($id0 'DECIMAL')"));
     }
 
+    @Test
     public void testSelectFromWhereGreaterOrEqual() {
         SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice >= 2");
         String sql = query.getDefaultTemplate();
         assertTrue(sql, sql.endsWith("WHERE t0.ESTIMATED_PRICE >= #bind($id0 'INTEGER')"));
     }
 
+    @Test
     public void testSelectFromWhereLess() {
         SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice < 1.0");
         String sql = query.getDefaultTemplate();
         assertTrue(sql, sql.endsWith("WHERE t0.ESTIMATED_PRICE < #bind($id0 'DECIMAL')"));
     }
 
+    @Test
     public void testSelectFromWhereLessOrEqual() {
         SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice <= 1.0");
         String sql = query.getDefaultTemplate();
         assertTrue(sql, sql.endsWith("WHERE t0.ESTIMATED_PRICE <= #bind($id0 'DECIMAL')"));
     }
 
+    @Test
     public void testSelectFromWhereNotEqual() {
         SQLTemplate query = translateSelect("select a from Artist a where a.artistName <> 'Dali'");
         String sql = query.getDefaultTemplate();
@@ -203,6 +217,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.endsWith("WHERE t0.ARTIST_NAME <> #bind('Dali' 'VARCHAR')"));
     }
 
+    @Test
     public void testSelectFromWhereBetween() {
         SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice between 3 and 5");
         String sql = query.getDefaultTemplate();
@@ -211,6 +226,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
                 + "BETWEEN #bind($id0 'INTEGER') AND #bind($id1 'INTEGER')"));
     }
 
+    @Test
     public void testSelectFromWhereNotBetween() {
         SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice not between 3 and 5");
         String sql = query.getDefaultTemplate();
@@ -219,6 +235,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
                 + "NOT BETWEEN #bind($id0 'INTEGER') AND #bind($id1 'INTEGER')"));
     }
 
+    @Test
     public void testSelectFromWhereLike() {
         SQLTemplate query = translateSelect("select p from Painting p where p.paintingTitle like 'Stuff'");
         String sql = query.getDefaultTemplate();
@@ -226,6 +243,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.endsWith("WHERE t0.PAINTING_TITLE " + "LIKE #bind('Stuff' 'VARCHAR')"));
     }
 
+    @Test
     public void testSelectFromWhereNotLike() {
         SQLTemplate query = translateSelect("select p from Painting p where p.paintingTitle NOT like 'Stuff'");
         String sql = query.getDefaultTemplate();
@@ -233,6 +251,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.endsWith("WHERE t0.PAINTING_TITLE " + "NOT LIKE #bind('Stuff' 'VARCHAR')"));
     }
 
+    @Test
     public void testSelectPositionalParameters() {
         Map<Integer, Object> params = new HashMap<Integer, Object>();
         params.put(new Integer(1), "X");
@@ -243,6 +262,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
         assertTrue(sql, sql.endsWith("t0.ARTIST_NAME = #bind($id0) OR t0.ARTIST_NAME = #bind($id1)"));
     }
 
+    @Test
     public void testMax() {
         SQLTemplate query = translateSelect("select max(p.estimatedPrice) from Painting p");
         String sql = query.getDefaultTemplate();
@@ -251,6 +271,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
                 + "FROM PAINTING t0"));
     }
 
+    @Test
     public void testDistinctSum() {
         SQLTemplate query = translateSelect("select sum( distinct p.estimatedPrice) from Painting p");
         String sql = query.getDefaultTemplate();
@@ -260,6 +281,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
                         + "FROM PAINTING t0"));
     }
 
+    @Test
     public void testColumnPaths() {
         SQLTemplate query = translateSelect("select p.estimatedPrice, p.toArtist.artistName from Painting p");
         String sql = query.getDefaultTemplate();
@@ -281,6 +303,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
 
     // if parameter value is null (in this test x := null) we will generate
     // "IS NULL"
+    @Test
     public void testEqualsNullParameter() {
         String ejbql = "select p from Painting p WHERE p.toArtist=:x";
         EJBQLParser parser = EJBQLParserFactory.getParser();
@@ -296,6 +319,7 @@ public class EJBQLSelectTranslatorIT extends ServerCase {
     }
 
     // if parameter value is null and more than one parameter in query
+    @Test
     public void testEqualsNullAndNotNullParameter() {
         String ejbql = "select p from Painting p WHERE p.toArtist=:x OR p.toArtist.artistName=:b";
         EJBQLParser parser = EJBQLParserFactory.getParser();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
index fc580f3..d5a8e5a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingTranslatorIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Connection;
 
@@ -55,6 +56,7 @@ public class OrderingTranslatorIT extends ServerCase {
     /**
      * Tests ascending ordering on string attribute.
      */
+    @Test
     public void testDoTranslation1() throws Exception {
         SelectQuery q = new SelectQuery(Artist.class);
         q.addOrdering("artistName", SortOrder.ASCENDING);
@@ -73,6 +75,7 @@ public class OrderingTranslatorIT extends ServerCase {
     /**
      * Tests descending ordering on string attribute.
      */
+    @Test
     public void testDoTranslation2() throws Exception {
         SelectQuery q = new SelectQuery(Artist.class);
         q.addOrdering("artistName", SortOrder.DESCENDING);
@@ -91,6 +94,7 @@ public class OrderingTranslatorIT extends ServerCase {
     /**
      * Tests ascending case-insensitive ordering on string attribute.
      */
+    @Test
     public void testDoTranslation4() throws Exception {
         SelectQuery q = new SelectQuery(Artist.class);
         q.addOrdering("artistName", SortOrder.ASCENDING_INSENSITIVE);
@@ -108,6 +112,7 @@ public class OrderingTranslatorIT extends ServerCase {
         tstCase.assertTranslatedWell(orderBySql);
     }
 
+    @Test
     public void testDoTranslation5() throws Exception {
         SelectQuery q = new SelectQuery(Artist.class);
         q.addOrdering("artistName", SortOrder.DESCENDING_INSENSITIVE);
@@ -132,6 +137,7 @@ public class OrderingTranslatorIT extends ServerCase {
         tstCase.assertTranslatedWell(orderBySql);
     }
 
+    @Test
     public void testDoTranslation6() throws Exception {
         SelectQuery q = new SelectQuery(Artist.class);
         q.addOrdering("artistName", SortOrder.ASCENDING_INSENSITIVE);
@@ -158,6 +164,7 @@ public class OrderingTranslatorIT extends ServerCase {
         tstCase.assertTranslatedWell(orderBySql);
     }
 
+    @Test
     public void testDoTranslation3() throws Exception {
         SelectQuery q = new SelectQuery(Artist.class);
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
index c463839..8dddbe0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
@@ -37,6 +37,7 @@ import org.apache.cayenne.testdo.testmap.Gallery;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Connection;
 
@@ -61,6 +62,7 @@ public class QualifierTranslatorIT extends ServerCase {
         connection.close();
     }
 
+    @Test
     public void testNonQualifiedQuery() throws Exception {
         TstQueryAssembler qa = new TstQueryAssembler(new MockQuery(), node, connection);
 
@@ -72,6 +74,7 @@ public class QualifierTranslatorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testNullQualifier() throws Exception {
         TstQueryAssembler qa = new TstQueryAssembler(new SelectQuery<Object>(), node, connection);
 
@@ -80,18 +83,22 @@ public class QualifierTranslatorIT extends ServerCase {
         assertEquals(0, out.length());
     }
 
+    @Test
     public void testUnary() throws Exception {
         doExpressionTest(new TstUnaryExpSuite());
     }
 
+    @Test
     public void testBinary() throws Exception {
         doExpressionTest(new TstBinaryExpSuite());
     }
 
+    @Test
     public void testTernary() throws Exception {
         doExpressionTest(new TstTernaryExpSuite());
     }
 
+    @Test
     public void testExtras() throws Exception {
         ObjectId oid1 = new ObjectId("Gallery", "GALLERY_ID", 1);
         ObjectId oid2 = new ObjectId("Gallery", "GALLERY_ID", 2);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
index e2b299b..c731bb8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QueryAssemblerIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Connection;
 
@@ -53,10 +54,12 @@ public class QueryAssemblerIT extends ServerCase {
         connection.close();
     }
 
+    @Test
     public void testGetQuery() throws Exception {
         assertNotNull(qa.getQuery());
     }
 
+    @Test
     public void testAddToParamList() throws Exception {
 
         assertEquals(0, qa.getAttributes().size());
@@ -67,6 +70,7 @@ public class QueryAssemblerIT extends ServerCase {
         assertEquals(1, qa.getValues().size());
     }
 
+    @Test
     public void testCreateStatement() throws Exception {
         assertNotNull(qa.createStatement());
     }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
index c8129a7..a225b7e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/SelectTranslatorIT.java
@@ -41,6 +41,7 @@ import org.apache.cayenne.unit.UnitDbAdapter;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Connection;
 import java.util.Date;
@@ -88,6 +89,7 @@ public class SelectTranslatorIT extends ServerCase {
     /**
      * Tests query creation with qualifier and ordering.
      */
+    @Test
     public void testCreateSqlString1() throws Exception {
         // query with qualifier and ordering
         SelectQuery<Artist> q = new SelectQuery<Artist>(Artist.class, ExpressionFactory.likeExp("artistName", "a%"));
@@ -106,6 +108,7 @@ public class SelectTranslatorIT extends ServerCase {
     /**
      * Tests query creation with qualifier and ordering.
      */
+    @Test
     public void testDbEntityQualifier() throws Exception {
 
         SelectQuery<Artist> q = new SelectQuery<Artist>(Artist.class);
@@ -138,6 +141,7 @@ public class SelectTranslatorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testDbEntityQualifier_OuterJoin() throws Exception {
 
         SelectQuery q = new SelectQuery(Painting.class);
@@ -173,6 +177,7 @@ public class SelectTranslatorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testDbEntityQualifier_FlattenedRel() throws Exception {
 
         SelectQuery<Artist> q = new SelectQuery<Artist>(Artist.class, ExpressionFactory.matchExp("groupArray.name",
@@ -208,6 +213,7 @@ public class SelectTranslatorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testDbEntityQualifier_RelatedMatch() throws Exception {
 
         SelectQuery<Artist> q = new SelectQuery(Painting.class,
@@ -246,6 +252,7 @@ public class SelectTranslatorIT extends ServerCase {
     /**
      * Tests query creation with "distinct" specified.
      */
+    @Test
     public void testCreateSqlString2() throws Exception {
         // query with "distinct" set
         SelectQuery q = new SelectQuery(Artist.class);
@@ -263,6 +270,7 @@ public class SelectTranslatorIT extends ServerCase {
      * translation of relationship path "ArtistExhibit.toArtist.artistName" and
      * "ArtistExhibit.toExhibit.toGallery.paintingArray.toArtist.artistName".
      */
+    @Test
     public void testCreateSqlString5() throws Exception {
         // query with qualifier and ordering
         SelectQuery q = new SelectQuery(ArtistExhibit.class);
@@ -293,6 +301,7 @@ public class SelectTranslatorIT extends ServerCase {
      * translation of relationship path "ArtistExhibit.toArtist.artistName" and
      * "ArtistExhibit.toArtist.paintingArray.paintingTitle".
      */
+    @Test
     public void testCreateSqlString6() throws Exception {
         // query with qualifier and ordering
         SelectQuery q = new SelectQuery(ArtistExhibit.class);
@@ -320,6 +329,7 @@ public class SelectTranslatorIT extends ServerCase {
      * Test query when qualifying on the same attribute more than once. Check
      * translation "Artist.dateOfBirth > ? AND Artist.dateOfBirth < ?".
      */
+    @Test
     public void testCreateSqlString7() throws Exception {
         SelectQuery q = new SelectQuery(Artist.class);
         q.setQualifier(ExpressionFactory.greaterExp("dateOfBirth", new Date()));
@@ -351,6 +361,7 @@ public class SelectTranslatorIT extends ServerCase {
      * "Painting.toArtist.dateOfBirth > ? AND Painting.toArtist.dateOfBirth <
      * ?".
      */
+    @Test
     public void testCreateSqlString8() throws Exception {
         SelectQuery q = new SelectQuery();
         q.setRoot(Painting.class);
@@ -376,6 +387,7 @@ public class SelectTranslatorIT extends ServerCase {
         assertTrue("No second DOB comparison: " + i4 + ", " + i3, i4 > i3);
     }
 
+    @Test
     public void testCreateSqlString9() throws Exception {
         // query for a compound ObjEntity with qualifier
         SelectQuery q = new SelectQuery(CompoundPainting.class, ExpressionFactory.likeExp("artistName", "a%"));
@@ -427,6 +439,7 @@ public class SelectTranslatorIT extends ServerCase {
 
     }
 
+    @Test
     public void testCreateSqlString10() throws Exception {
         // query with to-many joint prefetches
         SelectQuery q = new SelectQuery(Artist.class);
@@ -449,6 +462,7 @@ public class SelectTranslatorIT extends ServerCase {
         assertEquals(1, transl.joinStack.size());
     }
 
+    @Test
     public void testCreateSqlString11() throws Exception {
         // query with joint prefetches and other joins
         SelectQuery q = new SelectQuery(Artist.class, Expression.fromString("paintingArray.paintingTitle = 'a'"));
@@ -462,6 +476,7 @@ public class SelectTranslatorIT extends ServerCase {
         assertEquals(2, transl.joinStack.size());
     }
 
+    @Test
     public void testCreateSqlString12() throws Exception {
         // query with to-one joint prefetches
         SelectQuery q = new SelectQuery(Painting.class);
@@ -485,6 +500,7 @@ public class SelectTranslatorIT extends ServerCase {
         assertEquals(1, transl.joinStack.size());
     }
 
+    @Test
     public void testCreateSqlString13() throws Exception {
         // query with invalid joint prefetches
         SelectQuery q = new SelectQuery(Painting.class);
@@ -498,6 +514,7 @@ public class SelectTranslatorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCreateSqlStringWithQuoteSqlIdentifiers() throws Exception {
 
         try {
@@ -534,6 +551,7 @@ public class SelectTranslatorIT extends ServerCase {
 
     }
 
+    @Test
     public void testCreateSqlStringWithQuoteSqlIdentifiers2() throws Exception {
 
         try {
@@ -578,6 +596,7 @@ public class SelectTranslatorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCreateSqlStringWithQuoteSqlIdentifiers3() throws Exception {
 
         // query with joint prefetches and other joins
@@ -656,6 +675,7 @@ public class SelectTranslatorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testCreateSqlStringWithQuoteSqlIdentifiers4() throws Exception {
 
         // query with to-one joint prefetches
@@ -721,6 +741,7 @@ public class SelectTranslatorIT extends ServerCase {
     /**
      * Tests columns generated for a simple object query.
      */
+    @Test
     public void testBuildResultColumns1() throws Exception {
         SelectQuery q = new SelectQuery(Painting.class);
         SelectTranslator tr = new SelectTranslator(q, dataNode, connection);
@@ -738,6 +759,7 @@ public class SelectTranslatorIT extends ServerCase {
     /**
      * Tests columns generated for an object query with joint prefetch.
      */
+    @Test
     public void testBuildResultColumns2() throws Exception {
         SelectQuery q = new SelectQuery(Painting.class);
         q.addPrefetch(Painting.TO_ARTIST_PROPERTY).setSemantics(PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java
index e1c5cea..948cf37 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverIT.java
@@ -22,10 +22,12 @@ package org.apache.cayenne.access.util;
 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;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DefaultOperationObserverIT extends ServerCase {
 
+    @Test
     public void testHasExceptions1() throws Exception {
         DefaultOperationObserver observer = new DefaultOperationObserver();
         assertFalse(observer.hasExceptions());
@@ -33,6 +35,7 @@ public class DefaultOperationObserverIT extends ServerCase {
         assertTrue(observer.hasExceptions());
     }
 
+    @Test
     public void testHasExceptions2() throws Exception {
         DefaultOperationObserver observer = new DefaultOperationObserver();
         assertFalse(observer.hasExceptions());

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
index aa82cd4..75c4d82 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.relationship.ReflexiveAndToOne;
 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;
@@ -60,6 +61,7 @@ public class AshwoodEntitySorterIT extends ServerCase {
                 .setColumnTypes(Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.VARCHAR);
     }
 
+    @Test
     public void testSortObjectsForEntityReflexiveWithFaults() throws Exception {
 
         tRelationshipHelper.insert(1, "rh1");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java
index 4d47685..13276c6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/cache/QueryCacheIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.query.SelectQuery;
 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;
 
@@ -36,7 +37,8 @@ public class QueryCacheIT extends ServerCase {
     
     @Inject
     private ObjectContext context2;
-    
+
+    @Test
     public void testLocalCache() {
         
         Artist a = context1.newObject(Artist.class);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
index ce2c68d..e140fe1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.unit.JNDISetup;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
@@ -35,6 +36,7 @@ public class JNDIDataSourceFactoryIT extends ServerCase {
     @Inject
     private Injector injector;
 
+    @Test
     public void testGetDataSource_NameBound() throws Exception {
 
         DataNodeDescriptor descriptor = new DataNodeDescriptor();
@@ -58,6 +60,7 @@ public class JNDIDataSourceFactoryIT extends ServerCase {
         }
     }
 
+    @Test
     public void testGetDataSource_NameBoundWithPrefix() throws Exception {
 
         DataNodeDescriptor descriptor = new DataNodeDescriptor();
@@ -81,6 +84,7 @@ public class JNDIDataSourceFactoryIT extends ServerCase {
         }
     }
 
+    @Test
     public void testGetDataSource_NameNotBound() throws Exception {
 
         DataNodeDescriptor descriptor = new DataNodeDescriptor();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java
index 53f64eb..ef5f536 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_IT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import javax.sql.DataSource;
 import java.util.List;
@@ -62,6 +63,7 @@ public class ServerRuntimeBuilder_InAction_IT extends ServerCase {
         this.dataSource = runtime.getDataSource("tstmap");
     }
 
+    @Test
     public void testConfigFree_WithDataSource() {
 
         ServerRuntime localRuntime = new ServerRuntimeBuilder().dataSource(dataSource).build();
@@ -74,6 +76,7 @@ public class ServerRuntimeBuilder_InAction_IT extends ServerCase {
         }
     }
 
+    @Test
     public void testConfigFree_WithDBParams() {
 
         ServerRuntime localRuntime = new ServerRuntimeBuilder().jdbcDriver(dsi.getJdbcDriver())

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java b/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java
index 23c031f..02622d3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/conn/PoolManagerIT.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.conn;
 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.sql.Connection;
 
@@ -31,6 +32,7 @@ public class PoolManagerIT extends ServerCase {
     @Inject
     private DataSourceInfo dataSourceInfo;
 
+    @Test
     public void testDataSourceUrl() throws Exception {
         String driverName = dataSourceInfo.getJdbcDriver();
         String url = dataSourceInfo.getDataSourceUrl();
@@ -45,6 +47,7 @@ public class PoolManagerIT extends ServerCase {
         assertEquals(driverName, pm.getJdbcDriver());
     }
 
+    @Test
     public void testPassword() throws Exception {
         PoolManager pm = new PoolManager(null, 0, 3, "", "b") {
 
@@ -55,6 +58,7 @@ public class PoolManagerIT extends ServerCase {
         assertEquals("b", pm.getPassword());
     }
 
+    @Test
     public void testUserName() throws Exception {
         PoolManager pm = new PoolManager(null, 0, 3, "a", "") {
 
@@ -65,6 +69,7 @@ public class PoolManagerIT extends ServerCase {
         assertEquals("a", pm.getUserName());
     }
 
+    @Test
     public void testMinConnections() throws Exception {
         PoolManager pm = new PoolManager(null, 0, 3, "", "") {
 
@@ -75,6 +80,7 @@ public class PoolManagerIT extends ServerCase {
         assertEquals(0, pm.getMinConnections());
     }
 
+    @Test
     public void testMaxConnections() throws Exception {
         PoolManager pm = new PoolManager(null, 0, 3, "", "") {
 
@@ -85,6 +91,7 @@ public class PoolManagerIT extends ServerCase {
         assertEquals(3, pm.getMaxConnections());
     }
 
+    @Test
     public void testPooling() throws Exception {
 
         PoolManager pm = new PoolManager(dataSourceInfo.getJdbcDriver(), dataSourceInfo

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
index f0918cb..623e603 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.query.SQLTemplate;
 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 static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -38,6 +39,7 @@ public class AutoAdapterIT extends ServerCase {
     @Inject
     private DataNode dataNode;
 
+    @Test
     public void testGetAdapter_Proxy() throws Exception {
         Provider<DbAdapter> adapterProvider = mock(Provider.class);
         when(adapterProvider.get()).thenReturn(dataNode.getAdapter());
@@ -47,6 +49,7 @@ public class AutoAdapterIT extends ServerCase {
         assertSame(dataNode.getAdapter(), detected);
     }
 
+    @Test
     public void testCreateSQLTemplateAction() {
 
         Provider<DbAdapter> adapterProvider = mock(Provider.class);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
index eae7470..646e192 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.testdo.qualified.Qualified1;
 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.Comparator;
@@ -46,6 +47,7 @@ public class ConcurrentPkGeneratorIT extends ServerCase {
     /*
      * Attempts to discover any problems regarding thread locking in the PkGenerator
      */
+    @Test
     public void testConcurrentInserts() throws Exception {
 		final DataMap dataMap = runtime.getDataDomain().getDataMap("qualified");
 		

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java
index eba8631..21ca79c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcAdapterIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbKeyGenerator;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Types;
 
@@ -40,6 +41,7 @@ public class JdbcAdapterIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testExternalTypesForJdbcType() throws Exception {
         // check a few types
         checkType(Types.BLOB);
@@ -59,6 +61,7 @@ public class JdbcAdapterIT extends ServerCase {
         assertEquals(TypesMapping.getSqlNameByType(type), types[0]);
     }
 
+    @Test
     public void testCreateTableQuoteSqlIdentifiers() {
 
         if (dbAdapter instanceof MySQLAdapter) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
index 8113a15..dd56f0b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.di.server.SchemaBuilder;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.Collections;
 
@@ -61,6 +62,7 @@ public class JdbcPkGeneratorIT extends ServerCase {
         }
     }
 
+    @Test
     public void testLongPk() throws Exception {
 
         if (!JdbcPkGenerator.class.isAssignableFrom(adapter.getPkGenerator().getClass())) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
index 81c92f8..63e3d91 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/PkGeneratorIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.map.DbEntity;
 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.util.ArrayList;
 import java.util.List;
@@ -53,6 +54,7 @@ public class PkGeneratorIT extends ServerCase {
         pkGenerator.reset();
     }
 
+    @Test
     public void testGeneratePkForDbEntity() throws Exception {
         List<Object> pkList = new ArrayList<Object>();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
index e10d0f1..f3163ff 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.MockSerializable;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
+import org.junit.Test;
 
 import java.math.BigInteger;
 import java.sql.Connection;
@@ -38,6 +39,7 @@ public class TypesMappingIT extends ServerCase {
     @Inject
     private ServerCaseDataSourceFactory dataSourceFactory;
 
+    @Test
     public void testGetSqlTypeByJava() throws Exception {
         assertEquals(Types.VARCHAR, TypesMapping.getSqlTypeByJava(String.class));
 
@@ -58,6 +60,7 @@ public class TypesMappingIT extends ServerCase {
         assertEquals(Types.VARBINARY, TypesMapping.getSqlTypeByJava(Byte[].class));
     }
 
+    @Test
     public void testGetSqlTypeByJavaString() throws Exception {
         assertEquals(Types.VARCHAR, TypesMapping.getSqlTypeByJava(String.class.getName()));
 
@@ -85,11 +88,13 @@ public class TypesMappingIT extends ServerCase {
         assertEquals(Types.VARBINARY, TypesMapping.getSqlTypeByJava("java.lang.Byte[]"));
     }
 
+    @Test
     public void testGetSqlTypeByJavaPrimitive() throws Exception {
         assertEquals(Types.INTEGER, TypesMapping.getSqlTypeByJava(Integer.TYPE));
         assertEquals(Types.BIGINT, TypesMapping.getSqlTypeByJava(Long.TYPE));
     }
 
+    @Test
     public void testTypeInfoCompleteness() throws Exception {
         // check counts
         // since more then 1 database type can map to a single JDBC type

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java
index 9fa1f1e..414a28b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java
@@ -25,6 +25,7 @@ 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;
 
@@ -34,6 +35,7 @@ public class HSQLDBAdapterIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testCreateTableIgnoresDoublePrecision() {
         HSQLDBAdapter adapter = objectFactory.newInstance(
                 HSQLDBAdapter.class, 
@@ -51,7 +53,8 @@ public class HSQLDBAdapterIT extends ServerCase {
         assertTrue(sql.indexOf("DOUBLE") > 0);
         assertEquals(-1, sql.indexOf("DOUBLE(22)"));
     }
-    
+
+    @Test
     public void testCreateTableAddsCachedKeyword() {
         HSQLDBAdapter adapter = objectFactory.newInstance(
                 HSQLDBAdapter.class, 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java
index f80c90b..908a030 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/mysql/MySQLAdapterIT.java
@@ -25,6 +25,7 @@ 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;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class MySQLAdapterIT extends ServerCase {
@@ -32,6 +33,7 @@ public class MySQLAdapterIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testCreateTableAppendPKClause() {
         MySQLAdapter adapter = objectFactory.newInstance(
                 MySQLAdapter.class, 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java
index ff02f16..cfa295e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/Oracle8AdapterIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.di.AdhocObjectFactory;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.net.URL;
 import java.sql.Types;
@@ -33,6 +34,7 @@ public class Oracle8AdapterIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testTimestampMapping() throws Exception {
         
         Oracle8Adapter adapter = objectFactory.newInstance(
@@ -45,6 +47,7 @@ public class Oracle8AdapterIT extends ServerCase {
         assertEquals("DATE", types[0]);
     }
 
+    @Test
     public void testFindAdapterResource() throws Exception {
         
         Oracle8Adapter adapter = objectFactory.newInstance(

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java
index c471daa..edcde29 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.query.InsertBatchQuery;
 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 OracleAdapterIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testUpdatesLOBColumns() throws Exception {
         DataMap map = runtime.getDataDomain().getDataMap("tstmap");
         assertTrue(OracleAdapter.updatesLOBColumns(new InsertBatchQuery(map
@@ -48,6 +50,7 @@ public class OracleAdapterIT extends ServerCase {
                 .getDbEntity("ARTIST"), 1)));
     }
 
+    @Test
     public void testTimestampMapping() throws Exception {
         
         OracleAdapter adapter = objectFactory.newInstance(

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
index 9000f76..603944b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbKeyGenerator;
 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 OraclePkGeneratorIT extends ServerCase {
@@ -44,11 +45,13 @@ public class OraclePkGeneratorIT extends ServerCase {
         pkGenerator = new OraclePkGenerator(adapter);
     }
 
+    @Test
     public void testSequenceNameDefault() throws Exception {
         DbEntity entity = new DbEntity("TEST_ENTITY");
         assertEquals("pk_test_entity", pkGenerator.sequenceName(entity));
     }
 
+    @Test
     public void testSequenceNameCustom1() throws Exception {
         DbEntity entity = new DbEntity("TEST_ENTITY");
         DbKeyGenerator customGenerator = new DbKeyGenerator();
@@ -58,6 +61,7 @@ public class OraclePkGeneratorIT extends ServerCase {
         assertEquals("custom_generator", pkGenerator.sequenceName(entity));
     }
 
+    @Test
     public void testSequenceNameCustom2() throws Exception {
         DbEntity entity = new DbEntity("TEST_ENTITY");
         DbKeyGenerator customGenerator = new DbKeyGenerator();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java
index ea00534..adada5b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterIT.java
@@ -24,6 +24,7 @@ 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;
 
@@ -32,7 +33,8 @@ public class PostgresAdapterIT extends ServerCase {
     
     @Inject
     private AdhocObjectFactory objectFactory;
-    
+
+    @Test
     public void testCreateTableWithFloatAttributeWithScale () {
         PostgresAdapter adapter = objectFactory.newInstance(
                 PostgresAdapter.class, 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java
index 7fbbb51..198b2b1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapterIT.java
@@ -24,6 +24,7 @@ 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;
 
@@ -32,7 +33,8 @@ public class SQLServerAdapterIT extends ServerCase {
     
     @Inject
     private AdhocObjectFactory objectFactory;
-    
+
+    @Test
     public void testCreateTableWithFloatAttributeWithScale () {
         SQLServerAdapter adapter = objectFactory.newInstance(
                 SQLServerAdapter.class, 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
index 7fa3a0a..fc27cf9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.unit.UnitDbAdapter;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -43,6 +44,7 @@ public class SQLServerSnifferIT extends ServerCase {
     @Inject
     private AdhocObjectFactory objectFactory;
 
+    @Test
     public void testCreateAdapter() throws Exception {
 
         SQLServerSniffer sniffer = new SQLServerSniffer(objectFactory);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java
index e86d4bc..1a6ecac 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.EntityResolver;
 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 EJBQLCompiledExpressionIT extends ServerCase {
@@ -30,6 +31,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
     @Inject
     protected ServerRuntime runtime;
 
+    @Test
     public void testGetSource() {
         String source = "select a from Artist a";
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -39,6 +41,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
         assertEquals(source, select.getSource());
     }
 
+    @Test
     public void testGetExpression() {
         String source = "select a from Artist a";
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
@@ -48,6 +51,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
         assertNotNull(select.getExpression());
     }
 
+    @Test
     public void testGetEntityDescriptor() {
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
         EJBQLParser parser = EJBQLParserFactory.getParser();
@@ -71,6 +75,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
                 .getEntityDescriptor("p.toArtist"));
     }
 
+    @Test
     public void testGetRootDescriptor() {
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
         EJBQLParser parser = EJBQLParserFactory.getParser();
@@ -83,6 +88,7 @@ public class EJBQLCompiledExpressionIT extends ServerCase {
                 .getClassDescriptor("Artist"), select.getRootDescriptor());
     }
 
+    @Test
     public void testGetEntityDescriptorCaseSensitivity() {
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
         EJBQLParser parser = EJBQLParserFactory.getParser();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java
index b8aab38..917a18a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactory_InContextIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,6 +39,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 	@Inject
 	private ObjectContext context;
 
+    @Test
 	public void testExpressionOfBadType() throws Exception {
 
 		// non existing type
@@ -51,6 +53,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		}
 	}
 
+    @Test
 	public void testBetweenExp() throws Exception {
 		Object v1 = new Object();
 		Object v2 = new Object();
@@ -61,6 +64,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.OBJ_PATH, path.getType());
 	}
 
+    @Test
 	public void testBetweenDbExp() throws Exception {
 		Object v1 = new Object();
 		Object v2 = new Object();
@@ -71,6 +75,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.DB_PATH, path.getType());
 	}
 
+    @Test
 	public void testNotBetweenExp() throws Exception {
 		Object v1 = new Object();
 		Object v2 = new Object();
@@ -81,6 +86,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.OBJ_PATH, path.getType());
 	}
 
+    @Test
 	public void testNotBetweenDbExp() throws Exception {
 		Object v1 = new Object();
 		Object v2 = new Object();
@@ -91,12 +97,14 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.DB_PATH, path.getType());
 	}
 
+    @Test
 	public void testGreaterExp() throws Exception {
 		Object v = new Object();
 		Expression exp = ExpressionFactory.greaterExp("abc", v);
 		assertEquals(Expression.GREATER_THAN, exp.getType());
 	}
 
+    @Test
 	public void testGreaterDbExp() throws Exception {
 		Object v = new Object();
 		Expression exp = ExpressionFactory.greaterDbExp("abc", v);
@@ -106,12 +114,14 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.DB_PATH, path.getType());
 	}
 
+    @Test
 	public void testGreaterOrEqualExp() throws Exception {
 		Object v = new Object();
 		Expression exp = ExpressionFactory.greaterOrEqualExp("abc", v);
 		assertEquals(Expression.GREATER_THAN_EQUAL_TO, exp.getType());
 	}
 
+    @Test
 	public void testGreaterOrEqualDbExp() throws Exception {
 		Object v = new Object();
 		Expression exp = ExpressionFactory.greaterOrEqualDbExp("abc", v);
@@ -121,12 +131,14 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.DB_PATH, path.getType());
 	}
 
+    @Test
 	public void testLessExp() throws Exception {
 		Object v = new Object();
 		Expression exp = ExpressionFactory.lessExp("abc", v);
 		assertEquals(Expression.LESS_THAN, exp.getType());
 	}
 
+    @Test
 	public void testLessDbExp() throws Exception {
 		Object v = new Object();
 		Expression exp = ExpressionFactory.lessDbExp("abc", v);
@@ -136,6 +148,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.DB_PATH, path.getType());
 	}
 
+    @Test
 	public void testLessOrEqualExp() throws Exception {
 		Object v = new Object();
 		Expression exp = ExpressionFactory.lessOrEqualExp("abc", v);
@@ -145,6 +158,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.OBJ_PATH, path.getType());
 	}
 
+    @Test
 	public void testLessOrEqualDbExp() throws Exception {
 		Object v = new Object();
 		Expression exp = ExpressionFactory.lessOrEqualDbExp("abc", v);
@@ -154,11 +168,13 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.DB_PATH, path.getType());
 	}
 
+    @Test
 	public void testInExp1() throws Exception {
 		Expression exp = ExpressionFactory.inExp("abc", "a", "b");
 		assertEquals(Expression.IN, exp.getType());
 	}
 
+    @Test
 	public void testInExp2() throws Exception {
 		List<Object> v = new ArrayList<Object>();
 		v.add("a");
@@ -167,12 +183,14 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.IN, exp.getType());
 	}
 
+    @Test
 	public void testInExp3() throws Exception {
 		List<Object> v = new ArrayList<Object>();
 		Expression exp = ExpressionFactory.inExp("abc", v);
 		assertEquals(Expression.FALSE, exp.getType());
 	}
 
+    @Test
 	public void testLikeExp() throws Exception {
 		String v = "abc";
 		Expression exp = ExpressionFactory.likeExp("abc", v);
@@ -182,6 +200,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.OBJ_PATH, path.getType());
 	}
 
+    @Test
 	public void testLikeDbExp() throws Exception {
 		String v = "abc";
 		Expression exp = ExpressionFactory.likeDbExp("abc", v);
@@ -191,6 +210,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.DB_PATH, path.getType());
 	}
 
+    @Test
 	public void testLikeExpEscape() throws Exception {
 		String v = "abc";
 		Expression exp = ExpressionFactory.likeExp("=abc", v, '=');
@@ -202,6 +222,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.OBJ_PATH, path.getType());
 	}
 
+    @Test
 	public void testLikeIgnoreCaseExp() throws Exception {
 		String v = "abc";
 		Expression exp = ExpressionFactory.likeIgnoreCaseExp("abc", v);
@@ -212,6 +233,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.OBJ_PATH, path.getType());
 	}
 
+    @Test
 	public void testLikeIgnoreCaseExpEscape() throws Exception {
 		String v = "abc";
 		Expression exp = ExpressionFactory.likeIgnoreCaseExp("=abc", v, '=');
@@ -222,6 +244,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.OBJ_PATH, path.getType());
 	}
 
+    @Test
 	public void testLikeIgnoreCaseDbExp() throws Exception {
 		String v = "abc";
 		Expression exp = ExpressionFactory.likeIgnoreCaseDbExp("abc", v);
@@ -231,6 +254,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertEquals(Expression.DB_PATH, path.getType());
 	}
 
+    @Test
 	public void testNotLikeIgnoreCaseExp() throws Exception {
 		String v = "abc";
 		Expression exp = ExpressionFactory.notLikeIgnoreCaseExp("abc", v);
@@ -238,6 +262,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 	}
 
 	// testing CAY-941 bug
+    @Test
 	public void testLikeExpNull() throws Exception {
 		Expression exp = ExpressionFactory.likeExp("abc", null);
 		assertEquals(Expression.LIKE, exp.getType());
@@ -248,6 +273,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 	}
 
 	// CAY-416
+    @Test
 	public void testCollectionMatch() {
 		Artist artist = context.newObject(Artist.class);
 		artist.setArtistName("artist");
@@ -284,6 +310,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertFalse(ExpressionFactory.notInExp("paintingTitle", "p3").match(p3));
 	}
 
+    @Test
 	public void testIn() {
 		Artist a1 = context.newObject(Artist.class);
 		a1.setArtistName("a1");
@@ -298,6 +325,7 @@ public class ExpressionFactory_InContextIT extends ServerCase {
 		assertTrue(in.match(a1));
 	}
 
+    @Test
 	public void testEscapeCharacter() {
 		Artist a1 = context.newObject(Artist.class);
 		a1.setArtistName("A_1");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java
index d75aceb..e8af55b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_InContextIT.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,6 +57,7 @@ public class Expression_InContextIT extends ServerCase {
 		dbHelper.deleteAll("GALLERY");
 	}
 
+    @Test
 	public void testMatch() {
 
 		assertTrue(context instanceof DataContext);
@@ -105,6 +107,7 @@ public class Expression_InContextIT extends ServerCase {
 		assertFalse(ex.match(objects.get(0)));
 	}
 
+    @Test
 	public void testFirst() {
 		List<Painting> paintingList = new ArrayList<Painting>();
 		Painting p1 = context.newObject(Painting.class);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
index af64722..5e4c5cd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.List;
@@ -89,6 +90,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         return context.performQuery(query);
     }
 
+    @Test
     public void testOr() throws Exception {
 
         createTwentyFiveArtists();
@@ -102,6 +104,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(3, execute(Artist.class, parsed).size());
     }
 
+    @Test
     public void testAnd() throws Exception {
         createTwentyFiveArtists();
 
@@ -113,6 +116,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(0, execute(Artist.class, parsed).size());
     }
 
+    @Test
     public void testNot() throws Exception {
 
         createTwentyFiveArtists();
@@ -124,6 +128,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(25 - 1, execute(Artist.class, parsed2).size());
     }
 
+    @Test
     public void testEqual() throws Exception {
 
         createTwentyFiveArtists();
@@ -138,6 +143,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(1, execute(Artist.class, parsed2).size());
     }
 
+    @Test
     public void testNotEqual() throws Exception {
 
         createTwentyFiveArtists();
@@ -149,36 +155,42 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(25 - 1, execute(Artist.class, parsed2).size());
     }
 
+    @Test
     public void testLessThan() throws Exception {
         createTwentyFiveArtistsAndPaintings();
         Expression parsed1 = Expression.fromString("estimatedPrice < 2000.0");
         assertEquals(1, execute(Painting.class, parsed1).size());
     }
 
+    @Test
     public void testLessThanEqualTo() throws Exception {
         createTwentyFiveArtistsAndPaintings();
         Expression parsed1 = Expression.fromString("estimatedPrice <= 2000.0");
         assertEquals(2, execute(Painting.class, parsed1).size());
     }
 
+    @Test
     public void testGreaterThan() throws Exception {
         createTwentyFiveArtistsAndPaintings();
         Expression parsed1 = Expression.fromString("estimatedPrice > 2000");
         assertEquals(25 - 2, execute(Painting.class, parsed1).size());
     }
 
+    @Test
     public void testGreaterThanEqualTo() throws Exception {
         createTwentyFiveArtistsAndPaintings();
         Expression parsed1 = Expression.fromString("estimatedPrice >= 2000");
         assertEquals(25 - 1, execute(Painting.class, parsed1).size());
     }
 
+    @Test
     public void testLike() throws Exception {
         createTwentyFiveArtists();
         Expression parsed1 = Expression.fromString("artistName like 'artist%2'");
         assertEquals(3, execute(Artist.class, parsed1).size());
     }
 
+    @Test
     public void testLikeIgnoreCase() throws Exception {
         createTwentyFiveArtists();
         Expression parsed1 = Expression
@@ -186,12 +198,14 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(3, execute(Artist.class, parsed1).size());
     }
 
+    @Test
     public void testNotLike() throws Exception {
         createTwentyFiveArtists();
         Expression parsed1 = Expression.fromString("artistName not like 'artist%2'");
         assertEquals(25 - 3, execute(Artist.class, parsed1).size());
     }
 
+    @Test
     public void testNotLikeIgnoreCase() throws Exception {
         createTwentyFiveArtists();
         Expression parsed1 = Expression
@@ -199,6 +213,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(25 - 3, execute(Artist.class, parsed1).size());
     }
 
+    @Test
     public void testIn() throws Exception {
         createTwentyFiveArtists();
         Expression parsed1 = Expression
@@ -206,6 +221,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(3, execute(Artist.class, parsed1).size());
     }
 
+    @Test
     public void testNotIn() throws Exception {
         createTwentyFiveArtists();
         Expression parsed1 = Expression
@@ -213,6 +229,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(25 - 3, execute(Artist.class, parsed1).size());
     }
 
+    @Test
     public void testBetween() throws Exception {
         createTwentyFiveArtistsAndPaintings();
         Expression parsed1 = Expression
@@ -220,6 +237,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(3, execute(Painting.class, parsed1).size());
     }
 
+    @Test
     public void testNotBetween() throws Exception {
         createTwentyFiveArtistsAndPaintings();
         Expression parsed1 = Expression
@@ -227,6 +245,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(25 - 3, execute(Painting.class, parsed1).size());
     }
 
+    @Test
     public void testParameter() throws Exception {
         createTwentyFiveArtists();
         Map<String, Object> parameters = new HashMap<String, Object>();
@@ -236,18 +255,21 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(1, execute(Artist.class, parsed1).size());
     }
 
+    @Test
     public void testDbExpression() throws Exception {
         createTwentyFiveArtists();
         Expression parsed1 = Expression.fromString("db:ARTIST_NAME='artist3'");
         assertEquals(1, execute(Artist.class, parsed1).size());
     }
 
+    @Test
     public void testFloatExpression() throws Exception {
         createTwentyFiveArtistsAndPaintings();
         Expression parsed1 = Expression.fromString("estimatedPrice < 2001.01");
         assertEquals(2, execute(Painting.class, parsed1).size());
     }
 
+    @Test
     public void testNullExpression() throws Exception {
         createTwentyFiveArtists();
 
@@ -258,6 +280,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(0, execute(Artist.class, parsed2).size());
     }
 
+    @Test
     public void testTrueExpression() throws Exception {
 
         createTwentyFiveArtistsAndPaintings();
@@ -272,6 +295,7 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
         assertEquals(25, execute(Painting.class, parsed3).size());
     }
 
+    @Test
     public void testFalseExpression() throws Exception {
         createTwentyFiveArtistsAndPaintings();
 


Mime
View raw message