- Revision
- 1297
- Author
- rfscholte
- Date
- 2011-08-16 04:53:41 -0500 (Tue, 16 Aug 2011)
Log Message
Fix DefaultJavaMethod.equals()
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java (1296 => 1297)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-08-16 09:26:42 UTC (rev 1296) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-08-16 09:53:41 UTC (rev 1297) @@ -161,6 +161,11 @@ } JavaMethod other = (JavaMethod) obj; + if ( other.getDeclaringClass() != null ? !other.getDeclaringClass().equals( this.getDeclaringClass() ) : this.getDeclaringClass() != null ) + { + return false; + } + //use 'this' from here to make it better readable if ( other.getName() != null ? !other.getName().equals( this.getName() ) : this.getName() != null ) {
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java (1296 => 1297)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-08-16 09:26:42 UTC (rev 1296) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-08-16 09:53:41 UTC (rev 1297) @@ -196,6 +196,12 @@ M m7 = newJavaMethod(); setReturns(m7, newType("int")); + + M m8 = newJavaMethod(); + setReturns(m8, newType("int")); +// JavaClass declaringClass = mock( JavaClass.class ); +// when( declaringClass.getFullyQualifiedName() ).thenReturn( "com.foo.bar" ); + setParentClass( m8, mock( JavaClass.class ) ); assertEquals(mth, m2); assertEquals(m2, mth); @@ -206,6 +212,8 @@ assertNotEquals( m5, m4 ); assertEquals( m5, m6 ); assertNotEquals( m5, m7 ); + + assertNotEquals( m7, m8 ); } public void testEqualsWithParameters() throws Exception {
To unsubscribe from this list please visit:
