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/15 14:42:44 UTC
svn commit: r1103347 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java
Author: aadamchik
Date: Sun May 15 12:42:44 2011
New Revision: 1103347
URL: http://svn.apache.org/viewvc?rev=1103347&view=rev
Log:
CAY-1564 CayenneCase unit tests conversion(4)
patch by Dzmitry Kazimirchyk - PersistenceByReachabilityTest + some cleanup.
e.g. we don't need to delete test data here as we don't access the DB from tests
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java?rev=1103347&r1=1103346&r2=1103347&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java Sun May 15 12:42:44 2011
@@ -19,15 +19,22 @@
package org.apache.cayenne;
-import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.di.Inject;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
-import org.apache.cayenne.unit.CayenneCase;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
-public class PersistenceByReachabilityTest extends CayenneCase {
+@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
+public class PersistenceByReachabilityTest extends ServerCase {
+
+ @Inject
+ private ObjectContext context;
+
+ @Inject
+ private ObjectContext context1;
public void testToOneTargetTransient() throws Exception {
- DataContext context = createDataContext();
Painting persistentDO = context.newObject(Painting.class);
Artist transientDO = new Artist();
@@ -37,7 +44,6 @@ public class PersistenceByReachabilityTe
}
public void testToOneTargetPersistent() throws Exception {
- DataContext context = createDataContext();
Painting transientDO = context.newObject(Painting.class);
Artist persistentDO = new Artist();
@@ -47,11 +53,9 @@ public class PersistenceByReachabilityTe
}
public void testToOneTargetDifferentContext() throws Exception {
- DataContext context1 = createDataContext();
- Painting doC1 = context1.newObject(Painting.class);
- DataContext context2 = createDataContext();
- Artist doC2 = context2.newObject(Artist.class);
+ Painting doC1 = context.newObject(Painting.class);
+ Artist doC2 = context1.newObject(Artist.class);
// this is the case where exception must be thrown as DataContexts are
// different
@@ -60,16 +64,13 @@ public class PersistenceByReachabilityTe
fail("failed to detect relationship between objects in different DataContexts");
}
catch (CayenneRuntimeException ex) {
-
+ // expected
}
}
public void testToManyTargetDifferentContext() throws Exception {
- DataContext context1 = createDataContext();
- Painting doC1 = context1.newObject(Painting.class);
-
- DataContext context2 = createDataContext();
- Artist doC2 = context2.newObject(Artist.class);
+ Painting doC1 = context.newObject(Painting.class);
+ Artist doC2 = context1.newObject(Artist.class);
// this is the case where exception must be thrown as DataContexts are
// different
@@ -83,7 +84,6 @@ public class PersistenceByReachabilityTe
}
public void testToManyTargetTransient() throws Exception {
- DataContext context = createDataContext();
Painting transientDO = context.newObject(Painting.class);
Artist persistentDO = new Artist();
@@ -93,7 +93,6 @@ public class PersistenceByReachabilityTe
}
public void testToManyTargetPersistent() throws Exception {
- DataContext context = createDataContext();
Painting persistentDO = context.newObject(Painting.class);
Artist transientDO = new Artist();