[qdox-scm] [1396] trunk/qdox/src/test/java/com/thoughtworks/qdox/model: More Type to JavaType refactoring

Mon, 10 Oct 2011 12:54:30 -0700

Title: [1396] trunk/qdox/src/test/java/com/thoughtworks/qdox/model: More Type to JavaType refactoring

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java (1395 => 1396)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java	2011-10-10 18:51:18 UTC (rev 1395)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java	2011-10-10 19:54:26 UTC (rev 1396)
@@ -38,7 +38,7 @@
     /**
      * @deprecated the JavaClass should have the same methods
      */
-    Type asType();
+    JavaType asType();
 
     /**
      * @deprecated Use {@link #getNestedClasses()} instead.

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1395 => 1396)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-10 18:51:18 UTC (rev 1395)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-10 19:54:26 UTC (rev 1396)
@@ -1154,7 +1154,7 @@
     } 
     
     // deprecated
-    public Type asType()    {
+    public JavaType asType()    {
         return resolveRealClass().asType();
     }

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaClass.java (1395 => 1396)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaClass.java	2011-10-10 18:51:18 UTC (rev 1395)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaClass.java	2011-10-10 19:54:26 UTC (rev 1396)
@@ -129,8 +129,8 @@
      * @see com.thoughtworks.qdox.model.JavaClass#getSuperClass()
      */
     public JavaType getSuperClass() {
-        Type OBJECT_TYPE = getJavaClassLibrary().getJavaClass( "java.lang.Object" ).asType();
-        Type ENUM_TYPE = getJavaClassLibrary().getJavaClass( "java.lang.Enum" ).asType();
+        JavaType OBJECT_TYPE = getJavaClassLibrary().getJavaClass( "java.lang.Object" );
+        JavaType ENUM_TYPE = getJavaClassLibrary().getJavaClass( "java.lang.Enum" );
         
         boolean iAmJavaLangObject = OBJECT_TYPE.equals(asType());
 
@@ -140,7 +140,7 @@
             return OBJECT_TYPE;
         }
 
-        return (JavaType) superClass;
+        return superClass;
     }
     
     /**
@@ -426,7 +426,7 @@
     /* (non-Javadoc)
      * @see com.thoughtworks.qdox.model.JavaClass#asType()
      */
-    public Type asType() {
+    public JavaType asType() {
         return new Type(getFullyQualifiedName(), 0, this);
     }

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java (1395 => 1396)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java	2011-10-10 18:51:18 UTC (rev 1395)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java	2011-10-10 19:54:26 UTC (rev 1396)
@@ -42,8 +42,20 @@
         when(result.getName()).thenReturn( name );
         return result;
     }
-    public abstract JavaParameter newJavaParameter(Type type, String name);
-    public abstract JavaParameter newJavaParameter(Type type, String name, boolean varArgs);
+    
+    public JavaParameter newJavaParameter(JavaType type, String name) {
+        return newJavaParameter( type, name, false );
+    }
+    
+    public JavaParameter newJavaParameter(JavaType type, String name, boolean varArgs)
+    {
+        JavaParameter result = mock(JavaParameter.class);
+        when( result.getType()).thenReturn( type );
+        when( result.getName()).thenReturn( name );
+        when( result.isVarArgs()).thenReturn( varArgs );
+        return result;
+    }
+    
     public abstract JavaSource newJavaSource();
 
     public Type newType( String fullname )
@@ -588,7 +600,8 @@
         JavaMethod setFooMethod = mock(JavaMethod.class);
         when(setFooMethod.getName()).thenReturn( "setFoo" );
         Type intType = newType("int");
-        when(setFooMethod.getParameters()).thenReturn( Collections.singletonList( newJavaParameter( intType, "foo" ) ) );
+        List<JavaParameter> parameters = Collections.singletonList( newJavaParameter( intType, "foo" ) );
+        when(setFooMethod.getParameters()).thenReturn( parameters );
         when(setFooMethod.isPropertyMutator()).thenReturn( true );
         when(setFooMethod.getPropertyName()).thenReturn( "foo" );
         when(setFooMethod.getPropertyType()).thenReturn( intType );

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaClassTest.java (1395 => 1396)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaClassTest.java	2011-10-10 18:51:18 UTC (rev 1395)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaClassTest.java	2011-10-10 19:54:26 UTC (rev 1396)
@@ -33,16 +33,6 @@
         return new DefaultJavaClass( name );
     }
 
-    public JavaParameter newJavaParameter( Type type, String name )
-    {
-        return new DefaultJavaParameter( type, name );
-    }
-
-    public JavaParameter newJavaParameter( Type type, String name, boolean varArgs )
-    {
-        return new DefaultJavaParameter( type, name, varArgs );
-    }
-
     public JavaSource newJavaSource()
     {
         return new DefaultJavaSource(new SortedClassLibraryBuilder().getClassLibrary());

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to