cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1582990 - in /cayenne/main/trunk: ./ cayenne-crypto/ cayenne-server/src/test/java/org/apache/cayenne/ cayenne-server/src/test/java/org/apache/cayenne/access/ cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/ cayenne-server/src...
Date Sat, 29 Mar 2014 11:27:18 GMT
Author: aadamchik
Date: Sat Mar 29 11:27:15 2014
New Revision: 1582990

URL: http://svn.apache.org/r1582990
Log:
full switch to JUnit 4.11 ...

it is mostly backwards compatible, but need to avoid "Test" in names of
non-test classes due to Maven surefire plugin defaults

Added:
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TstSchemaUpdateStrategy.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TestSchemaUpdateStrategy.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstFields.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestFields.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstJavaBean.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestJavaBean.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftDelete.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftDelete.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallback.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallbackTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Tstmap.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Testmap.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallbackTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Tstmap.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Testmap.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TstBean.java
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TestBean.java
    cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml
      - copied, changed from r1582989, cayenne/main/trunk/cayenne-server/src/test/resources/testmap.map.xml
Removed:
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TestSchemaUpdateStrategy.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestFields.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestJavaBean.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallbackTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Testmap.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallbackTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Testmap.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TestBean.java
    cayenne/main/trunk/cayenne-server/src/test/resources/testmap.map.xml
Modified:
    cayenne/main/trunk/cayenne-crypto/pom.xml
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_Test.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/EntityListenerObjEntity.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
    cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml
    cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/cayenne-crypto/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/pom.xml?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/pom.xml (original)
+++ cayenne/main/trunk/cayenne-crypto/pom.xml Sat Mar 29 11:27:15 2014
@@ -33,7 +33,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit4.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectTest.java Sat Mar 29 11:27:15 2014
@@ -30,7 +30,7 @@ import org.apache.cayenne.testdo.testmap
 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.TestBean;
