[qdox-scm] [1090] trunk/qdox/src/test/com/thoughtworks/qdox/model: Mocking JavaFieldTest

[rfscholte]

Title: [1090] trunk/qdox/src/test/com/thoughtworks/qdox/model: Mocking JavaFieldTest

Revision

1090

Author

rfscholte

Date

2011-02-27 14:01:41 -0600 (Sun, 27 Feb 2011)

Log Message

Mocking JavaFieldTest

Modified Paths

• trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaFieldTest.java
• trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaFieldTest.java

Diff

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaFieldTest.java (1089 => 1090)

--- trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaFieldTest.java	2011-02-27 17:10:54 UTC (rev 1089)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaFieldTest.java	2011-02-27 20:01:41 UTC (rev 1090)
@@ -11,6 +11,7 @@
         super( s );
     }
 
+    @Override
     public DefaultJavaField newJavaField()
     {
         JavaSource source = new DefaultJavaSource( null );
@@ -20,67 +21,58 @@
         return result;
     }
 
+    @Override
     public DefaultJavaField newJavaField( Type type, String name )
     {
         return new DefaultJavaField(type, name);
     }
 
-    public JavaClass newJavaClass( String fullname )
-    {
-        return new DefaultJavaClass(fullname);
-    }
-
-    public JavaPackage newJavaPackage( String name )
-    {
-        return new DefaultJavaPackage(name);
-    }
-
+    @Override
     public Type newType( String fullname )
     {
         return new Type( fullname );
     }
 
+    @Override
     public Type newType( String fullname, int dimensions )
     {
         return new Type( fullname, dimensions );
     }
 
+    @Override
     public void setComment( DefaultJavaField fld, String comment )
     {
         fld.setComment( comment );
     }
 
+    @Override
     public void setInitializationExpression( DefaultJavaField fld, String _expression_ )
     {
         fld.setInitializationExpression( _expression_ );
     }
 
+    @Override
     public void setModifiers( DefaultJavaField fld, List<String> modifiers )
     {
         fld.setModifiers( modifiers );
     }
 
+    @Override
     public void setName( DefaultJavaField fld, String name )
     {
         fld.setName( name );
     }
 
+    @Override
     public void setType( DefaultJavaField fld, Type type )
     {
         fld.setType( type );
     }
 
-
-    public void addField( JavaClass clazz, JavaField fld )
+    @Override
+    public void setDeclaringClass( DefaultJavaField fld, JavaClass cls )
     {
-        ((DefaultJavaClass) clazz).addField( fld );
-        ((DefaultJavaField) fld).setParentClass( clazz );
+        fld.setParentClass( cls );
     }
 
-    public void addClass( JavaPackage pckg, JavaClass clazz )
-    {
-        ((DefaultJavaPackage) pckg).addClass( clazz );
-        ((DefaultJavaClass) clazz).setJavaPackage( pckg );
-    }
-
 }

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaFieldTest.java (1089 => 1090)

--- trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaFieldTest.java	2011-02-27 17:10:54 UTC (rev 1089)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaFieldTest.java	2011-02-27 20:01:41 UTC (rev 1090)
@@ -1,5 +1,7 @@
 package com.thoughtworks.qdox.model;
 
+import static org.mockito.Mockito.*;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -21,16 +23,11 @@
     public abstract void setModifiers(F fld, List<String> modifiers);
     public abstract void setName(F fld, String name);
     public abstract void setType(F fld, Type type);
+    public abstract void setDeclaringClass(F fld, JavaClass cls);
     
     public abstract Type newType(String fullname);
     public abstract Type newType(String fullname, int dimensions);
-    public abstract JavaClass newJavaClass(String fullname);
-    public abstract JavaPackage newJavaPackage(String name);
     
-    
-    public abstract void addField(JavaClass clazz, JavaField fld);
-    public abstract void addClass(JavaPackage pckg, JavaClass clazz);
-
     public void testGetCodeBlock() throws Exception {
         F fld = newJavaField();
         setName(fld, "count");
@@ -109,20 +106,20 @@
     }
     
     public void testToStringThreadMIN_PRIORITY() throws Exception {
-    	JavaClass cls = newJavaClass("java.lang.Thread");
+    	JavaClass cls = mock(JavaClass.class);
+    	when(cls.getFullyQualifiedName()).thenReturn( "java.lang.Thread" );
     	F fld = newJavaField(newType("int"), "MIN_PRIORITY");
     	setModifiers(fld, Arrays.asList(new String[] {"final", "static", "public"}));
-    	addField(cls, fld);
+    	setDeclaringClass( fld, cls );
     	assertEquals("public static final int java.lang.Thread.MIN_PRIORITY", fld.toString());
     }
     
     public void testToStringFieldDescriptorFd() throws Exception {
-    	JavaPackage pckg =  newJavaPackage("java.io");
-    	JavaClass cls = newJavaClass("FileDescriptor");
-    	addClass(pckg, cls);
+    	JavaClass cls = mock(JavaClass.class);
+    	when(cls.getFullyQualifiedName()).thenReturn("java.io.FileDescriptor");
     	F fld =  newJavaField(newType("int"), "fd");
     	setModifiers(fld, Arrays.asList(new String[]{"private"}));
-    	addField(cls, fld);
+    	setDeclaringClass( fld, cls );
     	assertEquals("private int java.io.FileDescriptor.fd", fld.toString());
     }
 }

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email