[qdox-scm] [1143] trunk/qdox/src/test/java/com/thoughtworks/qdox/model: Mock Type for JavaParameterTest

[rfscholte]

Title: [1143] trunk/qdox/src/test/java/com/thoughtworks/qdox/model: Mock Type for JavaParameterTest

Revision

1143

Author

rfscholte

Date

2011-03-28 15:11:43 -0500 (Mon, 28 Mar 2011)

Log Message

Mock Type for JavaParameterTest

Modified Paths

• trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaParameterTest.java
• trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaParameterTest.java

Diff

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaParameterTest.java (1142 => 1143)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaParameterTest.java	2011-03-26 18:19:37 UTC (rev 1142)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaParameterTest.java	2011-03-28 20:11:43 UTC (rev 1143)
@@ -3,25 +3,19 @@
 public class DefaultJavaParameterTest extends JavaParameterTest<DefaultJavaParameter>
 {
 
-    public DefaultJavaParameterTest( String s )
+    protected DefaultJavaParameterTest( String s )
     {
         super( s );
     }
 
     @Override
-    public Type newType( String typeName )
+    protected DefaultJavaParameter newJavaParameter( Type type, String name )
     {
-        return new Type(typeName);
-    }
-
-    @Override
-    public DefaultJavaParameter newJavaParameter( Type type, String name )
-    {
         return new DefaultJavaParameter(type, name);
     }
 
     @Override
-    public void setMethod( DefaultJavaParameter parameter, JavaMethod method )
+    protected void setMethod( DefaultJavaParameter parameter, JavaMethod method )
     {
         parameter.setParentMethod( method );
     }

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaParameterTest.java (1142 => 1143)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaParameterTest.java	2011-03-26 18:19:37 UTC (rev 1142)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaParameterTest.java	2011-03-28 20:11:43 UTC (rev 1143)
@@ -10,12 +10,16 @@
     }
     
     //constructors
-    public abstract P newJavaParameter(Type type, String name);
+    protected abstract P newJavaParameter(Type type, String name);
     
     //setters
-    public abstract void setMethod(P parameter, JavaMethod method);
+    protected abstract void setMethod(P parameter, JavaMethod method);
     
-    public abstract Type newType(String typeName);
+    protected Type newType(String typeName) {
+        Type result = mock(Type.class);
+        when( result.getFullyQualifiedName()).thenReturn( typeName );
+        return result;
+    }
 
     public void testParentMethod() throws Exception {
         P p = newJavaParameter(newType("x"), "x");

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email