aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-08-28 23:37:00 +0100
committerMichael Williamson <mike@zwobble.org>2016-08-28 23:37:00 +0100
commit8c392ff2f11c84bbeff3536c1ab4d0e9442c8f20 (patch)
treeab37ddabbca8debbf3084bed88b1f9676c256a5f
parentc429bb17845a98141105e584d1507789b2d2f28c (diff)
Test that comments are ignored by default
-rw-r--r--src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java15
-rw-r--r--src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java24
2 files changed, 31 insertions, 8 deletions
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
@@ -321,6 +321,21 @@ public class DocumentToHtmlTests {
}
@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(
Optional.empty(),
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<List<DocumentElement>> CHILDREN = new ArgumentKey<>("children");
private static final ArgumentKey<Integer> COLSPAN = new ArgumentKey<>("colspan");
private static final ArgumentKey<Integer> ROWSPAN = new ArgumentKey<>("rowspan");
+ private static final ArgumentKey<List<Comment>> COMMENTS = new ArgumentKey<>("comments");
public static Argument<Optional<Style>> withStyle(Style style) {
return arg(STYLE, Optional.of(style));
@@ -64,14 +65,17 @@ public class DocumentElementMakers {
return arg(COLSPAN, colspan);
}
+ public static Argument<List<Comment>> 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<DocumentElement> body) {
+ return new Comment(commentId, body, Optional.empty(), Optional.empty());
}
}