more tests affected by message changes in AssertJ 3.19.0

see #212
xmlunit · Feb 4, 2021 · db2ff6c · db2ff6c
1 parent f7d5a28
commit db2ff6c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 16 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -2,6 +2,10 @@
 
 ## XMLUnit for Java 2.8.3 - /not released, yet/
 
+* adjusted unit tests so they pass when AssertJ 3.19.0 is used.
+  [#212](https://github.com/xmlunit/xmlunit/pull/212) by
+  [mmathesius](https://github.com/mmathesius)
+
 ## XMLUnit for Java 2.8.2 - /Released 2020-12-21/
 
 * `CompareAssert` inside the AssertJ3 module swapped the expected and

diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
@@ -43,17 +43,17 @@ public void testAssertThat_withNull_shouldFailed() {
     }
 
     @Test
-    public void testNodesByXPath_withNull_shouldFailed() {
+    public void testNodesByXPath_withNull_shouldFail() {
 
-        thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
+        thrown.expectAssertionErrorPattern(format("%nExpecting not blank but was:(<| )null>?"));
 
         assertThat("<a><b></b><c/></a>").nodesByXPath(null);
     }
 
     @Test
-    public void testNodesByXPath_withWhitespacesOnly_shouldFailed() {
+    public void testNodesByXPath_withWhitespacesOnly_shouldFail() {
 
-        thrown.expectAssertionError(format("%nExpecting not blank but was:<\" \n \t\">"));
+        thrown.expectAssertionErrorPattern(format("%nExpecting not blank but was:(<| )\" \n \t\">?"));
 
         assertThat("<a><b></b><c/></a>").nodesByXPath(" \n \t");
     }

diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
@@ -31,17 +31,17 @@ public class XmlAssertValueByXPathTest {
     public static SetEnglishLocaleRule locale = new SetEnglishLocaleRule();
 
     @Test
-    public void testValueByXPath_withNull_shouldFailed() {
+    public void testValueByXPath_withNull_shouldFail() {
 
-        thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
+        thrown.expectAssertionErrorPattern(format("%nExpecting not blank but was:(<| )null>?"));
 
         assertThat("<a><b></b><c/></a>").valueByXPath(null);
     }
 
     @Test
-    public void testValueByXPath_withWhitespacesOnly_shouldFailed() {
+    public void testValueByXPath_withWhitespacesOnly_shouldFail() {
 
-        thrown.expectAssertionError(format("%nExpecting not blank but was:<\" \n \t\">"));
+        thrown.expectAssertionErrorPattern(format("%nExpecting not blank but was:(<| )\" \n \t\">?"));
 
         assertThat("<a><b></b><c/></a>").valueByXPath(" \n \t");
     }

diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/ValueAssertTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/ValueAssertTest.java
@@ -24,6 +24,7 @@
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
+import java.util.regex.Pattern;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -263,7 +264,13 @@ public void testIsEqualTo_withAttributeValueExpression_shouldPass() {
     @Test
     public void testIsEqualTo_withAttributeValueExpression_shouldFailed() {
 
-        thrown.expectAssertionError("expected:<\"[something]\"> but was:<\"[abc]\">");
+        thrown.expectAssertionErrorPattern(".*("
+            // AssertJ 3.18.1
+            + Pattern.quote("expected:<\"[something]\"> but was:<\"[abc]\">")
+            + "|"
+            // AssertJ 3.19.0+
+            + Pattern.quote("Expecting:\n <\"abc\">\nto be equal to:\n <\"something\">\nbut was not.")
+            + ")");
 
         String xml = "<a><b attr=\"abc\"></b></a>";
 

diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java
@@ -43,17 +43,17 @@ public void testAssertThat_withNull_shouldFailed() {
     }
 
     @Test
-    public void testNodesByXPath_withNull_shouldFailed() {
+    public void testNodesByXPath_withNull_shouldFail() {
 
-        thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
+        thrown.expectAssertionErrorPattern(format("%nExpecting not blank but was:(<| )null>?"));
 
         assertThat("<a><b></b><c/></a>").nodesByXPath(null);
     }
 
     @Test
-    public void testNodesByXPath_withWhitespacesOnly_shouldFailed() {
+    public void testNodesByXPath_withWhitespacesOnly_shouldFail() {
 
-        thrown.expectAssertionError(format("%nExpecting not blank but was:<\" \n \t\">"));
+        thrown.expectAssertionErrorPattern(format("%nExpecting not blank but was:(<| )\" \n \t\">?"));
 
         assertThat("<a><b></b><c/></a>").nodesByXPath(" \n \t");
     }

diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java
@@ -31,17 +31,17 @@ public class XmlAssertValueByXPathTest {
     public static SetEnglishLocaleRule locale = new SetEnglishLocaleRule();
 
     @Test
-    public void testValueByXPath_withNull_shouldFailed() {
+    public void testValueByXPath_withNull_shouldFail() {
 
-        thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
+        thrown.expectAssertionErrorPattern(format("%nExpecting not blank but was:(<| )null>?"));
 
         assertThat("<a><b></b><c/></a>").valueByXPath(null);
     }
 
     @Test
     public void testValueByXPath_withWhitespacesOnly_shouldFailed() {
 
-        thrown.expectAssertionError(format("%nExpecting not blank but was:<\" \n \t\">"));
+        thrown.expectAssertionErrorPattern(format("%nExpecting not blank but was:(<| )\" \n \t\">?"));
 
         assertThat("<a><b></b><c/></a>").valueByXPath(" \n \t");
     }