Log Message
Use only interfaces in JavaMethodTest (except DefaultJavaType.VOID)
Modified Paths
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaMethodTest.java
Diff
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java (1462 => 1463)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-12-28 14:48:11 UTC (rev 1462)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-12-28 14:51:49 UTC (rev 1463)
@@ -24,7 +24,7 @@
//constructors
public abstract M newJavaMethod();
- public abstract M newJavaMethod(DefaultJavaType returns, String name);
+ public abstract M newJavaMethod(JavaClass returns, String name);
//setters
public abstract void setExceptions(M method, List<JavaClass> exceptions);
@@ -33,15 +33,15 @@
public abstract void setModifiers(M method, List<String> modifiers);
public abstract void setParameters(M method, List<JavaParameter> parameters);
public abstract void setParentClass(M method, JavaClass clazz);
- public abstract void setReturns(M method, DefaultJavaType type);
+ public abstract void setReturns(M method, JavaClass type);
public abstract void setSourceCode(M method, String code);
- public JavaParameter newJavaParameter(DefaultJavaType type, String name)
+ public JavaParameter newJavaParameter(JavaClass type, String name)
{
return newJavaParameter( type, name, false );
}
- public JavaParameter newJavaParameter(DefaultJavaType type, String name, boolean varArgs)
+ public JavaParameter newJavaParameter(JavaClass type, String name, boolean varArgs)
{
JavaParameter result = mock(JavaParameter.class);
when( result.getType() ).thenReturn( type );
@@ -52,14 +52,14 @@
return result;
}
- public DefaultJavaType newType( String fullname )
+ public JavaClass newType( String fullname )
{
return newType( fullname, 0 );
}
- public DefaultJavaType newType(String fullname, int dimensions)
+ public JavaClass newType(String fullname, int dimensions)
{
- DefaultJavaType result = mock( DefaultJavaType.class );
+ JavaClass result = mock( JavaClass.class );
when( result.getFullyQualifiedName() ).thenReturn( fullname );
String canonicalName = fullname.replace( '$', '.' );
when( result.getValue() ).thenReturn( canonicalName );
@@ -231,7 +231,7 @@
@Test
public void testEquals() throws Exception {
- DefaultJavaType voidType = newType("void");
+ JavaClass voidType = newType("void");
setName(mth, "thing");
setReturns(mth, voidType);
@@ -276,10 +276,10 @@
@Test
public void testEqualsWithParameters() throws Exception {
- DefaultJavaType voidType = newType("void");
- DefaultJavaType intArrayType = newType("int", 1);
- DefaultJavaType stringArrayType = newType("java.lang.String", 2);
- DefaultJavaType xArrayType = newType("X", 3);
+ JavaClass voidType = newType("void");
+ JavaClass intArrayType = newType("int", 1);
+ JavaClass stringArrayType = newType("java.lang.String", 2);
+ JavaClass xArrayType = newType("X", 3);
JavaParameter intArrayParam = newJavaParameter(intArrayType, "blah");
JavaParameter stringArrayParam = newJavaParameter(stringArrayType, "thing");
@@ -318,10 +318,10 @@
{
assertTrue( "hashCode should never resolve to 0", newJavaMethod( DefaultJavaType.VOID, "" ).hashCode() != 0 );
- DefaultJavaType voidType = newType( "void" );
- DefaultJavaType intType = newType( "int", 1 );
- DefaultJavaType stringArrayType = newType( "java.lang.String", 2 );
- DefaultJavaType xArrayType = newType( "X", 3 );
+ JavaClass voidType = newType( "void" );
+ JavaClass intType = newType( "int", 1 );
+ JavaClass stringArrayType = newType( "java.lang.String", 2 );
+ JavaClass xArrayType = newType( "X", 3 );
JavaParameter intParam = newJavaParameter( intType, "blah" );
JavaParameter stringArrayParam = newJavaParameter( stringArrayType, "thing" );
@@ -347,24 +347,24 @@
@Test
public void testSignatureMatches() throws Exception {
- DefaultJavaType intType = newType("int");
- DefaultJavaType longArrayType = newType("long", 2);
+ JavaClass intType = newType("int");
+ JavaClass longArrayType = newType("long", 2);
setName(mth, "thing");
setParameters(mth, Arrays.asList( newJavaParameter(intType, "x"), newJavaParameter(longArrayType, "y") ));
setReturns(mth, newType("void"));
- JavaType[] correctTypes = new DefaultJavaType[]{
+ JavaType[] correctTypes = new JavaClass[]{
intType,
longArrayType
};
- JavaType[] wrongTypes1 = new DefaultJavaType[]{
+ JavaType[] wrongTypes1 = new JavaClass[]{
newType("int", 2),
newType("long")
};
- JavaType[] wrongTypes2 = new DefaultJavaType[]{
+ JavaType[] wrongTypes2 = new JavaClass[]{
intType,
longArrayType,
newType("double")
@@ -378,24 +378,24 @@
@Test
public void testVarArgSignatureMatches() throws Exception {
- DefaultJavaType intType = newType("int");
- DefaultJavaType longArrayType = newType("long", 2);
+ JavaClass intType = newType("int");
+ JavaClass longArrayType = newType("long", 2);
setName(mth, "thing");
setParameters(mth, Arrays.asList( newJavaParameter(intType, "x"), newJavaParameter(longArrayType, "y", true) ));
setReturns(mth, newType("void"));
- JavaType[] correctTypes = new DefaultJavaType[]{
+ JavaType[] correctTypes = new JavaClass[]{
intType,
longArrayType
};
- JavaType[] wrongTypes1 = new DefaultJavaType[]{
+ JavaType[] wrongTypes1 = new JavaClass[]{
newType("int", 2),
newType("long")
};
- JavaType[] wrongTypes2 = new DefaultJavaType[]{
+ JavaType[] wrongTypes2 = new JavaClass[]{
intType,
longArrayType,
newType("double")
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaMethodTest.java (1462 => 1463)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaMethodTest.java 2011-12-28 14:48:11 UTC (rev 1462)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaMethodTest.java 2011-12-28 14:51:49 UTC (rev 1463)
@@ -6,7 +6,6 @@
import com.thoughtworks.qdox.model.JavaMethodTest;
import com.thoughtworks.qdox.model.JavaParameter;
import com.thoughtworks.qdox.model.impl.DefaultJavaMethod;
-import com.thoughtworks.qdox.model.impl.DefaultJavaType;
public class DefaultJavaMethodTest
extends JavaMethodTest<DefaultJavaMethod>
@@ -17,7 +16,7 @@
return new DefaultJavaMethod();
}
- public DefaultJavaMethod newJavaMethod( DefaultJavaType returns, String name )
+ public DefaultJavaMethod newJavaMethod( JavaClass returns, String name )
{
return new DefaultJavaMethod( returns, name );
}
@@ -42,7 +41,7 @@
method.setModifiers( modifiers );
}
- public void setReturns( DefaultJavaMethod method, DefaultJavaType type )
+ public void setReturns( DefaultJavaMethod method, JavaClass type )
{
method.setReturns( type );
}
To unsubscribe from this list please visit:
