From c429bb17845a98141105e584d1507789b2d2f28c Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 28 Aug 2016 23:32:01 +0100 Subject: Add stubbed comments to Document --- .../mammoth/tests/conversion/DocumentToHtmlTests.java | 11 +++++------ .../mammoth/tests/documents/DocumentElementMakers.java | 10 ++++++++++ .../org/zwobble/mammoth/tests/docx/DocumentXmlTests.java | 12 +++++++----- 3 files changed, 22 insertions(+), 11 deletions(-) (limited to 'src/test') 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 = reader.readElement(documentElement); assertThat( - document, - isInternalSuccess(new Document( - list(paragraphWithText("Hello!")), - Notes.EMPTY))); + reader.readElement(documentElement), + isInternalSuccess(document( + withChildren(paragraphWithText("Hello!")) + )) + ); } @Test -- cgit v1.2.3