+import org.apache.cayenne.unit.util.TstBean;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class CayenneDataObjectTest extends ServerCase {
@@ -80,14 +80,14 @@ public class CayenneDataObjectTest exten
 
     public void testReadNestedPropertyNonDataObjectPath() {
         CayenneDataObject o1 = new CayenneDataObject();
-        TestBean o2 = new TestBean();
+        TstBean o2 = new TstBean();
         o2.setInteger(new Integer(55));
         o1.writePropertyDirectly("o2", o2);
 
         assertSame(o2, o1.readNestedProperty("o2"));
         assertEquals(new Integer(55), o1.readNestedProperty("o2.integer"));
-        assertEquals(TestBean.class, o1.readNestedProperty("o2.class"));
-        assertEquals(TestBean.class.getName(), o1.readNestedProperty("o2.class.name"));
+        assertEquals(TstBean.class, o1.readNestedProperty("o2.class"));
+        assertEquals(TstBean.class.getName(), o1.readNestedProperty("o2.class.name"));
     }
 
     public void testReadNestedPropertyToManyInMiddle() throws Exception {

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/CayenneTest.java Sat Mar 29 11:27:15 2014
@@ -123,7 +123,7 @@ public class CayenneTest extends ServerC
 
         String sql = "SELECT count(1) AS X FROM ARTIST";
 
-        DataMap map = context.getEntityResolver().getDataMap("testmap");
+        DataMap map = context.getEntityResolver().getDataMap("tstmap");
         SQLTemplate query = new SQLTemplate(map, sql, false);
         query.setTemplate(
                 FrontBaseAdapter.class.getName(),

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java Sat Mar 29 11:27:15 2014
@@ -129,7 +129,7 @@ public class DataContextSQLTemplateTest 
                 + "GROUP BY t0.ARTIST_ID, t0.ARTIST_NAME, t0.DATE_OF_BIRTH "
                 + "ORDER BY t0.ARTIST_ID";
 
-        DataMap map = context.getEntityResolver().getDataMap("testmap");
+        DataMap map = context.getEntityResolver().getDataMap("tstmap");
         SQLTemplate query = new SQLTemplate(map, sql, false);
         query.setColumnNamesCapitalization(CapsStrategy.UPPER);
 
@@ -168,7 +168,7 @@ public class DataContextSQLTemplateTest 
         createFourArtists();
         
         SQLTemplate query = new SQLTemplate("SELECT * FROM ARTIST", true);
-        query.setDataNodeName("testmap");
+        query.setDataNodeName("tstmap");
         assertEquals(4, context.performQuery(query).size());
     }
     
@@ -183,7 +183,7 @@ public class DataContextSQLTemplateTest 
 
         String sql = "SELECT count(1) AS X FROM ARTIST";
 
-        DataMap map = context.getEntityResolver().getDataMap("testmap");
+        DataMap map = context.getEntityResolver().getDataMap("tstmap");
         SQLTemplate query = new SQLTemplate(map, sql, false);
         query.setTemplate(
                 FrontBaseAdapter.class.getName(),
@@ -210,7 +210,7 @@ public class DataContextSQLTemplateTest 
 
         String sql = "SELECT count(1) AS X, 77 AS Y FROM ARTIST";
 
-        DataMap map = context.getEntityResolver().getDataMap("testmap");
+        DataMap map = context.getEntityResolver().getDataMap("tstmap");
         SQLTemplate query = new SQLTemplate(map, sql, false);
         query.setTemplate(
                 FrontBaseAdapter.class.getName(),

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java Sat Mar 29 11:27:15 2014
@@ -46,7 +46,7 @@ public class DbGeneratorTest extends Ser
     protected void setUpAfterInjection() throws Exception {
         generator = new DbGenerator(adapter, runtime
                 .getDataDomain()
-                .getDataMap("testmap"), logger);
+                .getDataMap("tstmap"), logger);
     }
 
     public void testAdapter() throws Exception {
@@ -54,7 +54,7 @@ public class DbGeneratorTest extends Ser
     }
 
     public void testPkFilteringLogic() throws Exception {
-        DataMap map = runtime.getDataDomain().getDataMap("testmap");
+        DataMap map = runtime.getDataDomain().getDataMap("tstmap");
         DbEntity artistExhibit = map.getDbEntity("ARTIST_EXHIBIT");
         DbEntity exhibit = map.getDbEntity("EXHIBIT");
 

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/SchemaUpdateStrategyTest.java Sat Mar 29 11:27:15 2014
@@ -169,10 +169,10 @@ public class SchemaUpdateStrategyTest ex
         DataMap map = node.getEntityResolver().getDataMap("sus-map");
         DataNode dataNode = createDataNode(map);
 
-        setStrategy(TestSchemaUpdateStrategy.class.getName(), dataNode);
+        setStrategy(TstSchemaUpdateStrategy.class.getName(), dataNode);
 
         dataNode.performQueries(Collections.singletonList((Query) query), observer);
-        assertTrue(dataNode.getSchemaUpdateStrategy() instanceof TestSchemaUpdateStrategy);
+        assertTrue(dataNode.getSchemaUpdateStrategy() instanceof TstSchemaUpdateStrategy);
     }
 
     private void withOneTableForThrowOnPartialAndMixStrategy(String strategy) {

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TstSchemaUpdateStrategy.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TestSchemaUpdateStrategy.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TstSchemaUpdateStrategy.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TstSchemaUpdateStrategy.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TestSchemaUpdateStrategy.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TestSchemaUpdateStrategy.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/TstSchemaUpdateStrategy.java Sat Mar 29 11:27:15 2014
@@ -21,9 +21,9 @@ package org.apache.cayenne.access.dbsync
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy;
 
-public class TestSchemaUpdateStrategy implements SchemaUpdateStrategy {
+public class TstSchemaUpdateStrategy implements SchemaUpdateStrategy {
 
-    public TestSchemaUpdateStrategy() {
+    public TstSchemaUpdateStrategy() {
     }
 
     public void updateSchema(DataNode dataNode) {

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java Sat Mar 29 11:27:15 2014
@@ -40,7 +40,7 @@ import org.apache.cayenne.query.DeleteBa
 import org.apache.cayenne.query.SQLTemplate;
 import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.test.parallel.ParallelTestContainer;
-import org.apache.cayenne.testdo.locking.SoftTest;
+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;
@@ -53,7 +53,7 @@ public class SoftDeleteBatchTranslatorTe
 
     @Inject
     protected DbAdapter adapter;
-    
+
     @Inject
     private DataNode dataNode;
 
@@ -73,22 +73,21 @@ public class SoftDeleteBatchTranslatorTe
     }
 
     public void testCreateSqlString() throws Exception {
-        DbEntity entity = context.getEntityResolver().getObjEntity(SoftTest.class).getDbEntity();
+        DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
 
-        List<DbAttribute> idAttributes = Collections.singletonList(entity.getAttribute("SOFT_TEST_ID"));
+        List<DbAttribute> idAttributes = Collections.singletonList(entity.getAttribute("ID"));
 
         DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity, idAttributes, Collections.<String> emptySet(), 1);
         DeleteBatchTranslator builder = createTranslator(deleteQuery);
         String generatedSql = builder.getSql();
         assertNotNull(generatedSql);
-        assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE SOFT_TEST_ID = ?", generatedSql);
+        assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE ID = ?", generatedSql);
     }
 
     public void testCreateSqlStringWithNulls() throws Exception {
-        DbEntity entity = context.getEntityResolver().getObjEntity(SoftTest.class).getDbEntity();
+        DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
 
-        List<DbAttribute> idAttributes = Arrays
-                .asList(entity.getAttribute("SOFT_TEST_ID"), entity.getAttribute("NAME"));
+        List<DbAttribute> idAttributes = Arrays.asList(entity.getAttribute("ID"), entity.getAttribute("NAME"));
 
         Collection<String> nullAttributes = Collections.singleton("NAME");
 
@@ -96,19 +95,19 @@ public class SoftDeleteBatchTranslatorTe
         DeleteBatchTranslator builder = createTranslator(deleteQuery);
         String generatedSql = builder.getSql();
         assertNotNull(generatedSql);
-        assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE SOFT_TEST_ID = ? AND NAME IS NULL",
-                generatedSql);
+        assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE ID = ? AND NAME IS NULL", generatedSql);
     }
 
     public void testCreateSqlStringWithIdentifiersQuote() throws Exception {
-        DbEntity entity = context.getEntityResolver().getObjEntity(SoftTest.class).getDbEntity();
+        DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
         try {
 
             entity.getDataMap().setQuotingSQLIdentifiers(true);
 
-            List<DbAttribute> idAttributes = Collections.singletonList(entity.getAttribute("SOFT_TEST_ID"));
+            List<DbAttribute> idAttributes = Collections.singletonList(entity.getAttribute("ID"));
 
-            DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity, idAttributes, Collections.<String> emptySet(), 1);
+            DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity, idAttributes, Collections.<String> emptySet(),
+                    1);
             JdbcAdapter adapter = (JdbcAdapter) this.adapter;
             DeleteBatchTranslator builder = createTranslator(deleteQuery, adapter);
             String generatedSql = builder.getSql();
@@ -118,7 +117,7 @@ public class SoftDeleteBatchTranslatorTe
 
             assertNotNull(generatedSql);
             assertEquals("UPDATE " + charStart + entity.getName() + charEnd + " SET " + charStart + "DELETED" + charEnd
-                    + " = ? WHERE " + charStart + "SOFT_TEST_ID" + charEnd + " = ?", generatedSql);
+                    + " = ? WHERE " + charStart + "ID" + charEnd + " = ?", generatedSql);
         } finally {
             entity.getDataMap().setQuotingSQLIdentifiers(false);
         }
@@ -127,18 +126,18 @@ public class SoftDeleteBatchTranslatorTe
 
     public void testUpdate() throws Exception {
 
-        final DbEntity entity = context.getEntityResolver().getObjEntity(SoftTest.class).getDbEntity();
+        final DbEntity entity = context.getEntityResolver().getObjEntity(SoftDelete.class).getDbEntity();
 
         JdbcAdapter adapter = (JdbcAdapter) this.adapter;
         BatchTranslatorFactory oldFactory = dataNode.getBatchTranslatorFactory();
         try {
             dataNode.setBatchTranslatorFactory(new SoftDeleteTranslatorFactory());
 
-            final SoftTest test = context.newObject(SoftTest.class);
+            final SoftDelete test = context.newObject(SoftDelete.class);
             test.setName("SoftDeleteBatchQueryBuilderTest");
             context.commitChanges();
 
-            final SelectQuery query = new SelectQuery(SoftTest.class);
+            final SelectQuery query = new SelectQuery(SoftDelete.class);
 
             new ParallelTestContainer() {
 
@@ -163,13 +162,13 @@ public class SoftDeleteBatchTranslatorTe
                     query.setQualifier(ExpressionFactory.matchExp("name", test.getName()));
                     assertEquals(0, context.performQuery(query).size());
 
-                    SQLTemplate template = new SQLTemplate(entity, "SELECT * FROM SOFT_TEST");
+                    SQLTemplate template = new SQLTemplate(entity, "SELECT * FROM SOFT_DELETE");
                     template.setFetchingDataRows(true);
                     assertEquals(1, context.performQuery(template).size());
                 }
             }.runTest(200);
         } finally {
-            context.performQuery(new SQLTemplate(entity, "DELETE FROM SOFT_TEST"));
+            context.performQuery(new SQLTemplate(entity, "DELETE FROM SOFT_DELETE"));
             dataNode.setBatchTranslatorFactory(oldFactory);
         }
     }

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_Test.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_Test.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder_InAction_Test.java Sat Mar 29 11:27:15 2014
@@ -60,7 +60,7 @@ public class ServerRuntimeBuilder_InActi
         tArtist.insert(33001, "AA1");
         tArtist.insert(33002, "AA2");
 
-        this.dataSource = runtime.getDataSource("testmap");
+        this.dataSource = runtime.getDataSource("tstmap");
     }
 
     public void testConfigFree_WithDataSource() {

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleAdapterTest.java Sat Mar 29 11:27:15 2014
@@ -39,7 +39,7 @@ public class OracleAdapterTest extends S
     private AdhocObjectFactory objectFactory;
 
     public void testUpdatesLOBColumns() throws Exception {
-        DataMap map = runtime.getDataDomain().getDataMap("testmap");
+        DataMap map = runtime.getDataDomain().getDataMap("tstmap");
         assertTrue(OracleAdapter.updatesLOBColumns(new InsertBatchQuery(map
                 .getDbEntity("BLOB_TEST"), 1)));
         assertTrue(OracleAdapter.updatesLOBColumns(new InsertBatchQuery(map

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java Sat Mar 29 11:27:15 2014
@@ -23,7 +23,7 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.cayenne.reflect.TestJavaBean;
+import org.apache.cayenne.reflect.TstJavaBean;
 import org.apache.cayenne.reflect.UnresolvablePathException;
 import org.apache.cayenne.util.Util;
 
@@ -43,15 +43,15 @@ public class PropertyTest extends TestCa
     }
     
     public void testGetFrom() {
-    	TestJavaBean bean = new TestJavaBean();
+    	TstJavaBean bean = new TstJavaBean();
     	bean.setIntField(7);
     	final Property<Integer> INT_FIELD = new Property<Integer>("intField");
     	assertEquals(Integer.valueOf(7), INT_FIELD.getFrom(bean));
     }
     
     public void testGetFromNestedProperty() {
-    	TestJavaBean bean = new TestJavaBean();
-    	TestJavaBean nestedBean = new TestJavaBean();
+    	TstJavaBean bean = new TstJavaBean();
+    	TstJavaBean nestedBean = new TstJavaBean();
     	nestedBean.setIntField(7);
     	bean.setObjectField(nestedBean);
     	final Property<Integer> OBJECT_FIELD_INT_FIELD = new Property<Integer>("objectField.intField");
@@ -59,7 +59,7 @@ public class PropertyTest extends TestCa
     }
     
     public void testGetFromNestedNull() {
-    	TestJavaBean bean = new TestJavaBean();
+    	TstJavaBean bean = new TstJavaBean();
     	bean.setObjectField(null);
     	final Property<Integer> OBJECT_FIELD_INT_FIELD = new Property<Integer>("objectField.intField");
     	try {
@@ -74,37 +74,37 @@ public class PropertyTest extends TestCa
     }
     
     public void testGetFromAll() {
-    	TestJavaBean bean = new TestJavaBean();
+    	TstJavaBean bean = new TstJavaBean();
     	bean.setIntField(7);
     	
-    	TestJavaBean bean2 = new TestJavaBean();
+    	TstJavaBean bean2 = new TstJavaBean();
     	bean2.setIntField(8);
     	
-    	List<TestJavaBean> beans = Arrays.asList(bean, bean2);
+    	List<TstJavaBean> beans = Arrays.asList(bean, bean2);
 
     	final Property<Integer> INT_FIELD = new Property<Integer>("intField");
     	assertEquals(Arrays.asList(7, 8), INT_FIELD.getFromAll(beans));
     }
     
     public void testSetIn() {
-    	TestJavaBean bean = new TestJavaBean();
+    	TstJavaBean bean = new TstJavaBean();
     	final Property<Integer> INT_FIELD = new Property<Integer>("intField");
     	INT_FIELD.setIn(bean, 7);
     	assertEquals(7, bean.getIntField());
     }
     
     public void testSetInNestedProperty() {
-    	TestJavaBean bean = new TestJavaBean();
-    	bean.setObjectField(new TestJavaBean());
+    	TstJavaBean bean = new TstJavaBean();
+    	bean.setObjectField(new TstJavaBean());
     	
     	final Property<Integer> OBJECT_FIELD_INT_FIELD = new Property<Integer>("objectField.intField");
 
     	OBJECT_FIELD_INT_FIELD.setIn(bean, 7);
-    	assertEquals(7, ((TestJavaBean)bean.getObjectField()).getIntField());
+    	assertEquals(7, ((TstJavaBean)bean.getObjectField()).getIntField());
     }
     
     public void testSetInNestedNull() {
-    	TestJavaBean bean = new TestJavaBean();
+    	TstJavaBean bean = new TstJavaBean();
     	bean.setObjectField(null);
     	final Property<Integer> OBJECT_FIELD_INT_FIELD = new Property<Integer>("objectField.intField");
     	try {
@@ -119,9 +119,9 @@ public class PropertyTest extends TestCa
     }
     
     public void testSetInAll() {
-    	TestJavaBean bean = new TestJavaBean();
-    	TestJavaBean bean2 = new TestJavaBean();
-    	List<TestJavaBean> beans = Arrays.asList(bean, bean2);
+    	TstJavaBean bean = new TstJavaBean();
+    	TstJavaBean bean2 = new TstJavaBean();
+    	List<TstJavaBean> beans = Arrays.asList(bean, bean2);
 
     	final Property<Integer> INT_FIELD = new Property<Integer>("intField");
     	INT_FIELD.setInAll(beans, 7);

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTest.java Sat Mar 29 11:27:15 2014
@@ -37,7 +37,7 @@ import org.apache.cayenne.testdo.testmap
 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.TestBean;
+import org.apache.cayenne.unit.util.TstBean;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class ExpressionEvaluateInMemoryTest extends ServerCase {
@@ -95,11 +95,11 @@ public class ExpressionEvaluateInMemoryT
     public void testEvaluateOBJ_PATH_JavaBean() throws Exception {
         ASTObjPath node = new ASTObjPath("property2");
 
-        TestBean b1 = new TestBean();
+        TstBean b1 = new TstBean();
         b1.setProperty2(1);
         assertEquals(new Integer(1), node.evaluate(b1));
 
-        TestBean b2 = new TestBean();
+        TstBean b2 = new TstBean();
         b2.setProperty2(-3);
         assertEquals(new Integer(-3), node.evaluate(b2));
     }

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java Sat Mar 29 11:27:15 2014
@@ -85,7 +85,7 @@ public class MapLoaderLoadTest extends T
 
     public void testLoadTestMap() throws Exception {
         MapLoader mapLoader = new MapLoader();
-        DataMap map = mapLoader.loadDataMap(getMapXml("testmap.map.xml"));
+        DataMap map = mapLoader.loadDataMap(getMapXml("tstmap.map.xml"));
         assertNotNull(map);
 
         // test procedures
@@ -107,7 +107,7 @@ public class MapLoaderLoadTest extends T
         assertNotNull(ent.getSuperClassName());
 
         //text exclude... parameters
-        ObjEntity artistCallbackTestEntity = map.getObjEntity("ArtistCallbackTest");
+        ObjEntity artistCallbackTestEntity = map.getObjEntity("ArtistCallback");
         assertTrue(artistCallbackTestEntity.isExcludingDefaultListeners());
         assertTrue(artistCallbackTestEntity.isExcludingSuperclassListeners());
 
@@ -117,7 +117,7 @@ public class MapLoaderLoadTest extends T
     public void testEncodeAsXML() throws FileNotFoundException {
         // load map
         MapLoader mapLoader = new MapLoader();
-        DataMap map = mapLoader.loadDataMap(getMapXml("testmap.map.xml"));
+        DataMap map = mapLoader.loadDataMap(getMapXml("tstmap.map.xml"));
         assertNotNull(map);
 
         // encode map

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java Sat Mar 29 11:27:15 2014
@@ -83,7 +83,7 @@ public abstract class MergeCase extends 
         // this map can't be safely modified in this test, as it is reset by DI
         // container
         // on every test
-        map = runtime.getDataDomain().getDataMap("testmap");
+        map = runtime.getDataDomain().getDataMap("tstmap");
 
         filterDataMap();
 

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java Sat Mar 29 11:27:15 2014
@@ -26,7 +26,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.apache.cayenne.testdo.testmap.Painting;
-import org.apache.cayenne.unit.util.TestBean;
+import org.apache.cayenne.unit.util.TstBean;
 
 public class OrderingTest extends TestCase {
 
@@ -125,9 +125,9 @@ public class OrderingTest extends TestCa
 
     public void testCompare4() throws Exception {
         // compare on non-persistent property
-        TestBean t1 = new TestBean(1000);
-        TestBean t2 = new TestBean(2000);
-        TestBean t3 = new TestBean(2000);
+        TstBean t1 = new TstBean(1000);
+        TstBean t2 = new TstBean(2000);
+        TstBean t3 = new TstBean(2000);
 
         Ordering ordering = new Ordering("integer", SortOrder.ASCENDING);
         assertTrue(ordering.compare(t1, t2) < 0);
@@ -137,35 +137,35 @@ public class OrderingTest extends TestCa
 
     public void testOrderList2() throws Exception {
         // compare on non-persistent property
-        List<TestBean> list = new ArrayList<TestBean>(3);
+        List<TstBean> list = new ArrayList<TstBean>(3);
 
-        list.add(new TestBean(5));
-        list.add(new TestBean(2));
-        list.add(new TestBean(3));
+        list.add(new TstBean(5));
+        list.add(new TstBean(2));
+        list.add(new TstBean(3));
 
         new Ordering("integer", SortOrder.ASCENDING).orderList(list);
-        assertEquals(2, ((TestBean) list.get(0)).getInteger().intValue());
-        assertEquals(3, ((TestBean) list.get(1)).getInteger().intValue());
-        assertEquals(5, ((TestBean) list.get(2)).getInteger().intValue());
+        assertEquals(2, ((TstBean) list.get(0)).getInteger().intValue());
+        assertEquals(3, ((TstBean) list.get(1)).getInteger().intValue());
+        assertEquals(5, ((TstBean) list.get(2)).getInteger().intValue());
     }
 
     public void testOrderListWithMultipleOrderings2() throws Exception {
         // compare on non-persistent property
-        List<TestBean> list = new ArrayList<TestBean>(6);
+        List<TstBean> list = new ArrayList<TstBean>(6);
 
-        list.add(new TestBean("c", 1));
-        list.add(new TestBean("c", 30));
-        list.add(new TestBean("a", 5));
-        list.add(new TestBean("b", 1));
-        list.add(new TestBean("b", 2));
-        list.add(new TestBean("b", 5));
+        list.add(new TstBean("c", 1));
+        list.add(new TstBean("c", 30));
+        list.add(new TstBean("a", 5));
+        list.add(new TstBean("b", 1));
+        list.add(new TstBean("b", 2));
+        list.add(new TstBean("b", 5));
 
         List<Ordering> orderings = new ArrayList<Ordering>(2);
         orderings.add(new Ordering("string", SortOrder.ASCENDING));
         orderings.add(new Ordering("integer", SortOrder.DESCENDING));
 
         // clone list and then order
-        List<TestBean> orderedList = new ArrayList<TestBean>(list);
+        List<TstBean> orderedList = new ArrayList<TstBean>(list);
         Ordering.orderList(orderedList, orderings);
 
         assertEquals(list.get(2), orderedList.get(0));

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectTest.java Sat Mar 29 11:27:15 2014
@@ -62,7 +62,7 @@ public class SQLSelectTest extends Serve
 
         createArtistsDataSet();
 
-        SQLSelect<DataRow> q1 = SQLSelect.dataRowQuery("testmap", "SELECT * FROM ARTIST");
+        SQLSelect<DataRow> q1 = SQLSelect.dataRowQuery("tstmap", "SELECT * FROM ARTIST");
         assertTrue(q1.isFetchingDataRows());
 
         List<DataRow> result = context.select(q1);

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java Sat Mar 29 11:27:15 2014
@@ -54,14 +54,14 @@ public class SQLTemplateTest extends Ser
     }
 
     public void testSQLTemplateForDataMap() {
-        DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
+        DataMap testDataMap = context.getEntityResolver().getDataMap("tstmap");
         SQLTemplate q1 = new SQLTemplate(testDataMap, "SELECT * FROM ARTIST", true);
         List<DataRow> result = context.performQuery(q1);
         assertEquals(0, result.size());
     }
 
     public void testSQLTemplateForDataMapWithInsert() {
-        DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
+        DataMap testDataMap = context.getEntityResolver().getDataMap("tstmap");
         String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
         SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
         context.performNonSelectingQuery(q1);
@@ -72,7 +72,7 @@ public class SQLTemplateTest extends Ser
     }
 
     public void testSQLTemplateForDataMapWithInsertException() {
-        DataMap testDataMap = context.getEntityResolver().getDataMap("testmap");
+        DataMap testDataMap = context.getEntityResolver().getDataMap("tstmap");
         String sql = "INSERT INTO ARTIST VALUES (15, 'Surikov', null)";
         SQLTemplate q1 = new SQLTemplate(testDataMap, sql, true);
         context.performNonSelectingQuery(q1);

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java Sat Mar 29 11:27:15 2014
@@ -28,14 +28,14 @@ public class BeanAccessorTest extends Te
     public void testByteArrayProperty() {
 
         BeanAccessor accessor = new BeanAccessor(
-                TestJavaBean.class,
+                TstJavaBean.class,
                 "byteArrayField",
                 byte[].class);
 
         byte[] bytes = new byte[] {
                 5, 6, 7
         };
-        TestJavaBean o1 = new TestJavaBean();
+        TstJavaBean o1 = new TstJavaBean();
 
         assertNull(o1.getByteArrayField());
         accessor.setValue(o1, bytes);
@@ -46,11 +46,11 @@ public class BeanAccessorTest extends Te
     public void testStringProperty() {
 
         BeanAccessor accessor = new BeanAccessor(
-                TestJavaBean.class,
+                TstJavaBean.class,
                 "stringField",
                 String.class);
 
-        TestJavaBean o1 = new TestJavaBean();
+        TstJavaBean o1 = new TstJavaBean();
 
         assertNull(o1.getStringField());
         accessor.setValue(o1, "ABC");
@@ -61,11 +61,11 @@ public class BeanAccessorTest extends Te
     public void testIntProperty() {
 
         BeanAccessor accessor = new BeanAccessor(
-                TestJavaBean.class,
+                TstJavaBean.class,
                 "intField",
                 Integer.TYPE);
 
-        TestJavaBean o1 = new TestJavaBean();
+        TstJavaBean o1 = new TstJavaBean();
 
         assertEquals(0, o1.getIntField());
         accessor.setValue(o1, new Integer(5));

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java Sat Mar 29 11:27:15 2014
@@ -22,28 +22,28 @@ package org.apache.cayenne.reflect;
 import junit.framework.TestCase;
 
 import org.apache.cayenne.reflect.FieldAccessor;
-import org.apache.cayenne.unit.util.TestBean;
+import org.apache.cayenne.unit.util.TstBean;
 
 public class FieldAccessorTest extends TestCase {
 
     public void testConstructor() {
-        FieldAccessor accessor = new FieldAccessor(TestBean.class, "string", String.class);
+        FieldAccessor accessor = new FieldAccessor(TstBean.class, "string", String.class);
         assertEquals("string", accessor.getName());
     }
 
     public void testGet() {
-        FieldAccessor accessor = new FieldAccessor(TestBean.class, "string", String.class);
+        FieldAccessor accessor = new FieldAccessor(TstBean.class, "string", String.class);
 
-        TestBean object = new TestBean();
+        TstBean object = new TstBean();
         object.setString("abc");
         assertEquals("abc", accessor.getValue(object));
     }
 
     public void testSetValue() {
-        TestFields object = new TestFields();
+        TstFields object = new TstFields();
 
         // string
-        new FieldAccessor(TestFields.class, "stringField", String.class).setValue(
+        new FieldAccessor(TstFields.class, "stringField", String.class).setValue(
                 object,
                 "aaa");
         assertEquals("aaa", object.stringField);
@@ -52,7 +52,7 @@ public class FieldAccessorTest extends T
         byte[] bytes = new byte[] {
                 1, 2, 3
         };
-        new FieldAccessor(TestFields.class, "byteArrayField", byte[].class).setValue(
+        new FieldAccessor(TstFields.class, "byteArrayField", byte[].class).setValue(
                 object,
                 bytes);
         assertSame(bytes, object.byteArrayField);
@@ -61,24 +61,24 @@ public class FieldAccessorTest extends T
         String[] strings = new String[] {
                 "a", "b"
         };
-        new FieldAccessor(TestFields.class, "stringArrayField", String[].class).setValue(
+        new FieldAccessor(TstFields.class, "stringArrayField", String[].class).setValue(
                 object,
                 strings);
         assertSame(strings, object.stringArrayField);
     }
 
     public void testSetValuePrimitive() {
-        TestFields object = new TestFields();
+        TstFields object = new TstFields();
 
         // primitive int .. write non-null
-        new FieldAccessor(TestFields.class, "intField", Integer.TYPE).setValue(
+        new FieldAccessor(TstFields.class, "intField", Integer.TYPE).setValue(
                 object,
                 new Integer(6));
         assertEquals(6, object.intField);
 
         // primitive int .. write null
         object.intField = 55;
-        new FieldAccessor(TestFields.class, "intField", Integer.TYPE).setValue(
+        new FieldAccessor(TstFields.class, "intField", Integer.TYPE).setValue(
                 object,
                 null);
 

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java Sat Mar 29 11:27:15 2014
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.mock;
 import junit.framework.TestCase;
 
 import org.apache.cayenne.map.ObjAttribute;
-import org.apache.cayenne.unit.util.TestBean;
+import org.apache.cayenne.unit.util.TstBean;
 
 public class PersistentDescriptorTest extends TestCase {
 
@@ -41,17 +41,17 @@ public class PersistentDescriptorTest ex
         PersistentDescriptor d1 = new PersistentDescriptor();
 
         ObjAttribute attribute = mock(ObjAttribute.class);
-        FieldAccessor accessor = new FieldAccessor(TestBean.class, "string",
+        FieldAccessor accessor = new FieldAccessor(TstBean.class, "string",
                 String.class);
         PropertyDescriptor property = new SimpleAttributeProperty(d1, accessor,
                 attribute);
 
         d1.addDeclaredProperty(property);
 
-        TestBean from = new TestBean();
+        TstBean from = new TstBean();
         from.setString("123");
 
-        TestBean to = new TestBean();
+        TstBean to = new TstBean();
 
         d1.shallowMerge(from, to);
         assertEquals("123", to.getString());

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java Sat Mar 29 11:27:15 2014
@@ -40,14 +40,14 @@ public class PropertyUtilsTest extends T
     public void testCreateAccessor() {
 
         Accessor accessor = PropertyUtils.createAccessor(
-                TestJavaBean.class,
+                TstJavaBean.class,
                 "byteArrayField");
         assertNotNull(accessor);
 
-        TestJavaBean o1 = createBean();
+        TstJavaBean o1 = createBean();
         assertSame(o1.getByteArrayField(), accessor.getValue(o1));
 
-        TestJavaBean o2 = new TestJavaBean();
+        TstJavaBean o2 = new TstJavaBean();
         assertNull(o2.getByteArrayField());
         accessor.setValue(o2, o1.getByteArrayField());
         assertNotNull(o2.getByteArrayField());
@@ -57,19 +57,19 @@ public class PropertyUtilsTest extends T
     public void testCreateAccessorNested() {
 
         Accessor accessor = PropertyUtils.createAccessor(
-                TestJavaBean.class,
+                TstJavaBean.class,
                 "related.byteArrayField");
         assertNotNull(accessor);
 
-        TestJavaBean o1 = createBean();
-        o1.setRelated(new TestJavaBean());
+        TstJavaBean o1 = createBean();
+        o1.setRelated(new TstJavaBean());
         o1.getRelated().setByteArrayField(new byte[] {
                 3, 4, 5
         });
         assertSame(o1.getRelated().getByteArrayField(), accessor.getValue(o1));
 
-        TestJavaBean o2 = new TestJavaBean();
-        o2.setRelated(new TestJavaBean());
+        TstJavaBean o2 = new TstJavaBean();
+        o2.setRelated(new TstJavaBean());
 
         byte[] b1 = new byte[] {
                 6, 7, 8
@@ -79,7 +79,7 @@ public class PropertyUtilsTest extends T
     }
 
     public void testGetProperty() {
-        TestJavaBean o1 = createBean();
+        TstJavaBean o1 = createBean();
 
         assertSame(o1.getByteArrayField(), PropertyUtils
                 .getProperty(o1, "byteArrayField"));
@@ -96,8 +96,8 @@ public class PropertyUtilsTest extends T
     }
 
     public void testSetProperty() {
-        TestJavaBean o1 = createBean();
-        TestJavaBean o2 = new TestJavaBean();
+        TstJavaBean o1 = createBean();
+        TstJavaBean o2 = new TstJavaBean();
 
         PropertyUtils.setProperty(o2, "byteArrayField", o1.getByteArrayField());
         PropertyUtils.setProperty(o2, "integerField", o1.getIntegerField());
@@ -139,7 +139,7 @@ public class PropertyUtilsTest extends T
     }
 
     public void testSetConverted() {
-        TestJavaBean o1 = new TestJavaBean();
+        TstJavaBean o1 = new TstJavaBean();
 
         // Object -> String
         Object object = new Object();
@@ -230,7 +230,7 @@ public class PropertyUtilsTest extends T
                 }
             });
 
-            TestJavaBean o1 = new TestJavaBean();
+            TstJavaBean o1 = new TstJavaBean();
 
             // String to date
             PropertyUtils.setProperty(o1, "dateField", "2013-08-01");
@@ -245,7 +245,7 @@ public class PropertyUtilsTest extends T
     }
     
     public void testSetNull() {
-        TestJavaBean o1 = new TestJavaBean();
+        TstJavaBean o1 = new TstJavaBean();
 
         o1.setStringField("xyz");
         PropertyUtils.setProperty(o1, "stringField", null);
@@ -292,8 +292,8 @@ public class PropertyUtilsTest extends T
         assertEquals(445, o1.getNumber());
     }
 
-    protected TestJavaBean createBean() {
-        TestJavaBean o1 = new TestJavaBean();
+    protected TstJavaBean createBean() {
+        TstJavaBean o1 = new TstJavaBean();
         o1.setByteArrayField(new byte[] {
                 1, 2, 3
         });

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstFields.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestFields.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstFields.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstFields.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestFields.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestFields.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstFields.java Sat Mar 29 11:27:15 2014
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.reflect;
 
-public class TestFields {
+public class TstFields {
 
     protected String stringField;
     protected int intField;

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstJavaBean.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestJavaBean.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstJavaBean.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstJavaBean.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestJavaBean.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TestJavaBean.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/reflect/TstJavaBean.java Sat Mar 29 11:27:15 2014
@@ -24,7 +24,7 @@ import java.util.Date;
 
 import org.apache.cayenne.util.ToStringBuilder;
 
-public class TestJavaBean extends Object {
+public class TstJavaBean extends Object {
 
     protected String stringField;
     protected byte byteField;
@@ -38,7 +38,7 @@ public class TestJavaBean extends Object
     protected Number numberField;
     protected byte[] byteArrayField;
     protected Object objectField;
-    protected TestJavaBean related;
+    protected TstJavaBean related;
     protected Date dateField;
     protected Timestamp timestampField;
     protected StringBuilder stringBuilderField;
@@ -102,12 +102,12 @@ public class TestJavaBean extends Object
     }
 
     
-    public TestJavaBean getRelated() {
+    public TstJavaBean getRelated() {
         return related;
     }
 
     
-    public void setRelated(TestJavaBean related) {
+    public void setRelated(TstJavaBean related) {
         this.related = related;
     }
 

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftDelete.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftDelete.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftDelete.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftTest.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/SoftDelete.java Sat Mar 29 11:27:15 2014
@@ -18,9 +18,9 @@
  ****************************************************************/
 package org.apache.cayenne.testdo.locking;
 
-import org.apache.cayenne.testdo.locking.auto._SoftTest;
+import org.apache.cayenne.testdo.locking.auto._SoftDelete;
 
-public class SoftTest extends _SoftTest {
+public class SoftDelete extends _SoftDelete {
 
     @Override
     protected void onPrePersist() {

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftDelete.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftDelete.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftDelete.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftDelete.java Sat Mar 29 11:27:15 2014
@@ -8,12 +8,12 @@ import org.apache.cayenne.CayenneDataObj
  * since it may be overwritten next time code is regenerated.
  * If you need to make any customizations, please use subclass.
  */
-public abstract class _SoftTest extends CayenneDataObject {
+public abstract class _SoftDelete extends CayenneDataObject {
 
     public static final String DELETED_PROPERTY = "deleted";
     public static final String NAME_PROPERTY = "name";
 
-    public static final String SOFT_TEST_ID_PK_COLUMN = "SOFT_TEST_ID";
+    public static final String ID_PK_COLUMN = "ID";
 
     public void setDeleted(Boolean deleted) {
         writeProperty(DELETED_PROPERTY, deleted);

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallback.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallbackTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallback.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallback.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallbackTest.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallbackTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/ArtistCallback.java Sat Mar 29 11:27:15 2014
@@ -18,12 +18,12 @@
  ****************************************************************/
 package org.apache.cayenne.testdo.testmap;
 
-import org.apache.cayenne.testdo.testmap.auto._ArtistCallbackTest;
+import org.apache.cayenne.testdo.testmap.auto._ArtistCallback;
 
 /**
  * Class for testing callbacks
  */
-public class ArtistCallbackTest extends _ArtistCallbackTest {
+public class ArtistCallback extends _ArtistCallback {
     private static final long serialVersionUID = 1L; 
     
     public void prePersistEntityObjEntity() {}

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/EntityListenerObjEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/EntityListenerObjEntity.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/EntityListenerObjEntity.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/EntityListenerObjEntity.java Sat Mar 29 11:27:15 2014
@@ -23,12 +23,12 @@ package org.apache.cayenne.testdo.testma
  *
  */
 public class EntityListenerObjEntity {
-    public void prePersistEntityListener(ArtistCallbackTest entity) {}
-    public void postPersistEntityListener(ArtistCallbackTest entity) {}
-    public void preUpdateEntityListener(ArtistCallbackTest entity) {}
-    public void postUpdateEntityListener(ArtistCallbackTest entity) {}
-    public void preRemoveEntityListener(ArtistCallbackTest entity) {}
-    public void postRemoveEntityListener(ArtistCallbackTest entity) {}
-    public void postLoadEntityListener(ArtistCallbackTest entity) {}
+    public void prePersistEntityListener(ArtistCallback entity) {}
+    public void postPersistEntityListener(ArtistCallback entity) {}
+    public void preUpdateEntityListener(ArtistCallback entity) {}
+    public void postUpdateEntityListener(ArtistCallback entity) {}
+    public void preRemoveEntityListener(ArtistCallback entity) {}
+    public void postRemoveEntityListener(ArtistCallback entity) {}
+    public void postLoadEntityListener(ArtistCallback entity) {}
 }
 

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Tstmap.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Testmap.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Tstmap.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Tstmap.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Testmap.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Testmap.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/Tstmap.java Sat Mar 29 11:27:15 2014
@@ -18,17 +18,17 @@
  ****************************************************************/
 package org.apache.cayenne.testdo.testmap;
 
-import org.apache.cayenne.testdo.testmap.auto._Testmap;
+import org.apache.cayenne.testdo.testmap.auto._Tstmap;
 
-public class Testmap extends _Testmap {
+public class Tstmap extends _Tstmap {
 
-    private static Testmap instance;
+    private static Tstmap instance;
 
-    private Testmap() {}
+    private Tstmap() {}
 
-    public static Testmap getInstance() {
+    public static Tstmap getInstance() {
         if(instance == null) {
-            instance = new Testmap();
+            instance = new Tstmap();
         }
 
         return instance;

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallbackTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallbackTest.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallbackTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java Sat Mar 29 11:27:15 2014
@@ -11,7 +11,7 @@ import org.apache.cayenne.exp.Property;
  * since it may be overwritten next time code is regenerated.
  * If you need to make any customizations, please use subclass.
  */
-public abstract class _ArtistCallbackTest extends CayenneDataObject {
+public abstract class _ArtistCallback extends CayenneDataObject {
 
     private static final long serialVersionUID = 1L; 
 

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Tstmap.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Testmap.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Tstmap.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Tstmap.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Testmap.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Testmap.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Tstmap.java Sat Mar 29 11:27:15 2014
@@ -14,7 +14,7 @@ import org.apache.cayenne.testdo.testmap
  * since it may be overwritten next time code is regenerated.
  * If you need to make any customizations, please use subclass.
  */
-public class _Testmap {
+public class _Tstmap {
 
     public static final String EJBQL_QUERY_TEST_QUERYNAME = "EjbqlQueryTest";
 

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java Sat Mar 29 11:27:15 2014
@@ -68,7 +68,7 @@ public class SchemaBuilder {
 
     public static final String SKIP_SCHEMA_KEY = "cayenne.test.schema.skip";
 
-    private static String[] DATA_MAPS_REQUIREING_SCHEMA_SETUP = { "testmap.map.xml", "people.map.xml",
+    private static String[] DATA_MAPS_REQUIREING_SCHEMA_SETUP = { "tstmap.map.xml", "people.map.xml",
             "locking.map.xml", "relationships.map.xml", "relationships1.map.xml", "multi-tier.map.xml", "generic.map.xml", "map-db1.map.xml",
             "map-db2.map.xml", "embeddable.map.xml", "qualified.map.xml", "quoted-identifiers.map.xml",
             "inheritance-single-table1.map.xml", "inheritance-vertical.map.xml", "oneway-rels.map.xml" };

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TstBean.java (from r1582989, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TestBean.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TstBean.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TstBean.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TestBean.java&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TestBean.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/util/TstBean.java Sat Mar 29 11:27:15 2014
@@ -26,7 +26,7 @@ import java.util.Date;
  * A non-persistent Java Bean. Useful for testing Cayenne operations that rely on
  * introspection.
  */
-public class TestBean {
+public class TstBean {
 
     protected Integer integer;
     protected String string;
@@ -34,32 +34,32 @@ public class TestBean {
     protected int property2;
     protected Date dateProperty;
     protected Collection<?> collection;
-    protected TestBean relatedBean;
+    protected TstBean relatedBean;
 
-    public static TestBean testFixtureWithCollection(
+    public static TstBean testFixtureWithCollection(
             String rootBaseName,
             String childBaseName) {
-        TestBean root = new TestBean(rootBaseName, 0);
+        TstBean root = new TstBean(rootBaseName, 0);
 
-        Collection<TestBean> collection = new ArrayList<TestBean>(10);
+        Collection<TstBean> collection = new ArrayList<TstBean>(10);
         for (int i = 0; i < 10; i++) {
-            collection.add(new TestBean(childBaseName + i, i));
+            collection.add(new TstBean(childBaseName + i, i));
         }
 
         root.setCollection(collection);
         return root;
     }
 
-    public TestBean() {
+    public TstBean() {
 
     }
 
-    public TestBean(String string, int intValue) {
+    public TstBean(String string, int intValue) {
         this.string = string;
         this.integer = new Integer(intValue);
     }
 
-    public TestBean(int intValue) {
+    public TstBean(int intValue) {
         integer = new Integer(intValue);
     }
 
@@ -111,11 +111,11 @@ public class TestBean {
         this.dateProperty = dateProperty;
     }
 
-    public TestBean getRelatedBean() {
+    public TstBean getRelatedBean() {
         return relatedBean;
     }
 
-    public void setRelatedBean(TestBean relatedBean) {
+    public void setRelatedBean(TstBean relatedBean) {
         this.relatedBean = relatedBean;
     }
 }

Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml Sat Mar 29 11:27:15 2014
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <domain project-version="6">
-	<map name="testmap"/>
+	<map name="tstmap"/>
 </domain>

Modified: cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml Sat Mar 29 11:27:15 2014
@@ -24,10 +24,10 @@
 		<db-attribute name="LOCKING_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="NAME" type="VARCHAR" length="100"/>
 	</db-entity>
-	<db-entity name="SOFT_TEST">
+	<db-entity name="SOFT_DELETE">
 		<db-attribute name="DELETED" type="BOOLEAN"/>
 		<db-attribute name="NAME" type="VARCHAR" length="100"/>
-		<db-attribute name="SOFT_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<qualifier><![CDATA[DELETED = false]]></qualifier>
 	</db-entity>
 	<db-entity name="TIME_LOCKING_TEST">
@@ -49,7 +49,7 @@
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="DESCRIPTION"/>
 		<obj-attribute name="name" type="java.lang.String" lock="true" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="SoftTest" className="org.apache.cayenne.testdo.locking.SoftTest" dbEntityName="SOFT_TEST">
+	<obj-entity name="SoftDelete" className="org.apache.cayenne.testdo.locking.SoftDelete" dbEntityName="SOFT_DELETE">
 		<obj-attribute name="deleted" type="java.lang.Boolean" db-attribute-path="DELETED"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 		<post-add method-name="onPrePersist"/>

Copied: cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml (from r1582989, cayenne/main/trunk/cayenne-server/src/test/resources/testmap.map.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml?p2=cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml&p1=cayenne/main/trunk/cayenne-server/src/test/resources/testmap.map.xml&r1=1582989&r2=1582990&rev=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/testmap.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml Sat Mar 29 11:27:15 2014
@@ -330,7 +330,7 @@
 		<obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/>
 		<obj-attribute name="dateOfBirth" type="java.util.Date" db-attribute-path="DATE_OF_BIRTH"/>
 	</obj-entity>
-	<obj-entity name="ArtistCallbackTest" className="org.apache.cayenne.testdo.testmap.ArtistCallbackTest" dbEntityName="ARTIST_CT" exclude-superclass-listeners="true" exclude-default-listeners="true">
+	<obj-entity name="ArtistCallback" className="org.apache.cayenne.testdo.testmap.ArtistCallback" dbEntityName="ARTIST_CT" exclude-superclass-listeners="true" exclude-default-listeners="true">
 		<obj-attribute name="artistName" type="java.lang.String"/>
 		<obj-attribute name="dateOfBirth" type="java.util.Date"/>
 		<post-add method-name="prePersistEntityObjEntity"/>

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1582990&r1=1582989&r2=1582990&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Mar 29 11:27:15 2014
@@ -38,10 +38,6 @@
 	<properties>
 		<maven.build.timestamp.format>MMM dd yyyy HH:mm:ss</maven.build.timestamp.format>
 		<project.build.datetime>${maven.build.timestamp}</project.build.datetime>
-		
-		<!-- 2 junit generations will coexist for some time -->
-		<junit3.version>3.8.1</junit3.version>
-		<junit4.version>4.11</junit4.version>
 	</properties>
 
 	<url>http://cayenne.apache.org/</url>
@@ -451,7 +447,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>${junit3.version}</version>
+				<version>4.11</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>



Mime
View raw message