Read numbering styles

2 files changed, 41 insertions, 1 deletions

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 34e84a5..b12a5fe 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -82,6 +82,7 @@ public class BodyXmlTests {
         Styles styles = new Styles(
             map("Heading1", style),
             map(),
+            map(),
             map()
         );
         assertThat(
@@ -441,6 +442,7 @@ public class BodyXmlTests {
         Styles styles = new Styles(
             map(),
             map("Heading1Char", style),
+            map(),
             map()
         );
         assertThat(
@@ -772,7 +774,8 @@ public class BodyXmlTests {
         Styles styles = new Styles(
             map(),
             map(),
-            map("TableNormal", style)
+            map("TableNormal", style),
+            map()
         );
         assertThat(
             readSuccess(bodyReader(styles), element),
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
index fc9a2cf..89a7d1a 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
@@ -81,6 +81,43 @@ public class StylesXmlTests {
         assertEquals(Optional.empty(), styles.findCharacterStyleById("Heading1Char").get().getName());
     }
 
+    @Test
+    public void numberingStyleIsNoneIfNoStyleWithThatIdExists() {
+        XmlElement element = element("w:styles");
+
+        Styles styles = readStylesXmlElement(element);
+
+        assertEquals(Optional.empty(), styles.findNumberingStyleById("List1"));
+    }
+
+    @Test
+    public void numberingStyleHasNoneNumIdIfStyleHasNoParagraphProperties() {
+        XmlElement element = element("w:styles", list(
+            element("w:style", map("w:type", "numbering", "w:styleId", "List1"))
+        ));
+
+        Styles styles = readStylesXmlElement(element);
+
+        assertEquals(Optional.empty(), styles.findNumberingStyleById("List1").get().getNumId());
+    }
+
+    @Test
+    public void numberingStyleHasNumIdReadFromParagraphProperties() {
+        XmlElement element = element("w:styles", list(
+            element("w:style", map("w:type", "numbering", "w:styleId", "List1"), list(
+                element("w:pPr", list(
+                    element("w:numPr", list(
+                        element("w:numId", map("w:val", "42"))
+                    ))
+                ))
+            ))
+        ));
+
+        Styles styles = readStylesXmlElement(element);
+
+        assertEquals(Optional.of("42"), styles.findNumberingStyleById("List1").get().getNumId());
+    }
+
     private XmlElement nameElement(String name) {
         return element("w:name", map("w:val", name));
     }