- Revision
- 1082
- Author
- rfscholte
- Date
- 2011-02-27 07:20:30 -0600 (Sun, 27 Feb 2011)
Log Message
Use generics for JavaFieldTest
Modified Paths
- trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaFieldTest.java
- trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaFieldTest.java
Diff
Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaFieldTest.java (1081 => 1082)
--- trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaFieldTest.java 2011-02-27 13:15:39 UTC (rev 1081) +++ trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultJavaFieldTest.java 2011-02-27 13:20:30 UTC (rev 1082) @@ -3,7 +3,7 @@ import java.util.List; public class DefaultJavaFieldTest - extends JavaFieldTest + extends JavaFieldTest<DefaultJavaField> { public DefaultJavaFieldTest( String s ) @@ -11,7 +11,7 @@ super( s ); } - public JavaField newJavaField() + public DefaultJavaField newJavaField() { JavaSource source = new DefaultJavaSource( null ); JavaClass javaClass = new DefaultJavaClass( source ); @@ -20,7 +20,7 @@ return result; } - public JavaField newJavaField( Type type, String name ) + public DefaultJavaField newJavaField( Type type, String name ) { return new DefaultJavaField(type, name); } @@ -45,29 +45,29 @@ return new Type( fullname, dimensions ); } - public void setComment( JavaField fld, String comment ) + public void setComment( DefaultJavaField fld, String comment ) { - ((DefaultJavaField) fld).setComment( comment ); + fld.setComment( comment ); } - public void setInitializationExpression( JavaField fld, String _expression_ ) + public void setInitializationExpression( DefaultJavaField fld, String _expression_ ) { - ((DefaultJavaField) fld).setInitializationExpression( _expression_ ); + fld.setInitializationExpression( _expression_ ); } - public void setModifiers( JavaField fld, List<String> modifiers ) + public void setModifiers( DefaultJavaField fld, List<String> modifiers ) { - ((DefaultJavaField) fld).setModifiers( modifiers ); + fld.setModifiers( modifiers ); } - public void setName( JavaField fld, String name ) + public void setName( DefaultJavaField fld, String name ) { - ((DefaultJavaField) fld).setName( name ); + fld.setName( name ); } - public void setType( JavaField fld, Type type ) + public void setType( DefaultJavaField fld, Type type ) { - ((DefaultJavaField) fld).setType( type ); + fld.setType( type ); }
Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaFieldTest.java (1081 => 1082)
--- trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaFieldTest.java 2011-02-27 13:15:39 UTC (rev 1081) +++ trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaFieldTest.java 2011-02-27 13:20:30 UTC (rev 1082) @@ -5,37 +5,41 @@ import junit.framework.TestCase; -public abstract class JavaFieldTest extends TestCase { +public abstract class JavaFieldTest<F extends JavaField> extends TestCase { public JavaFieldTest(String s) { super(s); } - public abstract JavaField newJavaField(); - public abstract JavaField newJavaField(Type type, String name); + //constructors + public abstract F newJavaField(); + public abstract F newJavaField(Type 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, Type type); + public abstract Type newType(String fullname); public abstract Type newType(String fullname, int dimensions); public abstract JavaClass newJavaClass(String fullname); public abstract JavaPackage newJavaPackage(String name); - public abstract void setComment(JavaField fld, String comment); - public abstract void setInitializationExpression(JavaField fld, String _expression_); - public abstract void setModifiers(JavaField fld, List<String> modifiers); - public abstract void setName(JavaField fld, String name); - public abstract void setType(JavaField fld, Type type); public abstract void addField(JavaClass clazz, JavaField fld); public abstract void addClass(JavaPackage pckg, JavaClass clazz); public void testGetCodeBlock() throws Exception { - JavaField fld = newJavaField(); + F fld = newJavaField(); setName(fld, "count"); setType(fld, newType("int")); assertEquals("int count;\n", fld.getCodeBlock()); } public void testGetCodeBlockWithModifiers() throws Exception { - JavaField fld = newJavaField(); + F fld = newJavaField(); setName(fld, "count"); setType(fld, newType("int")); setModifiers(fld, Arrays.asList(new String[]{"public", "final"})); @@ -43,7 +47,7 @@ } public void testGetCodeBlockWithComment() throws Exception { - JavaField fld = newJavaField(); + F fld = newJavaField(); setName(fld, "count"); setType(fld, newType("int")); setComment(fld, "Hello"); @@ -56,7 +60,7 @@ } public void testGetCodeBlock1dArray() throws Exception { - JavaField fld = newJavaField(); + F fld = newJavaField(); setName(fld, "count"); setType(fld, newType("int", 1)); String expected = "int[] count;\n"; @@ -64,7 +68,7 @@ } public void testGetCodeBlock2dArray() throws Exception { - JavaField fld = newJavaField(); + F fld = newJavaField(); setName(fld, "count"); setType(fld, newType("int", 2)); String expected = "int[][] count;\n"; @@ -72,7 +76,7 @@ } public void testGetCodeBlockWithValue() throws Exception { - JavaField fld = newJavaField(); + F fld = newJavaField(); setName(fld, "stuff"); setType(fld, newType("String")); setInitializationExpression(fld, "STUFF + getThing()"); @@ -81,7 +85,7 @@ } public void testShouldReturnFieldNameForCallSignature() throws Exception { - JavaField fld = newJavaField(); + F fld = newJavaField(); setName(fld, "count"); setType(fld, newType("int")); setModifiers(fld, Arrays.asList(new String[]{"public", "final"})); @@ -89,7 +93,7 @@ } public void testShouldReturnProperDeclarationSignatureWithModifiers() throws Exception { - JavaField fld = newJavaField(); + F fld = newJavaField(); setName(fld, "count"); setType(fld, newType("int")); setModifiers(fld, Arrays.asList(new String[]{"public", "final"})); @@ -97,7 +101,7 @@ } public void testShouldReturnProperDeclarationSignatureWithoutModifiers() throws Exception { - JavaField fld = newJavaField(); + F fld = newJavaField(); setName(fld, "count"); setType(fld, newType("int")); setModifiers(fld, Arrays.asList(new String[]{"public", "final"})); @@ -106,7 +110,7 @@ public void testToStringThreadMIN_PRIORITY() throws Exception { JavaClass cls = newJavaClass("java.lang.Thread"); - JavaField fld = newJavaField(newType("int"), "MIN_PRIORITY"); + F fld = newJavaField(newType("int"), "MIN_PRIORITY"); setModifiers(fld, Arrays.asList(new String[] {"final", "static", "public"})); addField(cls, fld); assertEquals("public static final int java.lang.Thread.MIN_PRIORITY", fld.toString()); @@ -116,7 +120,7 @@ JavaPackage pckg = newJavaPackage("java.io"); JavaClass cls = newJavaClass("FileDescriptor"); addClass(pckg, cls); - JavaField fld = newJavaField(newType("int"), "fd"); + F fld = newJavaField(newType("int"), "fd"); setModifiers(fld, Arrays.asList(new String[]{"private"})); addField(cls, fld); assertEquals("private int java.io.FileDescriptor.fd", fld.toString());
To unsubscribe from this list please visit:
