Add paragraph matchers for numbering

3 files changed, 41 insertions, 1 deletions

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 1091ab8..a80e2ea 100644
--- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
@@ -15,6 +15,7 @@ import static org.zwobble.mammoth.util.MammothLists.list;
 
 public class DocumentElementMakers {
     public static final Property<HasChildren, Optional<Style>> STYLE = newProperty();
+    public static final Property<HasChildren, Optional<NumberingLevel>> NUMBERING = newProperty();
     public static final Property<HasChildren, Boolean> BOLD = newProperty();
     public static final Property<HasChildren, Boolean> ITALIC = newProperty();
     public static final Property<HasChildren, Boolean> UNDERLINE = newProperty();
@@ -25,7 +26,7 @@ public class DocumentElementMakers {
     public static final Instantiator<Paragraph> PARAGRAPH =
         propertyLookup -> new Paragraph(
             propertyLookup.valueOf(STYLE, Optional.empty()),
-            Optional.empty(),
+            propertyLookup.valueOf(NUMBERING, Optional.empty()),
             propertyLookup.valueOf(CHILDREN, list()));
 
     public static final Instantiator<Run> RUN =
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 517773c..2c1d505 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -33,6 +33,7 @@ import static org.zwobble.mammoth.results.Warning.warning;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.*;
 import static org.zwobble.mammoth.tests.docx.BodyXmlReaderMakers.*;
+import static org.zwobble.mammoth.tests.docx.BodyXmlReaderMakers.NUMBERING;
 import static org.zwobble.mammoth.util.MammothLists.list;
 import static org.zwobble.mammoth.util.MammothMaps.map;
 import static org.zwobble.mammoth.xml.XmlNodes.element;
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java
index fdaa075..436dc62 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java
@@ -1,6 +1,7 @@
 package org.zwobble.mammoth.tests.styles;
 
 import org.junit.Test;
+import org.zwobble.mammoth.documents.NumberingLevel;
 import org.zwobble.mammoth.documents.Paragraph;
 import org.zwobble.mammoth.documents.Style;
 import org.zwobble.mammoth.styles.ParagraphMatcher;
@@ -12,6 +13,7 @@ import static com.natpryce.makeiteasy.MakeItEasy.make;
 import static com.natpryce.makeiteasy.MakeItEasy.with;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.NUMBERING;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.PARAGRAPH;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.STYLE;
 
@@ -70,4 +72,40 @@ public class ParagraphMatcherTests {
             with(STYLE, Optional.of(new Style("TipsParagraph", Optional.of("Tips Paragraph"))))));
         assertTrue(matcher.matches(paragraphWithCorrectStyleName));
     }
+
+    @Test
+    public void matcherWithOrderedListOnlyMatchesParagraphsWithOrderedListAtThatLeve() {
+        ParagraphMatcher matcher = ParagraphMatcher.orderedList("4");
+        assertFalse(matcher.matches(make(a(PARAGRAPH))));
+
+        Paragraph paragraphWithCorrectNumbering = make(a(PARAGRAPH,
+            with(NUMBERING, Optional.of(NumberingLevel.ordered("4")))));
+        assertTrue(matcher.matches(paragraphWithCorrectNumbering));
+
+        Paragraph paragraphWithIncorrectLevel = make(a(PARAGRAPH,
+            with(NUMBERING, Optional.of(NumberingLevel.ordered("3")))));
+        assertFalse(matcher.matches(paragraphWithIncorrectLevel));
+
+        Paragraph paragraphWithIncorrectOrdering = make(a(PARAGRAPH,
+            with(NUMBERING, Optional.of(NumberingLevel.unordered("4")))));
+        assertFalse(matcher.matches(paragraphWithIncorrectOrdering));
+    }
+
+    @Test
+    public void matcherWithUnorderedListOnlyMatchesParagraphsWithUnrderedListAtThatLeve() {
+        ParagraphMatcher matcher = ParagraphMatcher.unorderedList("4");
+        assertFalse(matcher.matches(make(a(PARAGRAPH))));
+
+        Paragraph paragraphWithCorrectNumbering = make(a(PARAGRAPH,
+            with(NUMBERING, Optional.of(NumberingLevel.unordered("4")))));
+        assertTrue(matcher.matches(paragraphWithCorrectNumbering));
+
+        Paragraph paragraphWithIncorrectLevel = make(a(PARAGRAPH,
+            with(NUMBERING, Optional.of(NumberingLevel.unordered("3")))));
+        assertFalse(matcher.matches(paragraphWithIncorrectLevel));
+
+        Paragraph paragraphWithIncorrectOrdering = make(a(PARAGRAPH,
+            with(NUMBERING, Optional.of(NumberingLevel.ordered("4")))));
+        assertFalse(matcher.matches(paragraphWithIncorrectOrdering));
+    }
 }