- Revision
- 1448
- Author
- rfscholte
- Date
- 2011-10-26 16:16:45 -0500 (Wed, 26 Oct 2011)
Log Message
improve usage JavaParameter in DefaultModelWriter
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/impl/DefaultModelWriter.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/writer/impl/DefaultModelWriterTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/impl/DefaultModelWriter.java (1447 => 1448)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/impl/DefaultModelWriter.java 2011-10-26 20:55:34 UTC (rev 1447) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/impl/DefaultModelWriter.java 2011-10-26 21:16:45 UTC (rev 1448) @@ -227,7 +227,7 @@ { buffer.write( constructor.getSourceCode() ); } - buffer.write( "}" ); + buffer.write( '}' ); buffer.newline(); return this; @@ -245,14 +245,7 @@ buffer.write( '(' ); for ( ListIterator<JavaParameter> iter = method.getParameters().listIterator(); iter.hasNext(); ) { - JavaParameter parameter = iter.next(); - buffer.write( parameter.getType().getGenericCanonicalName() ); - if ( parameter.isVarArgs() ) - { - buffer.write( "..." ); - } - buffer.write( ' ' ); - buffer.write( parameter.getName() ); + writeParameter( iter.next() ); if ( iter.hasNext() ) { buffer.write( ", " ); @@ -277,7 +270,7 @@ buffer.write( " {" ); buffer.newline(); buffer.write( method.getSourceCode() ); - buffer.write( "}" ); + buffer.write( '}' ); buffer.newline(); } else @@ -353,7 +346,7 @@ public ModelWriter writeParameter( JavaParameter parameter ) { commentHeader( parameter ); - buffer.write( parameter.getType().getGenericCanonicalName() ); + buffer.write( parameter.getGenericCanonicalName() ); if ( parameter.isVarArgs() ) { buffer.write( "..." );
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java (1447 => 1448)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-10-26 20:55:34 UTC (rev 1447) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-10-26 21:16:45 UTC (rev 1448) @@ -1,7 +1,11 @@ package com.thoughtworks.qdox.model; -import static org.hamcrest.core.IsNot.*; -import static org.junit.Assert.*; +import static org.hamcrest.core.IsNot.not; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -42,6 +46,8 @@ { JavaParameter result = mock(JavaParameter.class); when( result.getType() ).thenReturn( type ); + String genericCanonicalName = type.getGenericCanonicalName(); + when( result.getGenericCanonicalName() ).thenReturn( genericCanonicalName ); when( result.getName() ).thenReturn( name ); when( result.isVarArgs() ).thenReturn( varArgs ); return result; @@ -255,6 +261,8 @@ // when( declaringClass.getFullyQualifiedName() ).thenReturn( "com.foo.bar" ); setParentClass( m8, mock( JavaClass.class ) ); + assertEquals(mth, mth); + assertThat(mth, not(new Object())); assertEquals(mth, m2); assertEquals(m2, mth); assertThat(mth, not(m3));
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/writer/impl/DefaultModelWriterTest.java (1447 => 1448)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/writer/impl/DefaultModelWriterTest.java 2011-10-26 20:55:34 UTC (rev 1447) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/writer/impl/DefaultModelWriterTest.java 2011-10-26 21:16:45 UTC (rev 1448) @@ -240,10 +240,8 @@ public void testJavaParameterVarArgs() { JavaParameter prm = mock( JavaParameter.class ); - JavaType type = mock( JavaType.class ); - when( type.getGenericCanonicalName() ).thenReturn( "java.lang.String" ); - when( prm.getType() ).thenReturn( type ); + when( prm.getGenericCanonicalName() ).thenReturn( "java.lang.String" ); when( prm.getName() ).thenReturn( "argument" ); when( prm.isVarArgs() ).thenReturn( true );
To unsubscribe from this list please visit:
