From aa9e88a3997b3aab6c66afb81369fd5c279d662a Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 28 Nov 2016 12:26:13 +0000 Subject: Read page breaks --- .../mammoth/tests/conversion/DocumentToHtmlTests.java | 10 +++++++++- .../org/zwobble/mammoth/tests/docx/BodyXmlTests.java | 18 ++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) (limited to 'src/test/java') 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 b144b78..c93460e 100644 --- a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java @@ -197,10 +197,18 @@ public class DocumentToHtmlTests { @Test public void lineBreakIsConvertedToBreakElement() { assertThat( - convertToHtml(LineBreak.LINE_BREAK), + convertToHtml(Break.LINE_BREAK), deepEquals(list(Html.selfClosingElement("br")))); } + @Test + public void breaksThatAreNotLineBreaksAreIgnored() { + assertThat( + convertToHtml(Break.PAGE_BREAK), + deepEquals(list()) + ); + } + @Test public void tableIsConvertedToHtmlTable() { assertThat( diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java index 05ea9f0..1206c41 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -348,21 +348,31 @@ public class BodyXmlTests { } @Test - public void brIsReadAsLineBreak() { + public void brWithoutExplicitTypeIsReadAsLineBreak() { XmlElement element = element("w:br"); assertThat( readSuccess(bodyReader(), element), - equalTo(LineBreak.LINE_BREAK)); + equalTo(Break.LINE_BREAK)); } @Test - public void warningOnBreaksThatArentLineBreaks() { + public void brWithPageTypeIsReadAsPageBreak() { XmlElement element = element("w:br", map("w:type", "page")); + assertThat( + readSuccess(bodyReader(), element), + equalTo(Break.PAGE_BREAK) + ); + } + + @Test + public void warningOnBreaksThatArentLineBreaks() { + XmlElement element = element("w:br", map("w:type", "column")); + assertThat( readAll(bodyReader(), element), - isInternalResult(equalTo(list()), list("Unsupported break type: page"))); + isInternalResult(equalTo(list()), list("Unsupported break type: column"))); } @Test -- cgit v1.2.3