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/19 03:06:41 UTC

svn commit: r1124489 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map: ClientEntityResolverTest.java EntityResolverTest.java

Author: aadamchik
Date: Thu May 19 01:06:41 2011
New Revision: 1124489

URL: http://svn.apache.org/viewvc?rev=1124489&view=rev
Log:
relocating client EntityResolver test to an appropriate place

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java?rev=1124489&r1=1124488&r2=1124489&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java Thu May 19 01:06:41 2011
@@ -22,13 +22,39 @@ package org.apache.cayenne.map;
 import java.util.Collection;
 import java.util.Collections;
 
-import junit.framework.TestCase;
-
 import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.remote.hessian.service.HessianUtil;
+import org.apache.cayenne.testdo.mt.ClientMtTable1;
+import org.apache.cayenne.testdo.mt.MtTable1;
 import org.apache.cayenne.testdo.testmap.Artist;
+import org.apache.cayenne.unit.di.client.ClientCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
+
+@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+public class ClientEntityResolverTest extends ClientCase {
+
+    @Inject
+    private EntityResolver serverResolver;
+
+    public void testGetClientEntityResolver() {
+
+        EntityResolver clientResolver = serverResolver.getClientEntityResolver();
+        assertNotNull(clientResolver);
+
+        // make sure that client entities got translated properly...
 
-public class ClientEntityResolverTest extends TestCase {
+        try {
+            assertNotNull(clientResolver.getObjEntity("MtTable1"));
+        }
+        catch (CayenneRuntimeException e) {
+            fail("'MtTable1' entity is not mapped. All entities: "
+                    + clientResolver.getObjEntities());
+        }
+
+        assertNotNull(clientResolver.lookupObjEntity(ClientMtTable1.class));
+        assertNull(clientResolver.lookupObjEntity(MtTable1.class));
+    }
 
     public void testSerializabilityWithHessian() throws Exception {
         ObjEntity entity = new ObjEntity("test_entity");

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java?rev=1124489&r1=1124488&r2=1124489&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java Thu May 19 01:06:41 2011
@@ -31,8 +31,6 @@ import org.apache.cayenne.configuration.
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.query.MockQuery;
 import org.apache.cayenne.query.Query;
-import org.apache.cayenne.testdo.mt.ClientMtTable1;
-import org.apache.cayenne.testdo.mt.MtTable1;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.AccessStack;
 import org.apache.cayenne.unit.CayenneResources;
@@ -41,12 +39,10 @@ import org.apache.cayenne.unit.di.server
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class EntityResolverTest extends ServerCase {
-    
-    public static final String MULTI_TIER_ACCESS_STACK = "MultiTierStack";
-    
+
     @Inject
     private ServerRuntime runtime;
-    
+
     @Inject
     private DataContext context;
 
@@ -76,46 +72,31 @@ public class EntityResolverTest extends 
         }
     }
 
-    public void testGetClientEntityResolver() {
-
-        AccessStack stack = CayenneResources.getResources().getAccessStack(
-                MULTI_TIER_ACCESS_STACK);
-
-        EntityResolver resolver = new EntityResolver(stack.getDataDomain().getDataMaps());
-        EntityResolver clientResolver = resolver.getClientEntityResolver();
-        assertNotNull(clientResolver);
-
-        // make sure that client entities got translated properly...
-
-        try {
-            assertNotNull(clientResolver.getObjEntity("MtTable1"));
-        }
-        catch (CayenneRuntimeException e) {
-            fail("'MtTable1' entity is not mapped. All entities: "
-                    + clientResolver.getObjEntities());
-        }
-
-        assertNotNull(clientResolver.lookupObjEntity(ClientMtTable1.class));
-        assertNull(clientResolver.lookupObjEntity(MtTable1.class));
-    }
-
     public void testGetObjEntity() {
-        EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
+        EntityResolver resolver = new EntityResolver(runtime
+                .getDataDomain()
+                .getDataMaps());
         assertIsArtistObjEntity(resolver.getObjEntity("Artist"));
     }
 
     public void testLookupObjEntityByClass() {
-        EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
+        EntityResolver resolver = new EntityResolver(runtime
+                .getDataDomain()
+                .getDataMaps());
         assertIsArtistObjEntity(resolver.lookupObjEntity(Artist.class));
     }
 
     public void testLookupObjEntityByInstance() {
-        EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
+        EntityResolver resolver = new EntityResolver(runtime
+                .getDataDomain()
+                .getDataMaps());
         assertIsArtistObjEntity(resolver.lookupObjEntity(new Artist()));
     }
 
     public void testLookupObjEntityByDataobject() {
-        EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps());
+        EntityResolver resolver = new EntityResolver(runtime
+                .getDataDomain()
+                .getDataMaps());
         Artist artist = (Artist) context.newObject("Artist");
         assertIsArtistObjEntity(resolver.lookupObjEntity(artist));
     }
@@ -217,7 +198,7 @@ public class EntityResolverTest extends 
         assertNotNull(ae);
         assertEquals(ae, getObjEntity("Artist"));
     }
-    
+
     private DbEntity getDbEntity(String dbEntityName) {
         for (DataMap map : runtime.getDataDomain().getDataMaps()) {
             for (DbEntity e : map.getDbEntities()) {