- Revision
- 1159
- Author
- rfscholte
- Date
- 2011-04-08 16:04:47 -0500 (Fri, 08 Apr 2011)
Log Message
clean up tests
Modified Paths
- trunk/qdox/src/test/java/com/thoughtworks/qdox/directorywalker/DirectoryScannerTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/AbstractJavaEntityTest.java
Added Paths
Removed Paths
Diff
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/directorywalker/DirectoryScannerTest.java (1158 => 1159)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/directorywalker/DirectoryScannerTest.java 2011-04-08 18:43:30 UTC (rev 1158) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/directorywalker/DirectoryScannerTest.java 2011-04-08 21:04:47 UTC (rev 1159) @@ -1,7 +1,10 @@ package com.thoughtworks.qdox.directorywalker; -import static org.mockito.Mockito.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import java.io.File; import java.util.List; @@ -190,8 +193,8 @@ FileVisitor visitor = mock( FileVisitor.class ); scanner.scan( visitor ); - org.mockito.Mockito.verify( visitor ).visitFile( blahTxt ); - org.mockito.Mockito.verify( visitor ).visitFile( fooJava ); - org.mockito.Mockito.verify( visitor ).visitFile( pigJava ); + verify( visitor ).visitFile( blahTxt ); + verify( visitor ).visitFile( fooJava ); + verify( visitor ).visitFile( pigJava ); } }
Copied: trunk/qdox/src/test/java/com/thoughtworks/qdox/io/IndentBufferTest.java (from rev 1136, trunk/qdox/src/test/java/com/thoughtworks/qdox/model/IndentBufferTest.java) (0 => 1159)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/io/IndentBufferTest.java (rev 0) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/io/IndentBufferTest.java 2011-04-08 21:04:47 UTC (rev 1159) @@ -0,0 +1,50 @@ +package com.thoughtworks.qdox.io; + +import static org.junit.Assert.assertEquals; + +import org.junit.Before; +import org.junit.Test; + +public class IndentBufferTest { + + private IndentBuffer buffer; + + @Before + public void setUp() throws Exception { + buffer = new IndentBuffer(); + } + + @Test + public void testNoIndentation() throws Exception { + buffer.write("A string"); + buffer.newline(); + buffer.write("more string"); + buffer.write('s'); + buffer.newline(); + String expected = "" + + "A string\n" + + "more strings\n"; + assertEquals(expected, buffer.toString()); + } + + @Test + public void testIndentation() throws Exception { + buffer.write("Line1"); + buffer.newline(); + buffer.indent(); + buffer.write("Indent1"); + buffer.newline(); + buffer.write("Indent2"); + buffer.write(" more"); + buffer.newline(); + buffer.deindent(); + buffer.write("Line2"); + buffer.newline(); + String expected = "" + + "Line1\n" + + "\tIndent1\n" + + "\tIndent2 more\n" + + "Line2\n"; + assertEquals(expected, buffer.toString()); + } +}
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/AbstractJavaEntityTest.java (1158 => 1159)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/AbstractJavaEntityTest.java 2011-04-08 18:43:30 UTC (rev 1158) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/AbstractJavaEntityTest.java 2011-04-08 21:04:47 UTC (rev 1159) @@ -1,23 +1,23 @@ package com.thoughtworks.qdox.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.Arrays; +import java.util.Collections; import java.util.LinkedList; import java.util.List; -import com.thoughtworks.qdox.io.IndentBuffer; +import org.junit.Test; -import junit.framework.TestCase; +public class AbstractJavaEntityTest { -public class AbstractJavaEntityTest extends TestCase { - private AbstractJavaEntity newAbstractJavaEntity() { return new AbstractJavaEntity() { - public int compareTo( Object arg0 ) - { - return 0; - } - public String getCodeBlock() { return null; @@ -25,16 +25,21 @@ }; } - public AbstractJavaEntityTest(String s) { - super(s); - } - + @Test public void testGetTagsByNameMethod() throws Exception { AbstractBaseJavaEntity entity = newAbstractJavaEntity(); List<DocletTag> tags = new LinkedList<DocletTag>(); - tags.add(new DefaultDocletTag("monkey", "is good")); - tags.add(new DefaultDocletTag("monkey", "is funny")); - tags.add(new DefaultDocletTag("horse", "not so much")); + + DocletTag monkeyIsGoodTag = mock(DocletTag.class); + when(monkeyIsGoodTag.getName()).thenReturn( "monkey" ); + DocletTag monkeyIsFunnyTag = mock(DocletTag.class); + when(monkeyIsFunnyTag.getName()).thenReturn( "monkey" ); + DocletTag horseNotSoMuchTag = mock(DocletTag.class); + when(horseNotSoMuchTag.getName()).thenReturn( "horse" ); + + tags.add(monkeyIsGoodTag); + tags.add(monkeyIsFunnyTag); + tags.add(horseNotSoMuchTag); entity.setTags(tags); assertEquals(2, entity.getTagsByName("monkey").size()); @@ -42,13 +47,24 @@ assertEquals(0, entity.getTagsByName("non existent tag").size()); } + @Test public void testGetSingleTagByName() throws Exception { - AbstractBaseJavaEntity entity = newAbstractJavaEntity(); List<DocletTag> tags = new LinkedList<DocletTag>(); - tags.add(new DefaultDocletTag("monkey", "is good")); - tags.add(new DefaultDocletTag("monkey", "is funny")); - tags.add(new DefaultDocletTag("horse", "not so much")); + + DocletTag monkeyIsGoodTag = mock(DocletTag.class); + when(monkeyIsGoodTag.getName()).thenReturn( "monkey" ); + when(monkeyIsGoodTag.getValue()).thenReturn( "is good" ); + DocletTag monkeyIsFunnyTag = mock(DocletTag.class); + when(monkeyIsFunnyTag.getName()).thenReturn( "monkey" ); + when(monkeyIsFunnyTag.getValue()).thenReturn( "is funny" ); + DocletTag horseNotSoMuchTag = mock(DocletTag.class); + when(horseNotSoMuchTag.getName()).thenReturn( "horse" ); + when(horseNotSoMuchTag.getValue()).thenReturn( "not so much" ); + + tags.add(monkeyIsGoodTag); + tags.add(monkeyIsFunnyTag); + tags.add(horseNotSoMuchTag); entity.setTags(tags); assertEquals("is good", entity.getTagByName("monkey").getValue()); @@ -57,18 +73,21 @@ } + @Test public void testPublicModifer() { AbstractJavaEntity entity = newAbstractJavaEntity(); - entity.setModifiers(Arrays.asList(new String[]{"public"})); - assertTrue(entity.isPublic()); + entity.setModifiers( Collections.singletonList( "public" ) ); + assertTrue( entity.isPublic() ); } + @Test public void testPrivateModifer() { AbstractJavaEntity entity = newAbstractJavaEntity(); - entity.setModifiers(Arrays.asList(new String[]{"private"})); + entity.setModifiers(Collections.singletonList( "private" )); assertTrue(entity.isPrivate()); } + @Test public void testAbstractModifer() { AbstractJavaEntity entity = newAbstractJavaEntity(); entity.setModifiers(Arrays.asList(new String[]{"public", "abstract"})); @@ -76,6 +95,7 @@ assertTrue(!entity.isPrivate()); } + @Test public void testProtectedModifer() { AbstractJavaEntity entity = newAbstractJavaEntity(); entity.setModifiers(Arrays.asList(new String[]{"protected", "abstract", "synchronized", "transient"})); @@ -84,6 +104,7 @@ assertTrue(entity.isTransient()); } + @Test public void testStaticModifer() { AbstractJavaEntity entity = newAbstractJavaEntity(); entity.setModifiers(Arrays.asList(new String[]{"public", "static", "final"})); @@ -91,6 +112,7 @@ assertTrue(entity.isFinal()); } + @Test public void testQDOX30() { AbstractJavaEntity entity = newAbstractJavaEntity(); entity.setModifiers(Arrays.asList(new String[]{"native", "volatile", "strictfp"})); @@ -99,6 +121,7 @@ assertTrue(entity.isStrictfp()); } + @Test public void testGetTagsReturnsEmptyArrayInsteadOfNull() throws Exception { AbstractJavaEntity entity = newAbstractJavaEntity(); assertEquals(0, entity.getTags().size());
Deleted: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/ClassLibraryTest.java (1158 => 1159)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/ClassLibraryTest.java 2011-04-08 18:43:30 UTC (rev 1158) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/ClassLibraryTest.java 2011-04-08 21:04:47 UTC (rev 1159) @@ -1,59 +0,0 @@ -package com.thoughtworks.qdox.model; - -import junit.framework.TestCase; - -public class ClassLibraryTest extends TestCase { - - public ClassLibraryTest(String s) { - super(s); - } - - public JavaClass getClassByName(String name) { - return new DefaultJavaClass("MyClass"); - } - - public JavaClass[] getClasses() { - return new JavaClass[0]; - } - - //Moved to JavaClassContextText -// public void testAdd() throws Exception { -// ClassLibrary c = new ClassLibrary(); -// c.add("com.blah.Ping"); -// c.add("com.moo.Poo"); -// assertTrue(c.hasClassReference("com.blah.Ping")); -// assertTrue(c.hasClassReference("com.moo.Poo")); -// assertTrue(!c.hasClassReference("com.not.You")); -// } - - /** - * @deprecated Moved to ClassLoaderLibraryTest - */ - public void testNoClassLoaders() throws Exception { - ClassLibrary c = new ClassLibrary(); - assertTrue(!c.hasClassReference("java.lang.String")); - } - - /** - * @deprecated Moved to ClassLoaderLibraryTest - */ - public void testWithClassLoader() throws Exception { - ClassLibrary c = new ClassLibrary(); - c.addClassLoader(getClass().getClassLoader()); - assertTrue(c.hasClassReference("java.lang.String")); - assertTrue(c.hasClassReference("java.util.Collection")); - assertTrue(!c.hasClassReference("java.util.GoatCrusher")); - } - - /** - * @deprecated Moved to ClassLoaderLibraryTest - */ - public void testDefaultClassLoader() throws Exception { - ClassLibrary c = new ClassLibrary(); - c.addDefaultLoader(); - assertTrue(c.hasClassReference("java.lang.String")); - assertTrue(c.hasClassReference("java.util.Collection")); - assertTrue(c.hasClassReference("java.util.Map$Entry")); - assertTrue(!c.hasClassReference("java.util.GoatCrusher")); - } -}
Deleted: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/IndentBufferTest.java (1158 => 1159)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/IndentBufferTest.java 2011-04-08 18:43:30 UTC (rev 1158) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/IndentBufferTest.java 2011-04-08 21:04:47 UTC (rev 1159) @@ -1,51 +0,0 @@ -package com.thoughtworks.qdox.model; - -import com.thoughtworks.qdox.io.IndentBuffer; - -import junit.framework.TestCase; - -public class IndentBufferTest extends TestCase { - - private IndentBuffer buffer; - - public IndentBufferTest(String s) { - super(s); - } - - protected void setUp() throws Exception { - super.setUp(); - buffer = new IndentBuffer(); - } - - public void testNoIndentation() throws Exception { - buffer.write("A string"); - buffer.newline(); - buffer.write("more string"); - buffer.write('s'); - buffer.newline(); - String expected = "" - + "A string\n" - + "more strings\n"; - assertEquals(expected, buffer.toString()); - } - - public void testIndentation() throws Exception { - buffer.write("Line1"); - buffer.newline(); - buffer.indent(); - buffer.write("Indent1"); - buffer.newline(); - buffer.write("Indent2"); - buffer.write(" more"); - buffer.newline(); - buffer.deindent(); - buffer.write("Line2"); - buffer.newline(); - String expected = "" - + "Line1\n" - + "\tIndent1\n" - + "\tIndent2 more\n" - + "Line2\n"; - assertEquals(expected, buffer.toString()); - } -}
To unsubscribe from this list please visit:
