From 8c392ff2f11c84bbeff3536c1ab4d0e9442c8f20 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 28 Aug 2016 23:37:00 +0100 Subject: Test that comments are ignored by default --- .../tests/conversion/DocumentToHtmlTests.java | 15 ++++++++++++++ .../tests/documents/DocumentElementMakers.java | 24 ++++++++++++++-------- 2 files changed, 31 insertions(+), 8 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 11fe0eb..c5cb073 100644 --- a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java @@ -320,6 +320,21 @@ public class DocumentToHtmlTests { Html.element("a", map("href", "#doc-42-footnote-7", "id", "doc-42-footnote-ref-7"), list(Html.text("[2]")))))))); } + @Test + public void commentsAreIgnoredByDefault() { + Document document = document(withChildren( + paragraph(withChildren( + runWithText("Knock knock"), + run(withChildren(new CommentReference("4")))))), + withComments(comment("4", list(paragraphWithText("Who's there?"))))); + + assertThat( + convertToHtml(document), + deepEquals(list( + Html.element("p", list( + Html.text("Knock knock")))))); + } + @Test public void imagesAreConvertedToImageTagsWithDataUriByDefault() { Image image = new Image( 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 6668882..ed00729 100644 --- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java +++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java @@ -23,6 +23,7 @@ public class DocumentElementMakers { private static final ArgumentKey> CHILDREN = new ArgumentKey<>("children"); private static final ArgumentKey COLSPAN = new ArgumentKey<>("colspan"); private static final ArgumentKey ROWSPAN = new ArgumentKey<>("rowspan"); + private static final ArgumentKey> COMMENTS = new ArgumentKey<>("comments"); public static Argument> withStyle(Style style) { return arg(STYLE, Optional.of(style)); @@ -64,14 +65,17 @@ public class DocumentElementMakers { return arg(COLSPAN, colspan); } + public static Argument> withComments(Comment... comments) { + return arg(COMMENTS, asList(comments)); + } + 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() + arguments.get(COMMENTS, list()) ); - } public static Paragraph paragraph(Object... args) { @@ -83,6 +87,10 @@ public class DocumentElementMakers { ); } + public static Paragraph paragraphWithText(String text) { + return paragraph(withChildren(runWithText(text))); + } + public static Run run(Object... args) { Arguments arguments = new Arguments(args); return new Run( @@ -96,6 +104,10 @@ public class DocumentElementMakers { ); } + public static Run runWithText(String text) { + return run(withChildren(new Text(text))); + } + public static TableCell tableCell(Object... args) { Arguments arguments = new Arguments(args); return new TableCell( @@ -105,11 +117,7 @@ public class DocumentElementMakers { ); } - public static Paragraph paragraphWithText(String text) { - return paragraph(withChildren(runWithText(text))); - } - - public static Run runWithText(String text) { - return run(withChildren(new Text(text))); + public static Comment comment(String commentId, List body) { + return new Comment(commentId, body, Optional.empty(), Optional.empty()); } } -- cgit v1.2.3