From 6f9603e3f17ad7142edebf83212dfa97d1576ce0 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 28 Aug 2016 22:54:22 +0100
Subject: Read optional attributes of comments

---
 .../mammoth/tests/docx/CommentXmlTests.java        | 39 ++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

(limited to 'src/test/java/org')

diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java
index 6abf086..0464866 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java
@@ -42,10 +42,27 @@ public class CommentXmlTests {
 
     @Test
     public void whenOptionalAttributesOfCommentAreMissingThenTheyAreReadAsNone() {
-        List<XmlNode> body = list(element("w:p"));
         CommentXmlReader reader = new CommentXmlReader(bodyReader());
         InternalResult<List<Comment>> result = reader.readElement(element("w:comments", list(
-            element("w:comment", map("w:id", "1"), body)
+            element("w:comment", map("w:id", "1"))
+        )));
+        assertThat(
+            result,
+            isInternalSuccess(contains(
+                allOf(
+                    isA(Comment.class),
+                    hasProperty("authorName", equalTo(Optional.empty())),
+                    hasProperty("authorInitials", equalTo(Optional.empty()))
+                )
+            ))
+        );
+    }
+
+    @Test
+    public void whenOptionalAttributesOfCommentAreBlankThenTheyAreReadAsNone() {
+        CommentXmlReader reader = new CommentXmlReader(bodyReader());
+        InternalResult<List<Comment>> result = reader.readElement(element("w:comments", list(
+            element("w:comment", map("w:id", "1", "w:author", " ", "w:initials", " "))
         )));
         assertThat(
             result,
@@ -58,4 +75,22 @@ public class CommentXmlTests {
             ))
         );
     }
+
+    @Test
+    public void whenOptionalAttributesOfCommentAreNotBlankThenTheyAreRead() {
+        CommentXmlReader reader = new CommentXmlReader(bodyReader());
+        InternalResult<List<Comment>> result = reader.readElement(element("w:comments", list(
+            element("w:comment", map("w:id", "1", "w:author", "The Piemaker", "w:initials", "TP"))
+        )));
+        assertThat(
+            result,
+            isInternalSuccess(contains(
+                allOf(
+                    isA(Comment.class),
+                    hasProperty("authorName", equalTo(Optional.of("The Piemaker"))),
+                    hasProperty("authorInitials", equalTo(Optional.of("TP")))
+                )
+            ))
+        );
+    }
 }
-- 
cgit v1.2.3