Title: [1400] trunk/qdox/src/test/java/com/thoughtworks/qdox/writer/DefaultModelWriterTest.java: Restore DefaultModelWriterTest
Revision
1400
Author
rfscholte
Date
2011-10-11 15:27:39 -0500 (Tue, 11 Oct 2011)

Log Message

Restore DefaultModelWriterTest

Modified Paths


Diff

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/writer/DefaultModelWriterTest.java (1399 => 1400)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/writer/DefaultModelWriterTest.java	2011-10-11 18:14:26 UTC (rev 1399)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/writer/DefaultModelWriterTest.java	2011-10-11 20:27:39 UTC (rev 1400)
@@ -4,14 +4,15 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.junit.Before;
+import org.junit.Test;
 
 import com.thoughtworks.qdox.model.DocletTag;
 import com.thoughtworks.qdox.model.JavaAnnotatedElement;
-import com.thoughtworks.qdox.model.impl.DefaultDocletTag;
 import com.thoughtworks.qdox.writer.DefaultModelWriter;
 
 public class DefaultModelWriterTest {
@@ -23,6 +24,7 @@
 		modelWriter = new DefaultModelWriter();
 	}
 	
+	@Test
     public void testCommentToString() {
         // setup
     	JavaAnnotatedElement annotatedElement = mock(JavaAnnotatedElement.class);
@@ -41,6 +43,7 @@
         assertEquals(expected, modelWriter.toString());
     }
     
+    @Test
     public void testMultilineCommentToString() {
     	JavaAnnotatedElement annotatedElement = mock(JavaAnnotatedElement.class);
     	when(annotatedElement.getComment()).thenReturn("Hello\nWorld");
@@ -60,12 +63,30 @@
     	
     }
 
-    public void testNoCommentToString() {
+    @Test
+    public void testEmptyCommentToString() {
         // setup
     	JavaAnnotatedElement annotatedElement = mock(JavaAnnotatedElement.class);
     	when(annotatedElement.getComment()).thenReturn("");
 
         // expectation
+        String expected = ""
+                + "/**\n"
+                + " */\n";
+
+        // run
+        modelWriter.commentHeader(annotatedElement);
+
+        // verify
+        assertEquals(expected, modelWriter.toString());
+    }
+
+    @Test
+    public void testNoCommentToString() {
+        // setup
+        JavaAnnotatedElement annotatedElement = mock(JavaAnnotatedElement.class);
+
+        // expectation
         String expected = "";
 
         // run
@@ -75,13 +96,15 @@
         assertEquals(expected, modelWriter.toString());
     }
 
+    @Test
     public void testCommentWithTagToString() {
         // setup
     	JavaAnnotatedElement annotatedElement = mock(JavaAnnotatedElement.class);
     	when(annotatedElement.getComment()).thenReturn("Hello");
-        List<DocletTag> tags = new LinkedList<DocletTag>();
-        tags.add(new DefaultDocletTag("monkey", "is in the tree"));
-    	when(annotatedElement.getTags()).thenReturn(tags);
+        DocletTag monkeyTag = mock(DocletTag.class);
+        when(monkeyTag.getName()).thenReturn( "monkey" );
+        when(monkeyTag.getValue()).thenReturn( "is in the tree" );
+    	when(annotatedElement.getTags()).thenReturn(Collections.singletonList( monkeyTag ));
 
         // expectation
         String expected = ""
@@ -98,13 +121,20 @@
         assertEquals(expected, modelWriter.toString());
     }
 
+    @Test
     public void testCommentWithMultipleTagsToString() {
         // setup
     	JavaAnnotatedElement annotatedElement = mock(JavaAnnotatedElement.class);
     	when(annotatedElement.getComment()).thenReturn("Hello");
         List<DocletTag> tags = new LinkedList<DocletTag>();
-        tags.add(new DefaultDocletTag("monkey", "is in the tree"));
-        tags.add(new DefaultDocletTag("see", "the doctor"));
+        DocletTag monkeyTag = mock(DocletTag.class);
+        when(monkeyTag.getName()).thenReturn( "monkey" );
+        when(monkeyTag.getValue()).thenReturn( "is in the tree" );
+        tags.add( monkeyTag );
+        DocletTag seeTag = mock( DocletTag.class );
+        when(seeTag.getName()).thenReturn( "see" );
+        when(seeTag.getValue()).thenReturn("the doctor" );
+        tags.add(seeTag);
         when(annotatedElement.getTags()).thenReturn(tags);
 
         // expectation
@@ -123,12 +153,14 @@
         assertEquals(expected, modelWriter.toString());
     }
 
+    @Test
     public void testTagButNoCommentToString() {
         // setup
     	JavaAnnotatedElement annotatedElement = mock(JavaAnnotatedElement.class);
-        List<DocletTag> tags = new LinkedList<DocletTag>();
-        tags.add(new DefaultDocletTag("monkey", "is in the tree"));
-        when(annotatedElement.getTags()).thenReturn(tags);
+        DocletTag monkeyTag = mock(DocletTag.class);
+        when(monkeyTag.getName()).thenReturn( "monkey" );
+        when(monkeyTag.getValue()).thenReturn( "is in the tree" );
+        when(annotatedElement.getTags()).thenReturn(Collections.singletonList( monkeyTag ));
 
         // expectation
         String expected = ""
@@ -143,12 +175,14 @@
         assertEquals(expected, modelWriter.toString());
     }
 
+    @Test
     public void testTagWithNoValueToString() {
         // setup
     	JavaAnnotatedElement annotatedElement = mock(JavaAnnotatedElement.class);
-        List<DocletTag> tags = new LinkedList<DocletTag>();
-        tags.add(new DefaultDocletTag("monkey", ""));
-        when(annotatedElement.getTags()).thenReturn(tags);
+        DocletTag monkeyTag = mock(DocletTag.class);
+        when(monkeyTag.getName()).thenReturn( "monkey" );
+        when(monkeyTag.getValue()).thenReturn( "" );
+        when(annotatedElement.getTags()).thenReturn(Collections.singletonList( monkeyTag ));
 
         // expectation
         String expected = ""


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to