[qdox-scm] [1298] trunk/qdox/src/test/java/com/thoughtworks/qdox/model: Fix DefaultJavaConstructor.equals()

[rfscholte]

Title: [1298] trunk/qdox/src/test/java/com/thoughtworks/qdox/model: Fix DefaultJavaConstructor.equals()

Revision

1298

Author

rfscholte

Date

2011-08-16 04:59:59 -0500 (Tue, 16 Aug 2011)

Log Message

Fix DefaultJavaConstructor.equals()

Modified Paths

• trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java
• trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaConstructorTest.java

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java (1297 => 1298)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java	2011-08-16 09:53:41 UTC (rev 1297)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaConstructor.java	2011-08-16 09:59:59 UTC (rev 1298)
@@ -94,6 +94,12 @@
         }
 
         JavaConstructor c = (JavaConstructor) obj;
+        
+        if ( c.getDeclaringClass() != null ? !c.getDeclaringClass().equals( this.getDeclaringClass() ) : this.getDeclaringClass() != null )
+        {
+            return false;
+        }
+        
         if ( !c.getName().equals( getName() ) )
         {
             return false;

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaConstructorTest.java (1297 => 1298)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaConstructorTest.java	2011-08-16 09:53:41 UTC (rev 1297)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaConstructorTest.java	2011-08-16 09:59:59 UTC (rev 1298)
@@ -79,16 +79,23 @@
     }
     
     @Test
-    public void testEquals() throws Exception {
+    public void testEquals()
+        throws Exception
+    {
         D c1 = newJavaConstructor( "thing" );
         D c2 = newJavaConstructor( "Thong" );
         D c3 = newJavaConstructor( "Thong" );
-        
-        assertNotEquals(c1, c2);
-        assertEquals(c2, c3);
+
+        D c4 = newJavaConstructor( "Thong" );
+        setParentClass( c4, mock( JavaClass.class ) );
+
+        assertNotEquals( c1, c2 );
+        assertEquals( c2, c3 );
+        assertNotEquals( c3, c4 );
     }
-    
-    private void assertNotEquals(Object o1, Object o2) {
-        assertTrue(o1.toString() + " should not equals " + o2.toString(), !o1.equals(o2));
+
+    private void assertNotEquals( Object o1, Object o2 )
+    {
+        assertTrue( o1.toString() + " should not equals " + o2.toString(), !o1.equals( o2 ) );
     }
 }

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email