svn commit: r1124507 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java

[aa...@apache.org]

Author: aadamchik
Date: Thu May 19 01:48:37 2011
New Revision: 1124507

URL: http://svn.apache.org/viewvc?rev=1124507&view=rev
Log:
test conversion

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java?rev=1124507&r1=1124506&r2=1124507&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java Thu May 19 01:48:37 2011
@@ -27,17 +27,21 @@ import org.apache.cayenne.DataObject;
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.MockDataObject;
 import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Gallery;
 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 ObjectStoreTest extends CayenneCase {
+@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
+public class ObjectStoreTest extends ServerCase {
+
+    @Inject
+    private DataContext context;
 
     public void testRegisteredObjectsCount() throws Exception {
-        DataContext context = createDataContext();
+
         assertEquals(0, context.getObjectStore().registeredObjectsCount());
 
         DataObject o1 = new MockDataObject();
@@ -59,7 +63,6 @@ public class ObjectStoreTest extends Cay
     }
 
     public void testObjectsUnregistered() throws Exception {
-        DataContext context = createDataContext();
 
         DataRow row = new DataRow(10);
         row.put("ARTIST_ID", new Integer(1));
@@ -83,7 +86,6 @@ public class ObjectStoreTest extends Cay
     }
 
     public void testUnregisterThenRegister() throws Exception {
-        DataContext context = createDataContext();
 
         // Create a gallery.
         Gallery g = context.newObject(Gallery.class);
@@ -125,8 +127,7 @@ public class ObjectStoreTest extends Cay
         //
         // The full object graph is not being re-registered during auto-registration
         // with the context.
-        Painting newP = (Painting) Cayenne.objectForPK(createDataContext(), p
-                .getObjectId());
+        Painting newP = (Painting) Cayenne.objectForPK(context, p.getObjectId());
         assertNotNull(newP.getToGallery());
     }
 }