[qdox-scm] [1085] trunk/qdox/src/test/com/thoughtworks/qdox/model: Use generics for JavaParameterTest

[rfscholte]

Title: [1085] trunk/qdox/src/test/com/thoughtworks/qdox/model: Use generics for JavaParameterTest

Revision

1085

Author

rfscholte

Date

2011-02-27 07:39:58 -0600 (Sun, 27 Feb 2011)

Log Message

Use generics for JavaParameterTest

Modified Paths

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

Diff

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

--- trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaParameterTest.java	2011-02-27 13:32:20 UTC (rev 1084)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaParameterTest.java	2011-02-27 13:39:58 UTC (rev 1085)
@@ -1,6 +1,6 @@
 package com.thoughtworks.qdox.model;
 
-public class DefaultJavaParameterTest extends JavaParameterTest
+public class DefaultJavaParameterTest extends JavaParameterTest<DefaultJavaParameter>
 {
 
     public DefaultJavaParameterTest( String s )
@@ -13,7 +13,7 @@
         return new Type(typeName);
     }
 
-    public JavaParameter newJavaParameter( Type type, String name )
+    public DefaultJavaParameter newJavaParameter( Type type, String name )
     {
         return new DefaultJavaParameter(type, name);
     }
@@ -23,10 +23,10 @@
         return new DefaultJavaMethod();
     }
 
-    public void addParameter( JavaMethod method, JavaParameter parameter )
+    @Override
+    public void setMethod( DefaultJavaParameter parameter, JavaMethod method )
     {
+        parameter.setParentMethod( method );
         ((AbstractBaseMethod) method).addParameter( parameter );
-        ((DefaultJavaParameter) parameter).setParentMethod( method );
     }
-
 }

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

--- trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaParameterTest.java	2011-02-27 13:32:20 UTC (rev 1084)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaParameterTest.java	2011-02-27 13:39:58 UTC (rev 1085)
@@ -2,26 +2,29 @@
 
 import junit.framework.TestCase;
 
-public abstract class JavaParameterTest extends TestCase {
+public abstract class JavaParameterTest<P extends JavaParameter> extends TestCase {
 
     public JavaParameterTest(String s) {
         super(s);
     }
     
-    public abstract Type newType(String typeName);
+    //constructors
+    public abstract P newJavaParameter(Type type, String name);
     
-    public abstract JavaParameter newJavaParameter(Type type, String name);
+    //setters
+    public abstract void setMethod(P parameter, JavaMethod method);
+
     
+    public abstract Type newType(String typeName);
     public abstract JavaMethod newJavaMethod();
     
-    public abstract void addParameter(JavaMethod method, JavaParameter parameter);
 
     public void testParentMethod() throws Exception {
-        JavaParameter p = newJavaParameter(newType("x"), "x");
+        P p = newJavaParameter(newType("x"), "x");
         assertNull(p.getParentMethod());
 
         JavaMethod m = newJavaMethod();
-        addParameter(m, p);
+        setMethod( p, m );
         assertSame(m, p.getParentMethod());
     }
 

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email