Read default for complex field checkboxes

2 files changed, 80 insertions, 3 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 c859be4..0336bf3 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -626,6 +626,80 @@ public class BodyXmlTests {
                 ))
             )));
         }
+
+        @Test
+        public void complexFieldCheckboxWithoutDefaultNorCheckedIsUnchecked() {
+            XmlElement element = complexFieldCheckboxParagraph(list(
+                element("w:checkBox")
+            ));
+
+            DocumentElement paragraph = readSuccess(bodyReader(), element);
+
+            assertThat(paragraph, isParagraph(hasChildren(
+                isEmptyRun(),
+                isEmptyRun(),
+                isRun(hasChildren(
+                    isCheckbox(false)
+                ))
+            )));
+        }
+
+        @Test
+        public void complexFieldCheckboxWithDefault0AndWithoutCheckedIsUnchecked() {
+            XmlElement element = complexFieldCheckboxParagraph(list(
+                element("w:checkBox", list(
+                    element("w:default", map("w:val", "0"))
+                ))
+            ));
+
+            DocumentElement paragraph = readSuccess(bodyReader(), element);
+
+            assertThat(paragraph, isParagraph(hasChildren(
+                isEmptyRun(),
+                isEmptyRun(),
+                isRun(hasChildren(
+                    isCheckbox(false)
+                ))
+            )));
+        }
+
+        @Test
+        public void complexFieldCheckboxWithDefault1AndWithoutCheckedIsChecked() {
+            XmlElement element = complexFieldCheckboxParagraph(list(
+                element("w:checkBox", list(
+                    element("w:default", map("w:val", "1"))
+                ))
+            ));
+
+            DocumentElement paragraph = readSuccess(bodyReader(), element);
+
+            assertThat(paragraph, isParagraph(hasChildren(
+                isEmptyRun(),
+                isEmptyRun(),
+                isRun(hasChildren(
+                    isCheckbox(true)
+                ))
+            )));
+        }
+
+        private XmlElement complexFieldCheckboxParagraph(List<XmlNode> ffDataChildren) {
+            return element("w:p", list(
+                element("w:r", list(
+                    element("w:fldChar", map("w:fldCharType", "begin"), list(
+                        element("w:ffData", ffDataChildren)
+                    ))
+                )),
+                element("w:instrText", list(
+                    textXml(" FORMCHECKBOX ")
+                )),
+                element("w:r", list(
+                    element("w:fldChar", map("w:fldCharType", "separate"))
+                )),
+                element("w:r", list(
+                    element("w:fldChar", map("w:fldCharType", "end"))
+                ))
+            ));
+        }
     }
 
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentMatchers.java b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentMatchers.java
index fae84b2..67e15f0 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentMatchers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentMatchers.java
@@ -91,9 +91,12 @@ public class DocumentMatchers {
         return cast(Hyperlink.class, allOf(matchers));
     }
 
-    @SafeVarargs
-    static Matcher<DocumentElement> isCheckbox(Matcher<? super Checkbox>... matchers) {
-        return cast(Checkbox.class, allOf(matchers));
+    static Matcher<DocumentElement> isCheckbox() {
+        return instanceOf(Checkbox.class);
+    }
+
+    static Matcher<DocumentElement> isCheckbox(boolean checked) {
+        return new DeepReflectionMatcher<>(new Checkbox(checked));
     }
 
     static Matcher<Hyperlink> hasHref(String href) {