- Revision
- 1341
- Author
- rfscholte
- Date
- 2011-10-01 07:42:50 -0500 (Sat, 01 Oct 2011)
Log Message
More Mocks for tests
Modified Paths
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java
Diff
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java (1340 => 1341)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java 2011-09-30 21:24:22 UTC (rev 1340) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java 2011-10-01 12:42:50 UTC (rev 1341) @@ -21,16 +21,6 @@ return new DefaultJavaMethod( returns, name ); } - public JavaParameter newJavaParameter( Type type, String name ) - { - return new DefaultJavaParameter( type, name ); - } - - public JavaParameter newJavaParameter( Type type, String name, boolean varArgs ) - { - return new DefaultJavaParameter( type, name, varArgs ); - } - public void setExceptions( DefaultJavaMethod method, List<JavaClass> exceptions ) { method.setExceptions( exceptions );
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java (1340 => 1341)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-09-30 21:24:22 UTC (rev 1340) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-10-01 12:42:50 UTC (rev 1341) @@ -32,9 +32,20 @@ public abstract void setSourceCode(M method, String code); - public abstract JavaParameter newJavaParameter(Type type, String name); - public abstract JavaParameter newJavaParameter(Type type, String name, boolean varArgs); + public JavaParameter newJavaParameter(Type type, String name) + { + return newJavaParameter( type, name, false ); + } + public JavaParameter newJavaParameter(Type type, String name, boolean varArgs) + { + JavaParameter result = mock(JavaParameter.class); + when( result.getType() ).thenReturn( type ); + when( result.getName() ).thenReturn( name ); + when( result.isVarArgs() ).thenReturn( varArgs ); + return result; + } + public Type newType( String fullname ) { return newType( fullname, 0 ); @@ -242,63 +253,67 @@ Type stringArrayType = newType("java.lang.String", 2); Type xArrayType = newType("X", 3); - setName(mth, "thing"); - setParameters(mth, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "thing"), newJavaParameter(xArrayType, "") )); - setReturns(mth, voidType); + JavaParameter intArrayParam = newJavaParameter(intArrayType, "blah"); + JavaParameter stringArrayParam = newJavaParameter(stringArrayType, "thing"); + JavaParameter xArrayParameter = newJavaParameter(xArrayType, "blah"); + + setName( mth, "thing" ); + setParameters( mth, Arrays.asList( intArrayParam, stringArrayParam, xArrayParameter ) ); + setReturns( mth, voidType ); M m2 = newJavaMethod(); - setName(m2, "thing"); - setParameters(m2, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "anotherName"), newJavaParameter(xArrayType, "blah") )); - setReturns(m2, voidType); + setName( m2, "thing" ); + setParameters( m2, Arrays.asList( intArrayParam, stringArrayParam, xArrayParameter ) ); + setReturns( m2, voidType ); M m3 = newJavaMethod(); - setName(m3, "thing"); - setParameters(m3, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "thing") ) ); - setReturns(m3, voidType); + setName( m3, "thing" ); + setParameters( m3, Arrays.asList( intArrayParam, stringArrayParam ) ); + setReturns( m3, voidType ); - // name - M m4 = newJavaMethod(); - setName(m4, "thing"); - setParameters(m4, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "thing"), newJavaParameter(newType("TTTTTTTT", 3), "blah") )); - setReturns(m4, voidType); - // dimension M m5 = newJavaMethod(); - setName(m5, "thing"); - setParameters(m5, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "thing"), newJavaParameter(newType("X", 9), "blah") )); - setReturns(m5, voidType); + setName( m5, "thing" ); + setParameters( m5, + Arrays.asList( intArrayParam, stringArrayParam, newJavaParameter( newType( "X", 9 ), "blah" ) ) ); + setReturns( m5, voidType ); - assertEquals(mth, m2); - assertEquals(m2, mth); - assertNotEquals(mth, m3); - assertNotEquals(mth, m4); - assertNotEquals(mth, m5); + assertEquals( mth, m2 ); + assertEquals( m2, mth ); + assertNotEquals( mth, m3 ); + assertNotEquals( mth, m5 ); } - public void testHashCode() throws Exception { + public void testHashCode() + throws Exception + { assertTrue( "hashCode should never resolve to 0", newJavaMethod( Type.VOID, "" ).hashCode() != 0 ); - Type voidType = newType("void"); - Type intType = newType("int", 1); - Type stringArrayType = newType("java.lang.String", 2); - Type xArrayType = newType("X", 3); - - setName(mth, "thing"); - setParameters(mth, Arrays.asList( newJavaParameter(intType, "blah"), newJavaParameter(stringArrayType, "thing"), newJavaParameter(xArrayType, "") )); - setReturns(mth, voidType); + Type voidType = newType( "void" ); + Type intType = newType( "int", 1 ); + Type stringArrayType = newType( "java.lang.String", 2 ); + Type xArrayType = newType( "X", 3 ); + JavaParameter intParam = newJavaParameter( intType, "blah" ); + JavaParameter stringArrayParam = newJavaParameter( stringArrayType, "thing" ); + JavaParameter xArrayParam = newJavaParameter( xArrayType, "blah" ); + + setName( mth, "thing" ); + setParameters( mth, Arrays.asList( intParam, stringArrayParam, xArrayParam ) ); + setReturns( mth, voidType ); + M m2 = newJavaMethod(); - setName(m2, "thing"); - setParameters(m2, Arrays.asList( newJavaParameter(intType, "blah"), newJavaParameter(stringArrayType, "anotherName"), newJavaParameter(xArrayType, "blah") )); - setReturns(m2, voidType); + setName( m2, "thing" ); + setParameters( m2, Arrays.asList( intParam, stringArrayParam, xArrayParam ) ); + setReturns( m2, voidType ); M m3 = newJavaMethod(); - setName(m3, "thing"); - setParameters(m3, Arrays.asList( newJavaParameter(intType, "blah"), newJavaParameter(stringArrayType, "thing"))); - setReturns(m3, voidType); + setName( m3, "thing" ); + setParameters( m3, Arrays.asList( intParam, stringArrayParam ) ); + setReturns( m3, voidType ); - assertEquals(mth.hashCode(), m2.hashCode()); - assertTrue(mth.hashCode() != m3.hashCode()); + assertEquals( mth.hashCode(), m2.hashCode() ); + assertTrue( mth.hashCode() != m3.hashCode() ); } public void testSignatureMatches() throws Exception {
To unsubscribe from this list please visit:
