From abbcc3915fa783c648436ef52e15da923a246dd1 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 26 Mar 2016 09:27:45 +0000
Subject: Lazily combine warnings in results

---
 .../java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java')

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 3141620..2a4420b 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -28,6 +28,7 @@ import static org.zwobble.mammoth.internal.documents.NoteReference.endnoteRefere
 import static org.zwobble.mammoth.internal.documents.NoteReference.footnoteReference;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.tests.ResultMatchers.hasWarnings;
+import static org.zwobble.mammoth.tests.ResultMatchers.isInternalResult;
 import static org.zwobble.mammoth.tests.ResultMatchers.isResult;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.*;
 import static org.zwobble.mammoth.tests.docx.BodyXmlReaderMakers.*;
@@ -90,7 +91,7 @@ public class BodyXmlTests {
                 element("w:pStyle", map("w:val", "Heading1"))))));
         assertThat(
             read(a(bodyReader), element),
-            isResult(
+            isInternalResult(
                 hasStyle(Optional.of(new Style("Heading1", Optional.empty()))),
                 list("Paragraph style with ID Heading1 was referenced but not defined in the document")));
     }
@@ -179,7 +180,7 @@ public class BodyXmlTests {
 
         assertThat(
             read(a(bodyReader), element),
-            isResult(
+            isInternalResult(
                 hasStyle(Optional.of(new Style("Heading1Char", Optional.empty()))),
                 list("Run style with ID Heading1Char was referenced but not defined in the document")));
     }
@@ -309,7 +310,7 @@ public class BodyXmlTests {
 
         assertThat(
             readAll(a(bodyReader), element),
-            isResult(equalTo(list()), list("Unsupported break type: page")));
+            isInternalResult(equalTo(list()), list("Unsupported break type: page")));
     }
 
     @Test
@@ -358,7 +359,7 @@ public class BodyXmlTests {
         XmlElement element = element("w:bookmarkStart", map("w:name", "_GoBack"));
         assertThat(
             readAll(a(bodyReader), element),
-            isResult(equalTo(list()), list()));
+            isInternalResult(equalTo(list()), list()));
     }
 
     @Test
@@ -409,7 +410,7 @@ public class BodyXmlTests {
 
         assertThat(
             readAll(a(bodyReader), paragraph),
-            isResult(deepEquals(expected), list()));
+            isInternalResult(deepEquals(expected), list()));
     }
 
     @Test
@@ -573,7 +574,7 @@ public class BodyXmlTests {
 
         assertThat(
             readAll(a(bodyReader), element),
-            isResult(equalTo(list()), list()));
+            isInternalResult(equalTo(list()), list()));
     }
 
     @Test
@@ -581,7 +582,7 @@ public class BodyXmlTests {
         XmlElement element = element("w:huh");
         assertThat(
             readAll(a(bodyReader), element),
-            isResult(equalTo(list()), list("An unrecognised element was ignored: w:huh")));
+            isInternalResult(equalTo(list()), list("An unrecognised element was ignored: w:huh")));
     }
 
     @Test
-- 
cgit v1.2.3