Author: aadamchik
Date: Sun May 22 17:09:15 2011
New Revision: 1126095
URL: http://svn.apache.org/viewvc?rev=1126095&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/map/EntityResolverInheritanceTest.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java?rev=1126095&r1=1126094&r2=1126095&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java
Sun May 22 17:09:15 2011
@@ -19,32 +19,28 @@
package org.apache.cayenne.map;
-import org.apache.cayenne.unit.PeopleCase;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
-/**
- */
-public class EntityResolverInheritanceTest extends PeopleCase {
-
- protected EntityResolver resolver;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- resolver = new EntityResolver(getDomain().getDataMaps());
- }
+@UseServerRuntime(ServerCase.PEOPLE_PROJECT)
+public class EntityResolverInheritanceTest extends ServerCase {
+
+ @Inject
+ private EntityResolver resolver;
public void testLookupAbstractPersonTree() throws Exception {
EntityInheritanceTree tree =
resolver.lookupInheritanceTree("AbstractPerson");
assertNotNull(tree);
assertEquals(2, tree.getChildrenCount());
- assertSame(getObjEntity("AbstractPerson"), tree.getEntity());
+ assertSame(resolver.getObjEntity("AbstractPerson"), tree.getEntity());
}
public void testLookupEmployeeTree() throws Exception {
EntityInheritanceTree tree =
resolver.lookupInheritanceTree("Employee");
assertNotNull(tree);
assertEquals(1, tree.getChildrenCount());
- assertSame(getObjEntity("Employee"), tree.getEntity());
+ assertSame(resolver.getObjEntity("Employee"), tree.getEntity());
}
public void testLookupManagerTree() throws Exception {
