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

[aa...@apache.org]

Author: aadamchik
Date: Wed Oct 17 18:39:03 2012
New Revision: 1399380

URL: http://svn.apache.org/viewvc?rev=1399380&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/MockClassDescriptor.java
Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.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=1399380&r1=1399379&r2=1399380&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:39:03 2012
@@ -19,12 +19,13 @@
 
 package org.apache.cayenne.map;
 
+import static org.mockito.Mockito.mock;
+
 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.PropertyDescriptor;
 import org.apache.cayenne.testdo.mt.MtTable1;
@@ -56,15 +57,15 @@ public class EntityResolverClassDescript
         EntityResolver resolver = runtime.getDataDomain().getEntityResolver();
         resolver.getClassDescriptorMap().clearDescriptors();
 
-        MockClassDescriptor mockDescriptor = new MockClassDescriptor();
+        ClassDescriptor descriptor = mock(ClassDescriptor.class);
         MockClassDescriptorFactory factory = new MockClassDescriptorFactory(
-                mockDescriptor);
+                descriptor);
         resolver.getClassDescriptorMap().addFactory(factory);
         try {
-            ClassDescriptor descriptor = resolver.getClassDescriptor("MtTable1");
-            assertNotNull(descriptor);
-            descriptor = ((LazyClassDescriptorDecorator) descriptor).getDescriptor();
-            assertSame(mockDescriptor, descriptor);
+            ClassDescriptor resolved = resolver.getClassDescriptor("MtTable1");
+            assertNotNull(resolved);
+            resolved = ((LazyClassDescriptorDecorator) resolved).getDescriptor();
+            assertSame(descriptor, resolved);
         }
         finally {
             resolver.getClassDescriptorMap().removeFactory(factory);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java?rev=1399380&r1=1399379&r2=1399380&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java Wed Oct 17 18:39:03 2012
@@ -18,6 +18,9 @@
  ****************************************************************/
 package org.apache.cayenne.reflect;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.apache.cayenne.reflect.BaseProperty;
 
 import junit.framework.TestCase;
@@ -25,15 +28,11 @@ import junit.framework.TestCase;
 public class BasePropertyTest extends TestCase {
 
     public void testGetName() {
-        BaseProperty p = new MockBaseProperty(
-                new MockClassDescriptor(),
-                new MockAccessor() {
-
-                    @Override
-                    public String getName() {
-                        return "xyz";
-                    }
-                });
+        ClassDescriptor owner = mock(ClassDescriptor.class);
+        Accessor accessor = mock(Accessor.class);
+        when(accessor.getName()).thenReturn("xyz");
+
+        BaseProperty p = new MockBaseProperty(owner, accessor);
 
         assertEquals("xyz", p.getName());
     }