- Revision
- 1146
- Author
- rfscholte
- Date
- 2011-03-30 15:45:07 -0500 (Wed, 30 Mar 2011)
Log Message
mock JavaPackage for JavaClassTest
Modified Paths
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaClassTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java
Diff
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaClassTest.java (1145 => 1146)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaClassTest.java 2011-03-28 21:22:03 UTC (rev 1145) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaClassTest.java 2011-03-30 20:45:07 UTC (rev 1146) @@ -23,11 +23,6 @@ return new DefaultJavaClass( name ); } - public JavaPackage newJavaPackage( String name ) - { - return new DefaultJavaPackage( name ); - } - public JavaParameter newJavaParameter( Type type, String name ) { return new DefaultJavaParameter( type, name ); @@ -50,12 +45,6 @@ ((DefaultJavaClass) innerClazz).setParentClass( clazz ); } - public void addClass( JavaPackage pckg, JavaClass clazz ) - { - ((DefaultJavaPackage) pckg).addClass( clazz ); - ((DefaultJavaClass) clazz).setJavaPackage( pckg ); - } - public void addClass( JavaSource source, JavaClass clazz ) { ((DefaultJavaClass) clazz).setSource( source ); @@ -93,6 +82,11 @@ clazz.setName( name ); } + public void setPackage( DefaultJavaClass clazz, JavaPackage pckg ) + { + clazz.setJavaPackage( pckg ); + } + public void setPackage( JavaSource source, JavaPackage pckg ) { ((DefaultJavaSource) source).setPackage( pckg );
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java (1145 => 1146)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java 2011-03-28 21:22:03 UTC (rev 1145) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java 2011-03-30 20:45:07 UTC (rev 1146) @@ -1,13 +1,14 @@ package com.thoughtworks.qdox.model; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import static org.mockito.Mockito.*; - import junit.framework.TestCase; public abstract class JavaClassTest<C extends JavaClass> extends TestCase { @@ -32,10 +33,15 @@ public abstract void setMethods(C clazz, List<JavaMethod> method); public abstract void setModifiers(C clazz, List<String> modifiers); public abstract void setName(C clazz, String name); + public abstract void setPackage(C clazz, JavaPackage pckg); public abstract void setSuperClass(C clazz, Type type); public abstract void setSource( C clazz, JavaSource source ); - public abstract JavaPackage newJavaPackage(String name); + public JavaPackage newJavaPackage(String name) { + JavaPackage result = mock(JavaPackage.class); + when(result.getName()).thenReturn( name ); + return result; + } public abstract JavaParameter newJavaParameter(Type type, String name); public abstract JavaParameter newJavaParameter(Type type, String name, boolean varArgs); public abstract JavaSource newJavaSource(); @@ -53,7 +59,6 @@ public abstract void setPackage(JavaSource source, JavaPackage pckg); public abstract void addClass(JavaClass clazz, JavaClass innerClazz); - public abstract void addClass(JavaPackage pckg, JavaClass clazz); public abstract void addClass(JavaSource source, JavaClass clazz); protected void setUp() throws Exception { @@ -577,17 +582,17 @@ public void testInnerClassToString() throws Exception { JavaPackage jPackage = newJavaPackage("com.thoughtworks.qdox.model"); - JavaClass jOuterClass = newJavaClass("OuterClass"); - addClass(jPackage, jOuterClass); - JavaClass jInnerClass = newJavaClass("InnerClass"); + C jOuterClass = newJavaClass("OuterClass"); + setPackage(jOuterClass, jPackage); + C jInnerClass = newJavaClass("InnerClass"); addClass(jOuterClass, jInnerClass); assertEquals("class com.thoughtworks.qdox.model.OuterClass$InnerClass", jInnerClass.toString()); } public void testInnerClassType() { JavaPackage jPackage = newJavaPackage("com.thoughtworks.qdox.model"); - JavaClass jOuterClass = newJavaClass("OuterClass"); - addClass(jPackage, jOuterClass); + C jOuterClass = newJavaClass("OuterClass"); + setPackage( jOuterClass, jPackage ); JavaClass jInnerClass = newJavaClass("InnerClass"); addClass(jOuterClass, jInnerClass); assertEquals("com.thoughtworks.qdox.model.OuterClass.InnerClass", jInnerClass.asType().getValue()); @@ -595,8 +600,8 @@ public void testInnerInterfaceToString() { JavaPackage jPackage = newJavaPackage("com.thoughtworks.qdox.model"); - JavaClass jOuterClass = newJavaClass("OuterClass"); - addClass(jPackage, jOuterClass); + C jOuterClass = newJavaClass("OuterClass"); + setPackage( jOuterClass, jPackage ); C jInnerInterface = newJavaClass("InnerInterface"); setInterface(jInnerInterface, true); addClass(jOuterClass, jInnerInterface);
To unsubscribe from this list please visit:
