From 1dca829f94b394a4a63e71b125f25cc609d06235 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 16 Feb 2016 22:42:53 +0000
Subject: Allow preservation of empty paragraphs

---
 .../mammoth/tests/DocumentConverterTests.java       | 11 +++++++++--
 .../org/zwobble/mammoth/tests/MammothTests.java     | 21 ++++++++++++++-------
 2 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'src/test/java')

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
@@ -32,6 +32,13 @@ public class DocumentConverterTests {
             deepEquals(list(Html.element("p", list(Html.text("Hello"))))));
     }
 
+    @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(
@@ -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
@@ -11,13 +11,6 @@ import static org.zwobble.mammoth.results.Result.success;
 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(
@@ -32,6 +25,20 @@ public class MammothTests {
             deepEquals(success("<p>This XML has a byte order mark.</p>")));
     }
 
+    @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(
-- 
cgit v1.2.3