aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/org/zwobble
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-02-16 22:42:53 +0000
committerMichael Williamson <mike@zwobble.org>2016-02-16 22:42:53 +0000
commit1dca829f94b394a4a63e71b125f25cc609d06235 (patch)
tree9a841f3bc6dfe5f183c4ab830fd2ad55d3b72df0 /src/test/java/org/zwobble
parenta549566d565f0fe0c62ba70ec58ef6c42858857c (diff)
Allow preservation of empty paragraphs
Diffstat (limited to 'src/test/java/org/zwobble')
-rw-r--r--src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java11
-rw-r--r--src/test/java/org/zwobble/mammoth/tests/MammothTests.java21
2 files changed, 23 insertions, 9 deletions
diff --git a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java
index 665258b..58828ef 100644
--- a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java
@@ -33,6 +33,13 @@ public class DocumentConverterTests {
}
@Test
+ public void forceWriteIsInsertedIntoParagraphIfEmptyParagraphsShouldBePreserved() {
+ assertThat(
+ DocumentConverter.convertToHtml("", true, make(a(PARAGRAPH))),
+ deepEquals(list(Html.element("p", list(Html.FORCE_WRITE)))));
+ }
+
+ @Test
public void multipleParagraphsInDocumentAreConvertedToMultipleParagraphs() {
assertThat(
convertToHtml(new Document(list(
@@ -203,10 +210,10 @@ public class DocumentConverterTests {
}
private List<HtmlNode> convertToHtml(Document document) {
- return DocumentConverter.convertToHtml("doc-42", document);
+ return DocumentConverter.convertToHtml("doc-42", false, document);
}
private List<HtmlNode> convertToHtml(DocumentElement element) {
- return DocumentConverter.convertToHtml("doc-42", element);
+ return DocumentConverter.convertToHtml("doc-42", false, element);
}
}
diff --git a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java
index fd6d3c5..a545a02 100644
--- a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java
@@ -12,13 +12,6 @@ import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
public class MammothTests {
@Test
- public void emptyParagraphsAreIgnoredByDefault() {
- assertThat(
- convertToHtml("empty.docx"),
- deepEquals(success("")));
- }
-
- @Test
public void docxContainingOneParagraphIsConvertedToSingleParagraphElement() {
assertThat(
convertToHtml("single-paragraph.docx"),
@@ -33,6 +26,20 @@ public class MammothTests {
}
@Test
+ public void emptyParagraphsAreIgnoredByDefault() {
+ assertThat(
+ convertToHtml("empty.docx"),
+ deepEquals(success("")));
+ }
+
+ @Test
+ public void emptyParagraphsArePreservedIfIgnoreEmptyParagraphsIsFalse() {
+ assertThat(
+ convertToHtml("empty.docx", Mammoth.Options.DEFAULT.preserveEmptyParagraphs()),
+ deepEquals(success("<p></p>")));
+ }
+
+ @Test
public void footnotesAreAppendedToText() {
assertThat(
convertToHtml("footnotes.docx", Mammoth.Options.DEFAULT.idPrefix("doc-42")),