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 2011/05/17 14:43:49 UTC
svn commit: r1104202 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne:
access/ conn/ dba/oracle/ ejbql/ exp/ exp/parser/ log/ map/ query/ remote/
Author: aadamchik
Date: Tue May 17 12:43:48 2011
New Revision: 1104202
URL: http://svn.apache.org/viewvc?rev=1104202&view=rev
Log:
CAY-1564 CayenneCase unit tests conversion(4)
patch by Dzmitry Kazimirchyk - minor.patch (plus changing all superclasses to just TestCase)
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryExtrasTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ParametrizedExpressionTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/parser/ParameterizedExpressionTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/RelationshipTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/QualifiedQueryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/ClientChannelTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowStoreTest.java Tue May 17 12:43:48 2011
@@ -27,11 +27,11 @@ import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.event.DefaultEventManager;
import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
-/**
- */
-public class DataRowStoreTest extends CayenneCase {
+@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
+public class DataRowStoreTest extends ServerCase {
public void testDefaultConstructor() {
DataRowStore cache = new DataRowStore(
@@ -47,7 +47,7 @@ public class DataRowStoreTest extends Ca
}
public void testConstructorWithProperties() {
- Map props = new HashMap();
+ Map<Object, Object> props = new HashMap<Object, Object>();
props.put(DataRowStore.REMOTE_NOTIFICATION_PROPERTY, String
.valueOf(!DataRowStore.REMOTE_NOTIFICATION_DEFAULT));
@@ -78,7 +78,7 @@ public class DataRowStoreTest extends Ca
* Tests LRU cache behavior.
*/
public void testMaxSize() throws Exception {
- Map props = new HashMap();
+ Map<Object, Object> props = new HashMap<Object, Object>();
props.put(DataRowStore.SNAPSHOT_CACHE_SIZE_PROPERTY, String.valueOf(2));
DataRowStore cache = new DataRowStore(
@@ -89,15 +89,15 @@ public class DataRowStoreTest extends Ca
assertEquals(0, cache.size());
ObjectId key1 = new ObjectId("Artist", Artist.ARTIST_ID_PK_COLUMN, 1);
- Map diff1 = new HashMap();
+ Map<Object, Object> diff1 = new HashMap<Object, Object>();
diff1.put(key1, new DataRow(1));
ObjectId key2 = new ObjectId("Artist", Artist.ARTIST_ID_PK_COLUMN, 2);
- Map diff2 = new HashMap();
+ Map<Object, Object> diff2 = new HashMap<Object, Object>();
diff2.put(key2, new DataRow(1));
ObjectId key3 = new ObjectId("Artist", Artist.ARTIST_ID_PK_COLUMN, 3);
- Map diff3 = new HashMap();
+ Map<Object, Object> diff3 = new HashMap<Object, Object>();
diff3.put(key3, new DataRow(1));
cache.processSnapshotChanges(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java Tue May 17 12:43:48 2011
@@ -19,15 +19,16 @@
package org.apache.cayenne.conn;
-import org.apache.cayenne.unit.CayenneCase;
+import junit.framework.TestCase;
+
import org.apache.cayenne.util.Util;
+public class DataSourceInfoTest extends TestCase {
-public class DataSourceInfoTest extends CayenneCase {
private DataSourceInfo dsi;
@Override
- public void setUp() throws java.lang.Exception {
+ public void setUp() throws Exception {
dsi = new DataSourceInfo();
dsi.setUserName("a");
dsi.setPassword("b");
@@ -51,7 +52,7 @@ public class DataSourceInfoTest extends
}
public void testSerialize() throws java.lang.Exception {
- DataSourceInfo dsiUnserialized = (DataSourceInfo)Util.cloneViaSerialization(dsi);
+ DataSourceInfo dsiUnserialized = Util.cloneViaSerialization(dsi);
assertEquals(dsi, dsiUnserialized);
assertTrue(dsi != dsiUnserialized);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java Tue May 17 12:43:48 2011
@@ -17,40 +17,35 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.dba.oracle;
import java.util.Calendar;
import java.util.Date;
-import org.apache.cayenne.unit.CayenneCase;
+import junit.framework.TestCase;
-/**
- */
-public class OracleUtilDateTypeTest extends CayenneCase {
+public class OracleUtilDateTypeTest extends TestCase {
- public void testNormalizeDate() throws Exception {
- Date date = new Date();
- Date timeNormalized = new OracleUtilDateType().normalizeDate(date);
+ public void testNormalizeDate() throws Exception {
+ Date date = new Date();
+ Date timeNormalized = new OracleUtilDateType().normalizeDate(date);
- assertNotNull(timeNormalized);
+ assertNotNull(timeNormalized);
- Calendar raw = Calendar.getInstance();
- raw.setTime(date);
+ Calendar raw = Calendar.getInstance();
+ raw.setTime(date);
- Calendar normalized = null;
+ Calendar normalized = null;
- normalized = Calendar.getInstance();
- normalized.setTime(timeNormalized);
+ normalized = Calendar.getInstance();
+ normalized.setTime(timeNormalized);
- assertEquals(1970, normalized.get(Calendar.YEAR));
- assertEquals(0, normalized.get(Calendar.MONTH));
- assertEquals(1, normalized.get(Calendar.DAY_OF_MONTH));
+ assertEquals(1970, normalized.get(Calendar.YEAR));
+ assertEquals(0, normalized.get(Calendar.MONTH));
+ assertEquals(1, normalized.get(Calendar.DAY_OF_MONTH));
- assertEquals(
- raw.get(Calendar.HOUR_OF_DAY),
- normalized.get(Calendar.HOUR_OF_DAY));
- assertEquals(raw.get(Calendar.MINUTE), normalized.get(Calendar.MINUTE));
- assertEquals(raw.get(Calendar.SECOND), normalized.get(Calendar.SECOND));
- }
+ assertEquals(raw.get(Calendar.HOUR_OF_DAY), normalized.get(Calendar.HOUR_OF_DAY));
+ assertEquals(raw.get(Calendar.MINUTE), normalized.get(Calendar.MINUTE));
+ assertEquals(raw.get(Calendar.SECOND), normalized.get(Calendar.SECOND));
+ }
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java Tue May 17 12:43:48 2011
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.cayenne.ejbql;
-import org.apache.cayenne.unit.CayenneCase;
+import junit.framework.TestCase;
-public class EJBQLExpressionTest extends CayenneCase {
+public class EJBQLExpressionTest extends TestCase {
public void testDbPath() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryExtrasTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryExtrasTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryExtrasTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryExtrasTest.java Tue May 17 12:43:48 2011
@@ -24,14 +24,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.cayenne.unit.CayenneCase;
+import junit.framework.TestCase;
-public class ExpressionFactoryExtrasTest extends CayenneCase {
+public class ExpressionFactoryExtrasTest extends TestCase {
protected TstTraversalHandler handler;
@Override
- protected void setUp() throws java.lang.Exception {
+ protected void setUp() throws Exception {
handler = new TstTraversalHandler();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java Tue May 17 12:43:48 2011
@@ -17,18 +17,15 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.exp;
-import org.apache.cayenne.unit.CayenneCase;
+import junit.framework.TestCase;
-/**
- */
-public class ExpressionParameterTest extends CayenneCase {
+public class ExpressionParameterTest extends TestCase {
- public void testConstructor() throws Exception {
- ExpressionParameter p = new ExpressionParameter("abc");
- assertEquals("abc", p.getName());
+ public void testConstructor() throws Exception {
+ ExpressionParameter p = new ExpressionParameter("abc");
+ assertEquals("abc", p.getName());
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java Tue May 17 12:43:48 2011
@@ -19,44 +19,40 @@
package org.apache.cayenne.exp;
-import org.apache.cayenne.unit.CayenneCase;
+import junit.framework.TestCase;
+public class ExpressionTraversalTest extends TestCase {
+
+ private TstTraversalHandler handler;
-public class ExpressionTraversalTest extends CayenneCase {
- protected TstTraversalHandler handler;
-
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception {
handler = new TstTraversalHandler();
}
-
-
+
public void testUnary() throws Exception {
doExpressionTest(new TstUnaryExpSuite());
}
-
-
+
public void testBinary() throws Exception {
doExpressionTest(new TstBinaryExpSuite());
}
-
-
+
public void testTernary() throws Exception {
doExpressionTest(new TstTernaryExpSuite());
- }
-
-
+ }
+
private void doExpressionTest(TstExpressionSuite suite) throws Exception {
TstExpressionCase[] cases = suite.cases();
-
+
int len = cases.length;
- for(int i = 0; i < len; i++) {
+ for (int i = 0; i < len; i++) {
handler.reset();
cases[i].getCayenneExp().traverse(handler);
-
+
// assert statistics
handler.assertConsistency();
cases[i].assertParsedWell(handler.getNodeCount(), handler.getLeafs());
}
- }
+ }
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ParametrizedExpressionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ParametrizedExpressionTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ParametrizedExpressionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ParametrizedExpressionTest.java Tue May 17 12:43:48 2011
@@ -26,11 +26,13 @@ import java.util.List;
import java.util.Map;
import org.apache.cayenne.exp.parser.ASTList;
-import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
/**
*/
-public class ParametrizedExpressionTest extends CayenneCase {
+@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
+public class ParametrizedExpressionTest extends ServerCase {
/**
* Tests how parameter substitution algorithm works on an expression with no
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/parser/ParameterizedExpressionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/parser/ParameterizedExpressionTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/parser/ParameterizedExpressionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/parser/ParameterizedExpressionTest.java Tue May 17 12:43:48 2011
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.exp.parser;
import java.util.Collections;
@@ -92,7 +91,7 @@ public class ParameterizedExpressionTest
public void testParams1() {
Expression e1 = Expression.fromString("k1 = $test");
- Map map = new HashMap();
+ Map<String, Object> map = new HashMap<String, Object>();
map.put("test", "xyz");
Expression e2 = e1.expWithParameters(map, false);
assertNotNull(e2);
@@ -104,7 +103,7 @@ public class ParameterizedExpressionTest
public void testParams2() {
Expression e1 = Expression.fromString("k1 like $test");
- Map map = new HashMap();
+ Map<String, Object> map = new HashMap<String, Object>();
map.put("test", "xyz");
Expression e2 = e1.expWithParameters(map, false);
assertNotNull(e2);
@@ -125,7 +124,7 @@ public class ParameterizedExpressionTest
Expression e1 = Expression
.fromString("k1 = $test1 or k2 = $test2 or k3 = $test3 or k4 = $test4");
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("test2", "abc");
params.put("test3", "xyz");
Expression e2 = e1.expWithParameters(params, true);
@@ -145,7 +144,7 @@ public class ParameterizedExpressionTest
Expression e1 = Expression
.fromString("k1 = $test1 or k2 = $test2 or k3 = $test3 or k4 = $test4");
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("test4", "123");
Expression e2 = e1.expWithParameters(params, true);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java Tue May 17 12:43:48 2011
@@ -18,10 +18,11 @@
****************************************************************/
package org.apache.cayenne.log;
-import org.apache.cayenne.unit.CayenneCase;
+import junit.framework.TestCase;
+
import org.apache.cayenne.util.IDUtil;
-public class CommonsJdbcEventLoggerTest extends CayenneCase {
+public class CommonsJdbcEventLoggerTest extends TestCase {
public void testSqlLiteralForObject() throws Exception {
StringBuilder buf = new StringBuilder();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/RelationshipTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/RelationshipTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/RelationshipTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/RelationshipTest.java Tue May 17 12:43:48 2011
@@ -19,9 +19,9 @@
package org.apache.cayenne.map;
-import org.apache.cayenne.unit.CayenneCase;
+import junit.framework.TestCase;
-public class RelationshipTest extends CayenneCase {
+public class RelationshipTest extends TestCase {
public void testName() throws Exception {
Relationship rel = new MockRelationship();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/QualifiedQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/QualifiedQueryTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/QualifiedQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/QualifiedQueryTest.java Tue May 17 12:43:48 2011
@@ -19,12 +19,12 @@ package org.apache.cayenne.query;
* under the License.
****************************************************************/
+import junit.framework.TestCase;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
-import org.apache.cayenne.unit.CayenneCase;
-public class QualifiedQueryTest extends CayenneCase {
+public class QualifiedQueryTest extends TestCase {
public void testSetQualifier() {
QualifiedQuery query = new MockQualifiedQuery();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/ClientChannelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/ClientChannelTest.java?rev=1104202&r1=1104201&r2=1104202&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/ClientChannelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/ClientChannelTest.java Tue May 17 12:43:48 2011
@@ -28,6 +28,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import junit.framework.TestCase;
+
import org.apache.cayenne.CayenneContext;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.MockPersistentObject;
@@ -43,12 +45,11 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.unit.CayenneCase;
import org.apache.cayenne.util.GenericResponse;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-public class ClientChannelTest extends CayenneCase {
+public class ClientChannelTest extends TestCase {
public void testOnQuerySelect() {