Log Message
Use only interfaces in JavaFieldTest
Modified Paths
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaFieldTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaFieldTest.java
Diff
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaFieldTest.java (1461 => 1462)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaFieldTest.java 2011-12-28 14:43:11 UTC (rev 1461)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaFieldTest.java 2011-12-28 14:48:11 UTC (rev 1462)
@@ -1,13 +1,10 @@
package com.thoughtworks.qdox.model;
-import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.*;
import java.util.Arrays;
import java.util.List;
-import com.thoughtworks.qdox.model.impl.DefaultJavaType;
-
import junit.framework.TestCase;
public abstract class JavaFieldTest<F extends JavaField> extends TestCase {
@@ -18,24 +15,24 @@
//constructors
public abstract F newJavaField();
- public abstract F newJavaField(DefaultJavaType type, String name);
+ public abstract F newJavaField(JavaClass type, String name);
//setters
public abstract void setComment(F fld, String comment);
public abstract void setInitializationExpression(F fld, String _expression_);
public abstract void setModifiers(F fld, List<String> modifiers);
public abstract void setName(F fld, String name);
- public abstract void setType(F fld, DefaultJavaType type);
+ public abstract void setType(F fld, JavaClass type);
public abstract void setDeclaringClass(F fld, JavaClass cls);
- public DefaultJavaType newType( String fullname )
+ public JavaClass newJavaClass( String fullname )
{
- return newType( fullname, 0 );
+ return newJavaClass( fullname, 0 );
}
- public DefaultJavaType newType(String fullname, int dimensions)
+ public JavaClass newJavaClass(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 );
@@ -57,14 +54,14 @@
public void testGetCodeBlock() throws Exception {
F fld = newJavaField();
setName(fld, "count");
- setType(fld, newType("int"));
+ setType(fld, newJavaClass("int"));
assertEquals("int count;\n", fld.getCodeBlock());
}
public void testGetCodeBlockWithModifiers() throws Exception {
F fld = newJavaField();
setName(fld, "count");
- setType(fld, newType("int"));
+ setType(fld, newJavaClass("int"));
setModifiers(fld, Arrays.asList(new String[]{"public", "final"}));
assertEquals("public final int count;\n", fld.getCodeBlock());
}
@@ -72,7 +69,7 @@
public void testGetCodeBlockWithComment() throws Exception {
F fld = newJavaField();
setName(fld, "count");
- setType(fld, newType("int"));
+ setType(fld, newJavaClass("int"));
setComment(fld, "Hello");
String expected = ""
+ "/**\n"
@@ -85,7 +82,7 @@
public void testGetCodeBlock1dArray() throws Exception {
F fld = newJavaField();
setName(fld, "count");
- setType(fld, newType("int", 1));
+ setType(fld, newJavaClass("int", 1));
String expected = "int[] count;\n";
assertEquals(expected, fld.getCodeBlock());
}
@@ -93,7 +90,7 @@
public void testGetCodeBlock2dArray() throws Exception {
F fld = newJavaField();
setName(fld, "count");
- setType(fld, newType("int", 2));
+ setType(fld, newJavaClass("int", 2));
String expected = "int[][] count;\n";
assertEquals(expected, fld.getCodeBlock());
}
@@ -101,7 +98,7 @@
public void testGetCodeBlockWithValue() throws Exception {
F fld = newJavaField();
setName(fld, "stuff");
- setType(fld, newType("String"));
+ setType(fld, newJavaClass("String"));
setInitializationExpression(fld, "STUFF + getThing()");
String expected = "String stuff = STUFF + getThing();\n";
assertEquals(expected, fld.getCodeBlock());
@@ -110,7 +107,7 @@
public void testShouldReturnFieldNameForCallSignature() throws Exception {
F fld = newJavaField();
setName(fld, "count");
- setType(fld, newType("int"));
+ setType(fld, newJavaClass("int"));
setModifiers(fld, Arrays.asList(new String[]{"public", "final"}));
assertEquals("count", fld.getCallSignature());
}
@@ -118,7 +115,7 @@
public void testShouldReturnProperDeclarationSignatureWithModifiers() throws Exception {
F fld = newJavaField();
setName(fld, "count");
- setType(fld, newType("int"));
+ setType(fld, newJavaClass("int"));
setModifiers(fld, Arrays.asList(new String[]{"public", "final"}));
assertEquals("public final int count", fld.getDeclarationSignature(true));
}
@@ -126,7 +123,7 @@
public void testShouldReturnProperDeclarationSignatureWithoutModifiers() throws Exception {
F fld = newJavaField();
setName(fld, "count");
- setType(fld, newType("int"));
+ setType(fld, newJavaClass("int"));
setModifiers(fld, Arrays.asList(new String[]{"public", "final"}));
assertEquals("int count", fld.getDeclarationSignature(false));
}
@@ -134,7 +131,7 @@
public void testToStringThreadMIN_PRIORITY() throws Exception {
JavaClass cls = mock(JavaClass.class);
when(cls.getFullyQualifiedName()).thenReturn( "java.lang.Thread" );
- F fld = newJavaField(newType("int"), "MIN_PRIORITY");
+ F fld = newJavaField(newJavaClass("int"), "MIN_PRIORITY");
setModifiers(fld, Arrays.asList(new String[] {"final", "static", "public"}));
setDeclaringClass( fld, cls );
assertEquals("public static final int java.lang.Thread.MIN_PRIORITY", fld.toString());
@@ -143,7 +140,7 @@
public void testToStringFieldDescriptorFd() throws Exception {
JavaClass cls = mock(JavaClass.class);
when(cls.getFullyQualifiedName()).thenReturn("java.io.FileDescriptor");
- F fld = newJavaField(newType("int"), "fd");
+ F fld = newJavaField(newJavaClass("int"), "fd");
setModifiers(fld, Arrays.asList(new String[]{"private"}));
setDeclaringClass( fld, cls );
assertEquals("private int java.io.FileDescriptor.fd", fld.toString());
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaFieldTest.java (1461 => 1462)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaFieldTest.java 2011-12-28 14:43:11 UTC (rev 1461)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaFieldTest.java 2011-12-28 14:48:11 UTC (rev 1462)
@@ -26,9 +26,9 @@
}
@Override
- public DefaultJavaField newJavaField( DefaultJavaType type, String name )
+ public DefaultJavaField newJavaField( JavaClass type, String name )
{
- return new DefaultJavaField(type, name);
+ return new DefaultJavaField( type, name );
}
@Override
@@ -56,7 +56,7 @@
}
@Override
- public void setType( DefaultJavaField fld, DefaultJavaType type )
+ public void setType( DefaultJavaField fld, JavaClass type )
{
fld.setType( type );
}
@@ -66,5 +66,4 @@
{
fld.setParentClass( cls );
}
-
-}
+}
\ No newline at end of file
To unsubscribe from this list please visit:
