[qdox-scm] [1342] trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaParameterTest.java: improve JavaParameterTest: equals must ignore name

[rfscholte]

Title: [1342] trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaParameterTest.java: improve JavaParameterTest: equals must ignore name

Revision

1342

Author

rfscholte

Date

2011-10-01 09:44:34 -0500 (Sat, 01 Oct 2011)

Log Message

improve JavaParameterTest: equals must ignore name

Modified Paths

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

Diff

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

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaParameterTest.java	2011-10-01 12:42:50 UTC (rev 1341)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaParameterTest.java	2011-10-01 14:44:34 UTC (rev 1342)
@@ -4,12 +4,15 @@
 import static org.mockito.Mockito.when;
 import junit.framework.TestCase;
 
-public abstract class JavaParameterTest<P extends JavaParameter> extends TestCase {
+public abstract class JavaParameterTest<P extends JavaParameter>
+    extends TestCase
+{
 
-    public JavaParameterTest(String s) {
-        super(s);
+    public JavaParameterTest( String s )
+    {
+        super( s );
     }
-    
+
     // constructors
     protected abstract P newJavaParameter( Type type, String name );
 
@@ -17,38 +20,45 @@
 
     // setters
     protected abstract void setMethod( P parameter, JavaMethod method );
-    
+
+    protected Type newType( String typeName )
+    {
+        Type result = mock( Type.class );
+        when( result.getFullyQualifiedName() ).thenReturn( typeName );
+        return result;
+    }
+
     public void testHashCode()
     {
         assertTrue( "hashCode should never resolve to 0", newJavaParameter( Type.VOID, "" ).hashCode() != 0 );
-        
+
         P simpleParameter = newJavaParameter( Type.VOID, "", false );
         P varArgParameter = newJavaParameter( Type.VOID, "", true );
-        
-        assertTrue( simpleParameter.hashCode() != varArgParameter.hashCode() );        
+
+        assertTrue( simpleParameter.hashCode() != varArgParameter.hashCode() );
     }
-    
+
     public void testEquals()
     {
         P simpleParameter = newJavaParameter( Type.VOID, "", false );
         P varArgParameter = newJavaParameter( Type.VOID, "", true );
-        
-        assertTrue( !simpleParameter.equals( varArgParameter ) );        
+        assertTrue( !simpleParameter.equals( varArgParameter ) );
+
+        // name of parameter shouldn't matter
+        P fooParameter = newJavaParameter( Type.VOID, "foo" );
+        P barParameter = newJavaParameter( Type.VOID, "bar" );
+        assertEquals( fooParameter, barParameter );
     }
-    
-    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");
-        assertNull(p.getParentMethod());
+    public void testParentMethod()
+        throws Exception
+    {
+        P p = newJavaParameter( newType( "x" ), "x" );
+        assertNull( p.getParentMethod() );
 
-        JavaMethod m = mock(JavaMethod.class);
+        JavaMethod m = mock( JavaMethod.class );
         setMethod( p, m );
-        assertSame(m, p.getParentMethod());
+        assertSame( m, p.getParentMethod() );
     }
 
 }

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email