From b826c4a4df92c5280e4f8a4d7e1bebbbb03affb3 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 20 Mar 2024 19:20:02 +0000 Subject: Prefer numbering properties to numbering from paragraph style --- .../zwobble/mammoth/tests/docx/BodyXmlTests.java | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'src/test') 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 c8b6c7c..429b280 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -206,7 +206,31 @@ public class BodyXmlTests { } @Test - public void numberingOnParagraphStyleTakesPrecedenceOverNumPr() { + public void paragraphHasNumberingFromParagraphStyleIfPresent() { + XmlElement element = paragraphXml(list( + element("w:pPr", list( + element("w:pStyle", map("w:val", "List")) + )) + )); + + Numbering numbering = numberingMap(map( + "43", map("1", new Numbering.AbstractNumLevel("1", true, Optional.of("List"))) + )); + Styles styles = new Styles( + map("List", new Style("List", Optional.empty())), + map(), + map(), + map() + ); + + assertThat( + readSuccess(bodyReader(numbering, styles), element), + hasNumbering(NumberingLevel.ordered("1")) + ); + } + + @Test + public void numberingPropertiesInParagraphPropertiesTakesPrecedenceOverNumberingInParagraphStyle() { XmlElement element = paragraphXml(list( element("w:pPr", list( element("w:pStyle", map("w:val", "List")), @@ -218,8 +242,8 @@ public class BodyXmlTests { )); Numbering numbering = numberingMap(map( - "42", map("1", new Numbering.AbstractNumLevel("1", false, Optional.empty())), - "43", map("1", new Numbering.AbstractNumLevel("1", true, Optional.of("List"))) + "42", map("1", new Numbering.AbstractNumLevel("1", true, Optional.empty())), + "43", map("1", new Numbering.AbstractNumLevel("2", true, Optional.of("List"))) )); Styles styles = new Styles( map("List", new Style("List", Optional.empty())), -- cgit v1.2.3