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 2012/10/17 20:44:30 UTC

svn commit: r1399385 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne: map/EntityResolverClassDescriptorTest.java reflect/MockClassDescriptorFactory.java

Author: aadamchik
Date: Wed Oct 17 18:44:30 2012
New Revision: 1399385

URL: http://svn.apache.org/viewvc?rev=1399385&view=rev
Log:
refactoring - using mockito for mock test classes

Removed:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockClassDescriptorFactory.java
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=1399385&r1=1399384&r2=1399385&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 Wed Oct 17 18:44:30 2012
@@ -20,13 +20,14 @@
 package org.apache.cayenne.map;
 
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 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.ClassDescriptorFactory;
 import org.apache.cayenne.reflect.LazyClassDescriptorDecorator;
-import org.apache.cayenne.reflect.MockClassDescriptorFactory;
 import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.testdo.mt.MtTable1;
 import org.apache.cayenne.testdo.mt.MtTable2;
@@ -58,8 +59,9 @@ public class EntityResolverClassDescript
         resolver.getClassDescriptorMap().clearDescriptors();
 
         ClassDescriptor descriptor = mock(ClassDescriptor.class);
-        MockClassDescriptorFactory factory = new MockClassDescriptorFactory(
-                descriptor);
+        ClassDescriptorFactory factory = mock(ClassDescriptorFactory.class);
+        when(factory.getDescriptor("MtTable1")).thenReturn(descriptor);
+        
         resolver.getClassDescriptorMap().addFactory(factory);
         try {
             ClassDescriptor resolved = resolver.getClassDescriptor("MtTable1");