You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/11/25 23:21:28 UTC
svn commit: r479213 [3/8] - in
/incubator/cayenne/main/trunk/core/cayenne-jdk1.4: ./
src/test/java/org/apache/cayenne/ src/test/java/org/apache/cayenne/access/
src/test/java/org/apache/cayenne/access/event/
src/test/java/org/apache/cayenne/access/jdbc/...
Added: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCase.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCase.java?view=auto&rev=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCase.java (added)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCase.java Sat Nov 25 14:20:59 2006
@@ -0,0 +1,133 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+
+package org.apache.cayenne.access;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.Timestamp;
+import java.util.List;
+
+import org.apache.art.Artist;
+import org.apache.art.Painting;
+import org.apache.art.ROArtist;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.unit.CayenneCase;
+
+/**
+ * @author Andrus Adamchik
+ */
+public class DataContextCase extends CayenneCase {
+
+ public static final int artistCount = 25;
+ public static final int galleryCount = 10;
+
+ protected DataContext context;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ deleteTestData();
+ createTestData("testArtists");
+
+ context = createDataContext();
+ }
+
+ protected Painting fetchPainting(String name, boolean prefetchArtist) {
+ SelectQuery select =
+ new SelectQuery(
+ Painting.class,
+ ExpressionFactory.matchExp("paintingTitle", name));
+ if (prefetchArtist) {
+ select.addPrefetch("toArtist");
+ }
+
+ List ats = context.performQuery(select);
+ return (ats.size() > 0) ? (Painting) ats.get(0) : null;
+ }
+
+ protected Artist fetchArtist(String name, boolean prefetchPaintings) {
+ SelectQuery q =
+ new SelectQuery(Artist.class, ExpressionFactory.matchExp("artistName", name));
+ if (prefetchPaintings) {
+ q.addPrefetch("paintingArray");
+ }
+ List ats = context.performQuery(q);
+ return (ats.size() > 0) ? (Artist) ats.get(0) : null;
+ }
+
+ protected ROArtist fetchROArtist(String name) {
+ SelectQuery q =
+ new SelectQuery(
+ ROArtist.class,
+ ExpressionFactory.matchExp("artistName", name));
+ List ats = context.performQuery(q);
+ return (ats.size() > 0) ? (ROArtist) ats.get(0) : null;
+ }
+
+ /**
+ * Temporary workaround for current inability to store dates in test
+ * fixture XML files.
+ */
+ public void populateExhibits() throws Exception {
+ String insertPaint =
+ "INSERT INTO EXHIBIT (EXHIBIT_ID, GALLERY_ID, OPENING_DATE, CLOSING_DATE) VALUES (?, ?, ?, ?)";
+
+ Connection conn = getConnection();
+
+ try {
+ conn.setAutoCommit(false);
+
+ PreparedStatement stmt = conn.prepareStatement(insertPaint);
+ Timestamp now = new Timestamp(System.currentTimeMillis());
+
+ for (int i = 1; i <= 2; i++) {
+ stmt.setInt(1, i);
+ stmt.setInt(2, 33000 + i);
+ stmt.setTimestamp(3, now);
+ stmt.setTimestamp(4, now);
+ stmt.executeUpdate();
+ }
+
+ stmt.close();
+ conn.commit();
+ }
+ finally {
+ conn.close();
+ }
+ }
+
+ /**
+ * Helper method that takes one of the artists from the standard
+ * dataset (always the same one) and creates a new painting for this artist,
+ * committing it to the database. Both Painting and Artist will be cached in current
+ * DataContext.
+ */
+ protected Painting insertPaintingInContext(String paintingName) {
+ Painting painting = (Painting) context.newObject("Painting");
+ painting.setPaintingTitle(paintingName);
+ painting.setToArtist(fetchArtist("artist2", false));
+
+ context.commitChanges();
+
+ return painting;
+ }
+}
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCharPKTest.java Sat Nov 25 14:20:59 2006
@@ -24,12 +24,12 @@
import org.apache.art.CharPkTestEntity;
import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextCharPKTst extends CayenneTestCase {
+public class DataContextCharPKTest extends CayenneCase {
protected DataContext ctxt;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextClobTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextClobTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextClobTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextClobTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextClobTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextClobTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextClobTest.java Sat Nov 25 14:20:59 2006
@@ -23,12 +23,12 @@
import org.apache.art.ClobTestEntity;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextClobTst extends CayenneTestCase {
+public class DataContextClobTest extends CayenneCase {
protected DataContext ctxt;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCommitTest.java Sat Nov 25 14:20:59 2006
@@ -23,9 +23,9 @@
import org.apache.art.Painting;
import org.apache.cayenne.graph.GraphDiff;
import org.apache.cayenne.graph.MockGraphChangeHandler;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
-public class DataContextCommitTst extends CayenneTestCase {
+public class DataContextCommitTest extends CayenneCase {
public void testFlushToParent_Commit() {
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundOETest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundOETst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundOETest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundOETst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundOETest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundOETst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundOETest.java Sat Nov 25 14:20:59 2006
@@ -29,12 +29,12 @@
import org.apache.art.CompoundPainting;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextCompoundOETst extends CayenneTestCase {
+public class DataContextCompoundOETest extends CayenneCase {
final int artistCount = 4;
final int galleryCount = 2;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java Sat Nov 25 14:20:59 2006
@@ -26,14 +26,14 @@
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* Testing relationships with compound keys.
*
* @author Andrus Adamchik
*/
-public class DataContextCompoundRelTst extends CayenneTestCase {
+public class DataContextCompoundRelTest extends CayenneCase {
protected DataContext ctxt;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextCrossDBTest.java Sat Nov 25 14:20:59 2006
@@ -22,9 +22,9 @@
import org.apache.cayenne.testdo.db1.CrossdbM1E1;
import org.apache.cayenne.testdo.db2.CrossdbM2E1;
import org.apache.cayenne.testdo.db2.CrossdbM2E2;
-import org.apache.cayenne.unit.MultiNodeTestCase;
+import org.apache.cayenne.unit.MultiNodeCase;
-public class DataContextCrossDBTst extends MultiNodeTestCase {
+public class DataContextCrossDBTest extends MultiNodeCase {
protected void setUp() throws Exception {
super.setUp();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsTest.java Sat Nov 25 14:20:59 2006
@@ -22,7 +22,7 @@
import org.apache.art.Artist;
import org.apache.cayenne.DataChannelListener;
import org.apache.cayenne.graph.GraphEvent;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
import org.apache.cayenne.unit.util.ThreadedTestHelper;
import org.apache.cayenne.util.EventUtil;
@@ -31,7 +31,7 @@
*
* @author Andrus Adamchik
*/
-public class DataContextDataChannelEventsTst extends CayenneTestCase {
+public class DataContextDataChannelEventsTest extends CayenneCase {
public void testCommitEvent() {
DataContext context = createDataContext();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java Sat Nov 25 14:20:59 2006
@@ -25,9 +25,9 @@
import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.intercept.DataChannelDecorator;
import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
-public class DataContextDecoratedStackTst extends CayenneTestCase {
+public class DataContextDecoratedStackTest extends CayenneCase {
protected void setUp() throws Exception {
deleteTestData();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTest.java Sat Nov 25 14:20:59 2006
@@ -25,13 +25,13 @@
import org.apache.cayenne.DataObject;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.PersistenceState;
-import org.apache.cayenne.unit.MultiContextTestCase;
+import org.apache.cayenne.unit.MultiContextCase;
import org.apache.cayenne.unit.util.ThreadedTestHelper;
/**
* @author Andrus Adamchik
*/
-public class DataContextDelegateSharedCacheTst extends MultiContextTestCase {
+public class DataContextDelegateSharedCacheTest extends MultiContextCase {
protected Artist artist;
protected DataContext context;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java Sat Nov 25 14:20:59 2006
@@ -27,7 +27,7 @@
import org.apache.cayenne.query.MockQuery;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* Tests various DataContextDelegate methods invocation and consequences on DataContext
@@ -35,7 +35,7 @@
*
* @author Andrus Adamchik
*/
-public class DataContextDelegateTst extends CayenneTestCase {
+public class DataContextDelegateTest extends CayenneCase {
protected DataContext context;
protected Gallery gallery;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java Sat Nov 25 14:20:59 2006
@@ -30,12 +30,12 @@
import org.apache.art.PaintingInfo;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
// TODO: redefine all test cases in terms of entities in "relationships" map
// and merge this test case with DeleteRulesTst that inherits
// from RelationshipTestCase.
-public class DataContextDeleteRulesTst extends CayenneTestCase {
+public class DataContextDeleteRulesTest extends CayenneCase {
private DataContext context;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKTest.java Sat Nov 25 14:20:59 2006
@@ -25,12 +25,12 @@
import org.apache.art.MeaningfulPKTest1;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextEntityWithMeaningfulPKTst extends CayenneTestCase {
+public class DataContextEntityWithMeaningfulPKTest extends CayenneCase {
protected DataContext ctxt;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEventsTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEventsTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEventsTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEventsTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEventsTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEventsTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextEventsTest.java Sat Nov 25 14:20:59 2006
@@ -24,13 +24,13 @@
import org.apache.art.oneway.Artist;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.dba.mysql.MySQLAdapter;
-import org.apache.cayenne.unit.OneWayMappingTestCase;
+import org.apache.cayenne.unit.OneWayMappingCase;
/**
* @author Holger Hoffstaette
* @author Andrus Adamchik
*/
-public class DataContextEventsTst extends OneWayMappingTestCase {
+public class DataContextEventsTest extends OneWayMappingCase {
protected DataContext context;
protected Artist artist;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java Sat Nov 25 14:20:59 2006
@@ -39,7 +39,7 @@
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* "Lightweight" test cases for DataContext. These tests do not require any additional
@@ -47,7 +47,7 @@
*
* @author Andrus Adamchik
*/
-public class DataContextExtrasTst extends CayenneTestCase {
+public class DataContextExtrasTest extends CayenneCase {
public void testManualIdProcessingOnCommit() throws Exception {
deleteTestData();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNamedQueryCachingTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNamedQueryCachingTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNamedQueryCachingTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNamedQueryCachingTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNamedQueryCachingTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNamedQueryCachingTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNamedQueryCachingTest.java Sat Nov 25 14:20:59 2006
@@ -27,9 +27,9 @@
import org.apache.cayenne.query.NamedQuery;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
-public class DataContextNamedQueryCachingTst extends CayenneTestCase {
+public class DataContextNamedQueryCachingTest extends CayenneCase {
public void testDataContextSharedCache() throws Exception {
deleteTestData();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNoPkTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNoPkTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNoPkTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNoPkTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNoPkTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNoPkTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextNoPkTest.java Sat Nov 25 14:20:59 2006
@@ -25,9 +25,9 @@
import org.apache.art.NoPkTestEntity;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
-public class DataContextNoPkTst extends CayenneTestCase {
+public class DataContextNoPkTest extends CayenneCase {
protected void setUp() throws Exception {
super.setUp();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java Sat Nov 25 14:20:59 2006
@@ -30,7 +30,7 @@
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.ObjectIdQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* Tests objects registration in DataContext, transferring objects between contexts and
@@ -38,7 +38,7 @@
*
* @author Andrus Adamchik
*/
-public class DataContextObjectTrackingTst extends CayenneTestCase {
+public class DataContextObjectTrackingTest extends CayenneCase {
public void testUnregisterObject() {
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java Sat Nov 25 14:20:59 2006
@@ -30,12 +30,12 @@
import org.apache.art.Painting;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextPerformQueryAPITst extends CayenneTestCase {
+public class DataContextPerformQueryAPITest extends CayenneCase {
protected void setUp() throws Exception {
super.setUp();
@@ -43,8 +43,8 @@
}
public void testObjectQueryStringBoolean() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
- getAccessStack().createTestData(DataContextTestBase.class, "testPaintings", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testPaintings", null);
List paintings = createDataContext().performQuery("ObjectQuery", true);
assertNotNull(paintings);
@@ -52,8 +52,8 @@
}
public void testObjectQueryStringMapBoolean() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
- getAccessStack().createTestData(DataContextTestBase.class, "testPaintings", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testPaintings", null);
// fetch artist
DataContext context = createDataContext();
@@ -79,8 +79,8 @@
return;
}
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
- getAccessStack().createTestData(DataContextTestBase.class, "testPaintings", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testPaintings", null);
// fetch artist
Map parameters = Collections.singletonMap("aName", "artist2");
@@ -163,7 +163,7 @@
}
public void testObjectQueryWithLocalCache() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
DataContext context = createDataContext();
List artists = context.performQuery("QueryWithLocalCache", true);
@@ -181,7 +181,7 @@
}
public void testObjectQueryWithSharedCache() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
DataContext context = createDataContext();
List artists = context.performQuery("QueryWithSharedCache", true);
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasTest.java Sat Nov 25 14:20:59 2006
@@ -33,14 +33,14 @@
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.Ordering;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* Test prefetching of various obscure cases.
*
* @author Andrus Adamchik
*/
-public class DataContextPrefetchExtrasTst extends CayenneTestCase {
+public class DataContextPrefetchExtrasTest extends CayenneCase {
protected DataContext context;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepTest.java Sat Nov 25 14:20:59 2006
@@ -41,7 +41,7 @@
*
* @author Andrus Adamchik
*/
-public class DataContextPrefetchMultistepTst extends DataContextTestBase {
+public class DataContextPrefetchMultistepTest extends DataContextCase {
protected void setUp() throws Exception {
super.setUp();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java Sat Nov 25 14:20:59 2006
@@ -46,7 +46,7 @@
/**
* @author Andrus Adamchik
*/
-public class DataContextPrefetchTst extends DataContextTestBase {
+public class DataContextPrefetchTest extends DataContextCase {
/**
* Test that a to-many relationship is initialized.
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java Sat Nov 25 14:20:59 2006
@@ -35,12 +35,12 @@
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.query.ProcedureQuery;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextProcedureQueryTst extends CayenneTestCase {
+public class DataContextProcedureQueryTest extends CayenneCase {
public static final String UPDATE_STORED_PROCEDURE = "cayenne_tst_upd_proc";
public static final String SELECT_STORED_PROCEDURE = "cayenne_tst_select_proc";
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityTest.java Sat Nov 25 14:20:59 2006
@@ -26,12 +26,12 @@
import org.apache.cayenne.testdo.inherit.CustomerRepresentative;
import org.apache.cayenne.testdo.inherit.Employee;
import org.apache.cayenne.testdo.inherit.Manager;
-import org.apache.cayenne.unit.PeopleTestCase;
+import org.apache.cayenne.unit.PeopleCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextQualifiedEntityTst extends PeopleTestCase {
+public class DataContextQualifiedEntityTest extends PeopleCase {
protected DataContext context;
protected void setUp() throws Exception {
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingOSCacheTest.java Sat Nov 25 14:20:59 2006
@@ -20,13 +20,13 @@
import org.apache.cayenne.cache.OSQueryCacheFactory;
-public class DataContextQueryCachingOSCacheTst extends DataContextQueryCachingTst {
+public class DataContextQueryCachingOSCacheTest extends DataContextQueryCachingTest {
public void testLocalCacheDataObjectsNoRefresh() throws Exception {
runTest(new TestRun() {
public void execute() throws Exception {
- DataContextQueryCachingOSCacheTst.super
+ DataContextQueryCachingOSCacheTest.super
.testLocalCacheDataObjectsNoRefresh();
}
});
@@ -36,7 +36,7 @@
runTest(new TestRun() {
public void execute() throws Exception {
- DataContextQueryCachingOSCacheTst.super
+ DataContextQueryCachingOSCacheTest.super
.testLocalCacheDataObjectsRefresh();
}
});
@@ -46,7 +46,7 @@
runTest(new TestRun() {
public void execute() throws Exception {
- DataContextQueryCachingOSCacheTst.super
+ DataContextQueryCachingOSCacheTest.super
.testLocalCacheDataRowsNoRefresh();
}
});
@@ -56,7 +56,7 @@
runTest(new TestRun() {
public void execute() throws Exception {
- DataContextQueryCachingOSCacheTst.super
+ DataContextQueryCachingOSCacheTest.super
.testLocalCacheDataRowsRefresh();
}
});
@@ -66,7 +66,7 @@
runTest(new TestRun() {
public void execute() throws Exception {
- DataContextQueryCachingOSCacheTst.super
+ DataContextQueryCachingOSCacheTest.super
.testLocalCacheRefreshObjectsRefresh();
}
});
@@ -76,7 +76,7 @@
runTest(new TestRun() {
public void execute() throws Exception {
- DataContextQueryCachingOSCacheTst.super
+ DataContextQueryCachingOSCacheTest.super
.testSharedCacheDataObjectsNoRefresh();
}
});
@@ -86,7 +86,7 @@
runTest(new TestRun() {
public void execute() throws Exception {
- DataContextQueryCachingOSCacheTst.super
+ DataContextQueryCachingOSCacheTest.super
.testSharedCacheDataRowsNoRefresh();
}
});
@@ -96,7 +96,7 @@
runTest(new TestRun() {
public void execute() throws Exception {
- DataContextQueryCachingOSCacheTst.super
+ DataContextQueryCachingOSCacheTest.super
.testSharedCacheDataRowsRefresh();
}
});
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryCachingTest.java Sat Nov 25 14:20:59 2006
@@ -28,12 +28,12 @@
import org.apache.cayenne.query.MockQueryMetadata;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextQueryCachingTst extends CayenneTestCase {
+public class DataContextQueryCachingTest extends CayenneCase {
protected DataContext context;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryChainTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryChainTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryChainTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryChainTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryChainTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryChainTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextQueryChainTest.java Sat Nov 25 14:20:59 2006
@@ -25,9 +25,9 @@
import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.query.QueryChain;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
-public class DataContextQueryChainTst extends CayenneTestCase {
+public class DataContextQueryChainTest extends CayenneCase {
public void testSelectQuery() {
DataContext context = createDataContext();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefetchTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefetchTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefetchTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefetchTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefetchTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefetchTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefetchTest.java Sat Nov 25 14:20:59 2006
@@ -21,12 +21,12 @@
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ObjectId;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextRefetchTst extends CayenneTestCase {
+public class DataContextRefetchTest extends CayenneCase {
public void testRefetchTempId() {
MockDataNode engine = MockDataNode.interceptNode(getDomain(), getNode());
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefreshingTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefreshingTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefreshingTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefreshingTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefreshingTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefreshingTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRefreshingTest.java Sat Nov 25 14:20:59 2006
@@ -38,7 +38,7 @@
*
* @author Andrus Adamchik
*/
-public class DataContextRefreshingTst extends DataContextTestBase {
+public class DataContextRefreshingTest extends DataContextCase {
public void testRefetchRootWithUpdatedAttributes() throws Exception {
String nameBefore = "artist2";
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRollbackTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRollbackTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRollbackTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java Sat Nov 25 14:20:59 2006
@@ -31,7 +31,7 @@
/**
* @author Andrus Adamchik
*/
-public class DataContextRollbackTst extends DataContextTestBase {
+public class DataContextRollbackTest extends DataContextCase {
public void testRollbackNew() {
Artist artist = (Artist) context.newObject("Artist");
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java Sat Nov 25 14:20:59 2006
@@ -25,12 +25,12 @@
import org.apache.art.Artist;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextSQLTemplateTst extends CayenneTestCase {
+public class DataContextSQLTemplateTest extends CayenneCase {
protected DataContext context;
@@ -41,7 +41,7 @@
}
public void testFetchDataRows() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
String template = "SELECT * FROM ARTIST ORDER BY ARTIST_ID";
SQLTemplate query = new SQLTemplate(Artist.class, template);
@@ -51,7 +51,7 @@
query.setFetchingDataRows(true);
List rows = context.performQuery(query);
- assertEquals(DataContextTestBase.artistCount, rows.size());
+ assertEquals(DataContextCase.artistCount, rows.size());
assertTrue(
"Expected DataRow, got this: " + rows.get(1),
rows.get(1) instanceof DataRow);
@@ -62,7 +62,7 @@
}
public void testFetchObjects() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
String template = "SELECT * FROM ARTIST ORDER BY ARTIST_ID";
SQLTemplate query = getSQLTemplateBuilder().createSQLTemplate(
@@ -72,7 +72,7 @@
query.setFetchingDataRows(false);
List objects = context.performQuery(query);
- assertEquals(DataContextTestBase.artistCount, objects.size());
+ assertEquals(DataContextCase.artistCount, objects.size());
assertTrue(objects.get(1) instanceof Artist);
Artist artist2 = (Artist) objects.get(1);
@@ -80,12 +80,12 @@
}
public void testFetchLimit() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
int fetchLimit = 3;
// sanity check
- assertTrue(fetchLimit < DataContextTestBase.artistCount);
+ assertTrue(fetchLimit < DataContextCase.artistCount);
String template = "SELECT * FROM ARTIST ORDER BY ARTIST_ID";
SQLTemplate query = getSQLTemplateBuilder().createSQLTemplate(
Artist.class,
@@ -98,12 +98,12 @@
}
public void testPageSize() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
int pageSize = 3;
// sanity check
- assertTrue(pageSize < DataContextTestBase.artistCount);
+ assertTrue(pageSize < DataContextCase.artistCount);
String template = "SELECT * FROM ARTIST ORDER BY ARTIST_ID";
SQLTemplate query = getSQLTemplateBuilder().createSQLTemplate(
@@ -113,18 +113,18 @@
query.setPageSize(pageSize);
List objects = context.performQuery(query);
- assertEquals(DataContextTestBase.artistCount, objects.size());
+ assertEquals(DataContextCase.artistCount, objects.size());
assertTrue(objects.get(0) instanceof Artist);
assertTrue(objects instanceof IncrementalFaultList);
IncrementalFaultList pagedList = (IncrementalFaultList) objects;
- assertEquals(DataContextTestBase.artistCount - pageSize, pagedList
+ assertEquals(DataContextCase.artistCount - pageSize, pagedList
.getUnfetchedObjects());
// check if we can resolve subsequent pages
Artist artist = (Artist) objects.get(pageSize);
- int expectUnresolved = DataContextTestBase.artistCount - pageSize - pageSize;
+ int expectUnresolved = DataContextCase.artistCount - pageSize - pageSize;
if (expectUnresolved < 0) {
expectUnresolved = 0;
}
@@ -133,7 +133,7 @@
}
public void testIteratedQuery() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
String template = "SELECT * FROM ARTIST ORDER BY ARTIST_ID";
SQLTemplate query = getSQLTemplateBuilder().createSQLTemplate(
@@ -153,7 +153,7 @@
assertEquals(new Integer(33000 + i), row.get("ARTIST_ID"));
}
- assertEquals(DataContextTestBase.artistCount, i);
+ assertEquals(DataContextCase.artistCount, i);
}
finally {
it.close();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSerializationTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSerializationTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSerializationTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java Sat Nov 25 14:20:59 2006
@@ -24,13 +24,13 @@
import org.apache.art.Artist;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.conf.Configuration;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
import org.apache.cayenne.util.Util;
/**
* @author Andrus Adamchik
*/
-public class DataContextSerializationTst extends CayenneTestCase {
+public class DataContextSerializationTest extends CayenneCase {
protected void setUp() throws Exception {
fixSharedConfiguration();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricTest.java Sat Nov 25 14:20:59 2006
@@ -28,13 +28,13 @@
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
import org.apache.cayenne.unit.util.ThreadedTestHelper;
/**
* @author Andrus Adamchik
*/
-public class DataContextSharedCacheEmpiricTst extends CayenneTestCase {
+public class DataContextSharedCacheEmpiricTest extends CayenneCase {
private static final String NEW_NAME = "versionX";
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java Sat Nov 25 14:20:59 2006
@@ -37,7 +37,7 @@
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.query.ObjectIdQuery;
-import org.apache.cayenne.unit.MultiContextTestCase;
+import org.apache.cayenne.unit.MultiContextCase;
import org.apache.cayenne.unit.util.ThreadedTestHelper;
/**
@@ -46,7 +46,7 @@
*
* @author Andrus Adamchik
*/
-public class DataContextSharedCacheTst extends MultiContextTestCase {
+public class DataContextSharedCacheTest extends MultiContextCase {
protected Artist artist;
protected DataContext context;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextStaticsTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextStaticsTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextStaticsTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextStaticsTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextStaticsTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextStaticsTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextStaticsTest.java Sat Nov 25 14:20:59 2006
@@ -22,13 +22,13 @@
import java.io.InputStream;
import org.apache.cayenne.conf.Configuration;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
import org.apache.cayenne.util.ResourceLocator;
/**
* @author Andrus Adamchik
*/
-public class DataContextStaticsTst extends CayenneTestCase {
+public class DataContextStaticsTest extends CayenneCase {
protected Configuration savedConfig;
public void testCreateDataContext1() throws Exception {
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextTest.java Sat Nov 25 14:20:59 2006
@@ -45,7 +45,7 @@
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
-public class DataContextTst extends DataContextTestBase {
+public class DataContextTest extends DataContextCase {
protected MockOperationObserver opObserver;
@@ -368,14 +368,14 @@
public void testPerformPaginatedQueryBigPage() throws Exception {
SelectQuery query = new SelectQuery("Artist");
- query.setPageSize(DataContextTst.artistCount + 2);
+ query.setPageSize(DataContextTest.artistCount + 2);
List objects = context.performQuery(query);
assertNotNull(objects);
assertTrue(objects instanceof IncrementalFaultList);
blockQueries();
try {
- assertEquals(DataContextTst.artistCount, objects.size());
+ assertEquals(DataContextTest.artistCount, objects.size());
}
finally {
unblockQueries();
@@ -466,7 +466,7 @@
count++;
}
- assertEquals(DataContextTst.artistCount, count);
+ assertEquals(DataContextTest.artistCount, count);
}
finally {
it.close();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextValidationTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextValidationTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextValidationTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextValidationTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextValidationTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextValidationTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextValidationTest.java Sat Nov 25 14:20:59 2006
@@ -20,12 +20,12 @@
package org.apache.cayenne.access;
import org.apache.art.Artist;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataContextValidationTst extends CayenneTestCase {
+public class DataContextValidationTest extends CayenneCase {
public void testValidatingObjectsOnCommitProperty() throws Exception {
DataContext context = createDataContext();
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataDomainTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataDomainTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataDomainTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataDomainTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataDomainTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataDomainTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataDomainTest.java Sat Nov 25 14:20:59 2006
@@ -32,14 +32,14 @@
import org.apache.cayenne.cache.QueryCacheFactory;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* DataDomain unit tests.
*
* @author Andrus Adamchik
*/
-public class DataDomainTst extends CayenneTestCase {
+public class DataDomainTest extends CayenneCase {
public void testName() throws Exception {
DataDomain domain = new DataDomain("some name");
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeQueriesTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeQueriesTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeQueriesTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java Sat Nov 25 14:20:59 2006
@@ -33,14 +33,14 @@
import org.apache.cayenne.query.SQLAction;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* DataNode test cases.
*
* @author Andrus Adamchik
*/
-public class DataNodeQueriesTst extends CayenneTestCase {
+public class DataNodeQueriesTest extends CayenneCase {
protected void setUp() throws Exception {
super.setUp();
@@ -93,7 +93,7 @@
}
public void testPerfomQueriesSelectingSQLTemplate1() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
String template = "SELECT #result('ARTIST_ID' 'int') FROM ARTIST ORDER BY ARTIST_ID";
SQLTemplate query = new SQLTemplate(Object.class, template);
@@ -102,14 +102,14 @@
getNode().performQueries(Collections.singletonList(query), observer);
List data = observer.rowsForQuery(query);
- assertEquals(DataContextTestBase.artistCount, data.size());
+ assertEquals(DataContextCase.artistCount, data.size());
Map row = (Map) data.get(2);
assertEquals(1, row.size());
assertEquals(new Integer(33003), row.get("ARTIST_ID"));
}
public void testPerfomQueriesSelectingSQLTemplate2() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
String template = "SELECT * FROM ARTIST ORDER BY ARTIST_ID";
SQLTemplate query = new SQLTemplate(Object.class, template);
@@ -119,7 +119,7 @@
getNode().performQueries(Collections.singletonList(query), observer);
List data = observer.rowsForQuery(query);
- assertEquals(DataContextTestBase.artistCount, data.size());
+ assertEquals(DataContextCase.artistCount, data.size());
Map row = (Map) data.get(2);
assertEquals(3, row.size());
assertEquals("Can't find ARTIST_ID: " + row, new Integer(33003), row
@@ -127,7 +127,7 @@
}
public void testPerfomQueriesSelectingSQLTemplateAlias() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
String template = "SELECT #result('ARTIST_ID' 'int' 'A') FROM ARTIST ORDER BY ARTIST_ID";
SQLTemplate query = new SQLTemplate(Object.class, template);
@@ -136,7 +136,7 @@
getNode().performQueries(Collections.singletonList(query), observer);
List data = observer.rowsForQuery(query);
- assertEquals(DataContextTestBase.artistCount, data.size());
+ assertEquals(DataContextCase.artistCount, data.size());
Map row = (Map) data.get(2);
assertEquals(1, row.size());
assertEquals(new Integer(33003), row.get("A"));
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataNodeTest.java Sat Nov 25 14:20:59 2006
@@ -22,9 +22,9 @@
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.map.EntitySorter;
-import org.apache.cayenne.unit.BasicTestCase;
+import org.apache.cayenne.unit.BasicCase;
-public class DataNodeTst extends BasicTestCase {
+public class DataNodeTest extends BasicCase {
public void testName() throws Exception {
String tstName = "tst_name";
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowStoreTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowStoreTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowStoreTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java Sat Nov 25 14:20:59 2006
@@ -26,12 +26,12 @@
import org.apache.art.Artist;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataRowStoreTst extends CayenneTestCase {
+public class DataRowStoreTest extends CayenneCase {
public void testDefaultConstructor() {
DataRowStore cache = new DataRowStore("cacheXYZ");
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataRowUtilsTest.java Sat Nov 25 14:20:59 2006
@@ -29,12 +29,12 @@
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.reflect.ArcProperty;
import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* @author Andrus Adamchik
*/
-public class DataRowUtilsTst extends CayenneTestCase {
+public class DataRowUtilsTest extends CayenneCase {
protected DataContext context;
@@ -46,7 +46,7 @@
}
public void testMerge() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
String n1 = "changed";
String n2 = "changed again";
@@ -71,7 +71,7 @@
}
public void testIsToOneTargetModified() throws Exception {
- getAccessStack().createTestData(DataContextTestBase.class, "testArtists", null);
+ getAccessStack().createTestData(DataContextCase.class, "testArtists", null);
ClassDescriptor d = context.getEntityResolver().getClassDescriptor("Painting");
ArcProperty toArtist = (ArcProperty) d.getProperty("toArtist");
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTest.java (from r479195, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTst.java&r1=479195&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTest.java Sat Nov 25 14:20:59 2006
@@ -25,14 +25,14 @@
import org.apache.art.CalendarEntity;
import org.apache.art.DateTestEntity;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* Tests Date handling in Cayenne.
*
* @author Andrus Adamchik
*/
-public class DateTimeTypesTst extends CayenneTestCase {
+public class DateTimeTypesTest extends CayenneCase {
protected DataContext context;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorCrossDBTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorCrossDBTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorCrossDBTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorCrossDBTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorCrossDBTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorCrossDBTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorCrossDBTest.java Sat Nov 25 14:20:59 2006
@@ -23,9 +23,9 @@
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.unit.MultiNodeTestCase;
+import org.apache.cayenne.unit.MultiNodeCase;
-public class DbGeneratorCrossDBTst extends MultiNodeTestCase {
+public class DbGeneratorCrossDBTest extends MultiNodeCase {
public void testCreateFkConstraintsQueries() {
// can't test this if adapter doesn't support constraints
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbGeneratorTest.java Sat Nov 25 14:20:59 2006
@@ -21,14 +21,14 @@
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
/**
* Test cases for DbGenerator.
*
* @author Andrus Adamchik
*/
-public class DbGeneratorTst extends CayenneTestCase {
+public class DbGeneratorTest extends CayenneCase {
protected DbGenerator gen;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderPartialTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderPartialTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderPartialTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderPartialTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderPartialTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderPartialTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderPartialTest.java Sat Nov 25 14:20:59 2006
@@ -25,9 +25,9 @@
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
-public class DbLoaderPartialTst extends CayenneTestCase {
+public class DbLoaderPartialTest extends CayenneCase {
protected DbLoader loader;
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderTst.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderTest.java&r2=479213
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DbLoaderTest.java Sat Nov 25 14:20:59 2006
@@ -32,9 +32,9 @@
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneCase;
-public class DbLoaderTst extends CayenneTestCase {
+public class DbLoaderTest extends CayenneCase {
protected DbLoader loader;