Add stubbed comments to Document

5 files changed, 28 insertions, 13 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/documents/Document.java b/src/main/java/org/zwobble/mammoth/internal/documents/Document.java
index 447d6ed..77d5580 100644
--- a/src/main/java/org/zwobble/mammoth/internal/documents/Document.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Document.java
@@ -5,10 +5,12 @@ import java.util.List;
 public class Document implements HasChildren {
     private final List<DocumentElement> children;
     private final Notes notes;
+    private final List<Comment> comments;
 
-    public Document(List<DocumentElement> children, Notes notes) {
+    public Document(List<DocumentElement> children, Notes notes, List<Comment> comments) {
         this.children = children;
         this.notes = notes;
+        this.comments = comments;
     }
 
     public List<DocumentElement> getChildren() {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
index ca8c3dc..bd7247e 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
@@ -6,6 +6,8 @@ import org.zwobble.mammoth.internal.results.InternalResult;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 import org.zwobble.mammoth.internal.xml.XmlElementLike;
 
+import static org.zwobble.mammoth.internal.util.Lists.list;
+
 public class DocumentXmlReader {
     private final BodyXmlReader bodyReader;
     private final Notes notes;
@@ -19,6 +21,6 @@ public class DocumentXmlReader {
         XmlElementLike body = element.findChildOrEmpty("w:body");
         return bodyReader.readElements(body.getChildren())
             .toResult()
-            .map(children -> new Document(children, notes));
+            .map(children -> new Document(children, notes, list()));
     }
 }
diff --git a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java
index eb816af..11fe0eb 100644
--- a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java
@@ -47,12 +47,11 @@ public class DocumentToHtmlTests {
     @Test
     public void multipleParagraphsInDocumentAreConvertedToMultipleParagraphs() {
         assertThat(
-            convertToHtml(new Document(
-                list(
+            convertToHtml(document(
+                withChildren(
                     paragraph(withChildren(runWithText("Hello"))),
                     paragraph(withChildren(runWithText("there")))
-                ),
-                Notes.EMPTY
+                )
             )),
 
             deepEquals(list(
@@ -284,8 +283,8 @@ public class DocumentToHtmlTests {
 
     @Test
     public void noteReferencesAreConvertedToLinksToReferenceBodyAfterMainBody() {
-        Document document = new Document(
-            list(paragraph(withChildren(
+        Document document = document(withChildren(
+            paragraph(withChildren(
                 runWithText("Knock knock"),
                 run(withChildren(new NoteReference(NoteType.FOOTNOTE, "4")))))),
             new Notes(list(new Note(NoteType.FOOTNOTE, "4", list(paragraphWithText("Who's there?"))))));
diff --git a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
index 433c968..6668882 100644
--- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
@@ -64,6 +64,16 @@ public class DocumentElementMakers {
         return arg(COLSPAN, colspan);
     }
 
+    public static Document document(Object... args) {
+        Arguments arguments = new Arguments(args);
+        return new Document(
+            arguments.get(CHILDREN, list()),
+            arguments.get(Notes.class, Notes.EMPTY),
+            list()
+        );
+
+    }
+
     public static Paragraph paragraph(Object... args) {
         Arguments arguments = new Arguments(args);
         return new Paragraph(
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
index b628a99..9697c6d 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
@@ -15,7 +15,9 @@ import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.tests.ResultMatchers.isInternalSuccess;
+import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.document;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.paragraphWithText;
+import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.withChildren;
 import static org.zwobble.mammoth.tests.docx.BodyXmlReaderMakers.bodyReader;
 
 public class DocumentXmlTests {
@@ -30,13 +32,13 @@ public class DocumentXmlTests {
                             XmlNodes.text("Hello!")))))))))));
 
         DocumentXmlReader reader = new DocumentXmlReader(bodyReader(), Notes.EMPTY);
-        InternalResult<Document> document = reader.readElement(documentElement);
 
         assertThat(
-            document,
-            isInternalSuccess(new Document(
-                list(paragraphWithText("Hello!")),
-                Notes.EMPTY)));
+            reader.readElement(documentElement),
+            isInternalSuccess(document(
+                withChildren(paragraphWithText("Hello!"))
+            ))
+        );
     }
 
     @Test