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/14 12:50:48 UTC
svn commit: r1103028 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java
Author: aadamchik
Date: Sat May 14 10:50:48 2011
New Revision: 1103028
URL: http://svn.apache.org/viewvc?rev=1103028&view=rev
Log:
CAY-1564 CayenneCase unit tests conversion(4)
patch by Dzmitry Kazimirchyk - EntityResolverClassDescriptorTest
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java?rev=1103028&r1=1103027&r2=1103028&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java Sat May 14 10:50:48 2011
@@ -19,32 +19,27 @@
package org.apache.cayenne.map;
+import org.apache.cayenne.configuration.server.ServerRuntime;
+import org.apache.cayenne.di.Inject;
import org.apache.cayenne.reflect.ArcProperty;
import org.apache.cayenne.reflect.ClassDescriptor;
+import org.apache.cayenne.reflect.LazyClassDescriptorDecorator;
import org.apache.cayenne.reflect.MockClassDescriptor;
import org.apache.cayenne.reflect.MockClassDescriptorFactory;
import org.apache.cayenne.reflect.Property;
-import org.apache.cayenne.reflect.LazyClassDescriptorDecorator;
import org.apache.cayenne.testdo.mt.MtTable1;
import org.apache.cayenne.testdo.mt.MtTable2;
-import org.apache.cayenne.unit.AccessStack;
-import org.apache.cayenne.unit.CayenneCase;
-import org.apache.cayenne.unit.CayenneResources;
-
-public class EntityResolverClassDescriptorTest extends CayenneCase {
-
- /**
- * Configures multi-tier stack as we want to access descriptors in different tiers...
- */
- @Override
- protected AccessStack buildAccessStack() {
- return CayenneResources
- .getResources()
- .getAccessStack(MULTI_TIER_ACCESS_STACK);
- }
+import org.apache.cayenne.unit.di.client.ClientCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
+
+@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
+public class EntityResolverClassDescriptorTest extends ClientCase {
+
+ @Inject
+ private ServerRuntime runtime;
public void testServerDescriptorCaching() {
- EntityResolver resolver = getDomain().getEntityResolver();
+ EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
resolver.getClassDescriptorMap().clearDescriptors();
ClassDescriptor descriptor = resolver.getClassDescriptor("MtTable1");
@@ -58,7 +53,7 @@ public class EntityResolverClassDescript
}
public void testServerDescriptorFactory() {
- EntityResolver resolver = getDomain().getEntityResolver();
+ EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
resolver.getClassDescriptorMap().clearDescriptors();
MockClassDescriptor mockDescriptor = new MockClassDescriptor();
@@ -77,7 +72,7 @@ public class EntityResolverClassDescript
}
public void testArcProperties() {
- EntityResolver resolver = getDomain().getEntityResolver();
+ EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
resolver.getClassDescriptorMap().clearDescriptors();
ClassDescriptor descriptor = resolver.getClassDescriptor("MtTable1");