From 7abf1e89a6d9846e2fb3bc8f04e4ca51fe06a511 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 23 Nov 2017 20:45:24 +0000 Subject: Parse paragraph indents --- .../tests/documents/DocumentElementMakers.java | 6 ++ .../zwobble/mammoth/tests/docx/BodyXmlTests.java | 99 ++++++++++++++++++++++ 2 files changed, 105 insertions(+) (limited to 'src/test/java') 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 f206640..a2b0d7c 100644 --- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java +++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java @@ -96,6 +96,12 @@ public class DocumentElementMakers { return new Paragraph( arguments.get(STYLE, Optional.empty()), arguments.get(NUMBERING, Optional.empty()), + new ParagraphIndent( + Optional.empty(), + Optional.empty(), + Optional.empty(), + Optional.empty() + ), arguments.get(CHILDREN, list()) ); } 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 27f7502..772fdd3 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -101,6 +101,85 @@ public class BodyXmlTests { list("Paragraph style with ID Heading1 was referenced but not defined in the document"))); } + @Nested + public class ParagraphIndentTests { + @Test + public void whenWStartIsSetThenStartIndentIsReadFromWStart() { + XmlElement paragraphXml = paragraphWithIndent(map("w:start", "720", "w:left", "40")); + assertThat( + readSuccess(bodyReader(), paragraphXml), + hasIndent(hasIndentStart(Optional.of("720"))) + ); + } + + @Test + public void whenWStartIsNotSetThenStartIndentIsReadFromWLeft() { + XmlElement paragraphXml = paragraphWithIndent(map("w:left", "720")); + assertThat( + readSuccess(bodyReader(), paragraphXml), + hasIndent(hasIndentStart(Optional.of("720"))) + ); + } + + @Test + public void whenWEndIsSetThenEndIndentIsReadFromWEnd() { + XmlElement paragraphXml = paragraphWithIndent(map("w:end", "720", "w:right", "40")); + assertThat( + readSuccess(bodyReader(), paragraphXml), + hasIndent(hasIndentEnd(Optional.of("720"))) + ); + } + + @Test + public void whenWEndIsNotSetThenEndIndentIsReadFromWRight() { + XmlElement paragraphXml = paragraphWithIndent(map("w:right", "720")); + assertThat( + readSuccess(bodyReader(), paragraphXml), + hasIndent(hasIndentEnd(Optional.of("720"))) + ); + } + + @Test + public void paragraphHasIndentFirstLineReadFromParagraphPropertiesIfPresent() { + XmlElement paragraphXml = paragraphWithIndent(map("w:firstLine", "720")); + assertThat( + readSuccess(bodyReader(), paragraphXml), + hasIndent(hasIndentFirstLine(Optional.of("720"))) + ); + } + + @Test + public void paragraphHasIndentHangingReadFromParagraphPropertiesIfPresent() { + XmlElement paragraphXml = paragraphWithIndent(map("w:hanging", "720")); + assertThat( + readSuccess(bodyReader(), paragraphXml), + hasIndent(hasIndentHanging(Optional.of("720"))) + ); + } + + @Test + public void whenIndentAttributesArentSetThenIndentsAreNotSet() { + XmlElement paragraphXml = paragraphWithIndent(map()); + assertThat( + readSuccess(bodyReader(), paragraphXml), + hasIndent(allOf( + hasIndentStart(Optional.empty()), + hasIndentEnd(Optional.empty()), + hasIndentFirstLine(Optional.empty()), + hasIndentHanging(Optional.empty()) + )) + ); + } + + private XmlElement paragraphWithIndent(Map attributes) { + return paragraphXml(list( + element("w:pPr", list( + element("w:ind", attributes) + )) + )); + } + } + @Test public void paragraphHasNoNumberingIfItHasNoNumberingProperties() { XmlElement element = paragraphXml(); @@ -1319,6 +1398,26 @@ public class BodyXmlTests { return hasProperty("numbering", deepEquals(expected)); } + private Matcher hasIndent(Matcher expected) { + return hasProperty("indent", expected); + } + + private Matcher hasIndentStart(Optional value) { + return hasProperty("start", equalTo(value)); + } + + private Matcher hasIndentEnd(Optional value) { + return hasProperty("end", equalTo(value)); + } + + private Matcher hasIndentFirstLine(Optional value) { + return hasProperty("firstLine", equalTo(value)); + } + + private Matcher hasIndentHanging(Optional value) { + return hasProperty("hanging", equalTo(value)); + } + private static Text text(String value) { return new Text(value); } -- cgit v1.2.3