Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D79656481 for ; Sun, 22 May 2011 17:07:49 +0000 (UTC) Received: (qmail 7592 invoked by uid 500); 22 May 2011 17:07:49 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 7563 invoked by uid 500); 22 May 2011 17:07:49 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 7556 invoked by uid 99); 22 May 2011 17:07:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 May 2011 17:07:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 May 2011 17:07:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 082AC23889B2; Sun, 22 May 2011 17:07:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1126092 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java Date: Sun, 22 May 2011 17:07:25 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110522170726.082AC23889B2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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);