- Revision
- 1437
- Author
- rfscholte
- Date
- 2011-10-22 15:21:09 -0500 (Sat, 22 Oct 2011)
Log Message
mocking DocletTagFactory for ModelBuilderTest
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTagFactory.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/impl/ModelBuilderTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTagFactory.java (1436 => 1437)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTagFactory.java 2011-10-22 15:33:26 UTC (rev 1436) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DocletTagFactory.java 2011-10-22 20:21:09 UTC (rev 1437) @@ -21,8 +21,6 @@ import java.io.Serializable; -import com.thoughtworks.qdox.model.impl.AbstractJavaModel; - /** * @author Aslak Hellesøy * @version $Revision$
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/impl/ModelBuilderTest.java (1436 => 1437)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/impl/ModelBuilderTest.java 2011-10-22 15:33:26 UTC (rev 1436) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/impl/ModelBuilderTest.java 2011-10-22 20:21:09 UTC (rev 1437) @@ -1,17 +1,18 @@ package com.thoughtworks.qdox.builder.impl; +import static org.mockito.Mockito.*; + import java.util.List; import junit.framework.TestCase; import com.thoughtworks.qdox.library.ClassNameLibrary; +import com.thoughtworks.qdox.model.DocletTagFactory; import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaConstructor; import com.thoughtworks.qdox.model.JavaField; import com.thoughtworks.qdox.model.JavaMethod; import com.thoughtworks.qdox.model.JavaSource; -import com.thoughtworks.qdox.model.impl.DefaultDocletTagFactory; -import com.thoughtworks.qdox.model.impl.DefaultJavaType; import com.thoughtworks.qdox.parser.structs.ClassDef; import com.thoughtworks.qdox.parser.structs.FieldDef; import com.thoughtworks.qdox.parser.structs.MethodDef; @@ -22,14 +23,17 @@ public class ModelBuilderTest extends TestCase { private ModelBuilder builder; + private DocletTagFactory docletTagFactory; public ModelBuilderTest(String s) { super(s); } - protected void setUp() throws Exception { - super.setUp(); - builder = new ModelBuilder(new ClassNameLibrary(), new DefaultDocletTagFactory()); + protected void setUp() + throws Exception + { + docletTagFactory = mock( DocletTagFactory.class ); + builder = new ModelBuilder( new ClassNameLibrary(), docletTagFactory ); } public void testNumberOfClassesGrows() throws Exception { @@ -684,15 +688,18 @@ builder.addJavaDoc("Hello"); builder.addJavaDocTag(new TagDef("cheese", "is good")); builder.beginClass(new ClassDef()); - builder.endClass(); JavaSource source = builder.getSource(); assertEquals("Hello", source.getClasses().get(0).getComment()); assertEquals(1, source.getClasses().get(0).getTags().size()); - assertEquals("cheese", source.getClasses().get(0).getTags().get(0).getName()); - assertEquals("is good", source.getClasses().get(0).getTags().get(0).getValue()); + + verify( docletTagFactory ).createDocletTag( eq("cheese"), eq("is good"), isA( JavaClass.class ), eq(-1) ); + verifyNoMoreInteractions( docletTagFactory ); + +// assertEquals("cheese", source.getClasses().get(0).getTags().get(0).getName()); +// assertEquals("is good", source.getClasses().get(0).getTags().get(0).getValue()); } public void testDocletTagWithNoComment() throws Exception { @@ -706,8 +713,12 @@ assertEquals("", source.getClasses().get(0).getComment()); assertEquals(1, source.getClasses().get(0).getTags().size()); - assertEquals("cheese", source.getClasses().get(0).getTags().get(0).getName()); - assertEquals("is good", source.getClasses().get(0).getTags().get(0).getValue()); + + verify( docletTagFactory ).createDocletTag( eq("cheese"), eq("is good"), isA( JavaClass.class ), eq(-1) ); + verifyNoMoreInteractions( docletTagFactory ); + +// assertEquals("cheese", source.getClasses().get(0).getTags().get(0).getName()); +// assertEquals("is good", source.getClasses().get(0).getTags().get(0).getValue()); } public void testMultipleDocletTags() throws Exception { @@ -723,12 +734,18 @@ assertEquals("Hello", source.getClasses().get(0).getComment()); assertEquals(3, source.getClasses().get(0).getTags().size()); - assertEquals("cheese", source.getClasses().get(0).getTags().get(0).getName()); - assertEquals("is good", source.getClasses().get(0).getTags().get(0).getValue()); - assertEquals("food", source.getClasses().get(0).getTags().get(1).getName()); - assertEquals("is great", source.getClasses().get(0).getTags().get(1).getValue()); - assertEquals("chairs", source.getClasses().get(0).getTags().get(2).getName()); - assertEquals("are boring", source.getClasses().get(0).getTags().get(2).getValue()); + + verify( docletTagFactory ).createDocletTag( eq("cheese"), eq("is good"), isA( JavaClass.class ), eq(-1) ); + verify( docletTagFactory ).createDocletTag( eq("food"), eq("is great"), isA( JavaClass.class ), eq(-1) ); + verify( docletTagFactory ).createDocletTag( eq("chairs"), eq("are boring"), isA( JavaClass.class ), eq(-1) ); + verifyNoMoreInteractions( docletTagFactory ); + +// assertEquals("cheese", source.getClasses().get(0).getTags().get(0).getName()); +// assertEquals("is good", source.getClasses().get(0).getTags().get(0).getValue()); +// assertEquals("food", source.getClasses().get(0).getTags().get(1).getName()); +// assertEquals("is great", source.getClasses().get(0).getTags().get(1).getValue()); +// assertEquals("chairs", source.getClasses().get(0).getTags().get(2).getName()); +// assertEquals("are boring", source.getClasses().get(0).getTags().get(2).getValue()); } public void testDocletTagsOnMethodsAndFields() throws Exception { @@ -747,14 +764,17 @@ builder.endField(); builder.endClass(); - JavaSource source = builder.getSource(); + verify( docletTagFactory ).createDocletTag( eq("cheese"), eq("is good"), isA( JavaClass.class ), eq(-1) ); + verify( docletTagFactory ).createDocletTag( eq("food"), eq("is great"), isA( JavaMethod.class ), eq(-1) ); + verify( docletTagFactory ).createDocletTag( eq("chairs"), eq("are boring"), isA( JavaField.class ), eq(-1) ); + verifyNoMoreInteractions( docletTagFactory ); - assertEquals("cheese", source.getClasses().get(0).getTags().get(0).getName()); - assertEquals("is good", source.getClasses().get(0).getTags().get(0).getValue()); - assertEquals("food", source.getClasses().get(0).getMethods().get(0).getTags().get(0).getName()); - assertEquals("is great", source.getClasses().get(0).getMethods().get(0).getTags().get(0).getValue()); - assertEquals("chairs", source.getClasses().get(0).getFields().get(0).getTags().get(0).getName()); - assertEquals("are boring", source.getClasses().get(0).getFields().get(0).getTags().get(0).getValue()); +// assertEquals("cheese", source.getClasses().get(0).getTags().get(0).getName()); +// assertEquals("is good", source.getClasses().get(0).getTags().get(0).getValue()); +// assertEquals("food", source.getClasses().get(0).getMethods().get(0).getTags().get(0).getName()); +// assertEquals("is great", source.getClasses().get(0).getMethods().get(0).getTags().get(0).getValue()); +// assertEquals("chairs", source.getClasses().get(0).getFields().get(0).getTags().get(0).getName()); +// assertEquals("are boring", source.getClasses().get(0).getFields().get(0).getTags().get(0).getValue()); } public void testRetrieveJavaSource() throws Exception {
To unsubscribe from this list please visit:
