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/22 19:07:25 UTC
svn commit: r1126092 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java

Author: aadamchik
Date: Sun May 22 17:07:25 2011
New Revision: 1126092

URL: http://svn.apache.org/viewvc?rev=1126092&view=rev
Log:
unit test refactoring

porting test to DI

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

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java?rev=1126092&r1=1126091&r2=1126092&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java Sun May 22 17:07:25 2011
@@ -19,19 +19,25 @@
 
 package org.apache.cayenne.query;
 
+import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.testdo.inherit.Department;
 import org.apache.cayenne.testdo.inherit.Employee;
 import org.apache.cayenne.testdo.inherit.Manager;
-import org.apache.cayenne.unit.PeopleCase;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
 
-public class SelectQueryPrefetchRouterActionQualifiedEntityTest extends PeopleCase {
+@UseServerRuntime(ServerCase.PEOPLE_PROJECT)
+public class SelectQueryPrefetchRouterActionQualifiedEntityTest extends ServerCase {
+
+    @Inject
+    private EntityResolver resolver;
 
     public void testPrefetchEmployee() throws Exception {
-        ObjEntity departmentEntity = getDomain().getEntityResolver().lookupObjEntity(
-                Department.class);
+        ObjEntity departmentEntity = resolver.lookupObjEntity(Department.class);
         SelectQuery q = new SelectQuery(Employee.class, ExpressionFactory.matchExp(
                 "name",
                 "abc"));
@@ -41,7 +47,7 @@ public class SelectQueryPrefetchRouterAc
         SelectQueryPrefetchRouterAction action = new SelectQueryPrefetchRouterAction();
 
         MockQueryRouter router = new MockQueryRouter();
-        action.route(q, router, getDomain().getEntityResolver());
+        action.route(q, router, resolver);
         assertEquals(1, router.getQueryCount());
 
         PrefetchSelectQuery prefetch = (PrefetchSelectQuery) router.getQueries().get(0);
@@ -53,8 +59,7 @@ public class SelectQueryPrefetchRouterAc
     }
 
     public void testPrefetchManager() throws Exception {
-        ObjEntity departmentEntity = getDomain().getEntityResolver().lookupObjEntity(
-                Department.class);
+        ObjEntity departmentEntity = resolver.lookupObjEntity(Department.class);
         SelectQuery q = new SelectQuery(Manager.class, ExpressionFactory.matchExp(
                 "name",
                 "abc"));
@@ -64,7 +69,7 @@ public class SelectQueryPrefetchRouterAc
         SelectQueryPrefetchRouterAction action = new SelectQueryPrefetchRouterAction();
 
         MockQueryRouter router = new MockQueryRouter();
-        action.route(q, router, getDomain().getEntityResolver());
+        action.route(q, router, resolver);
         assertEquals(1, router.getQueryCount());
 
         PrefetchSelectQuery prefetch = (PrefetchSelectQuery) router.getQueries().get(0);