From 9d1266911e5396331f3dcf4c30f38d2f08e1c818 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 16 Oct 2019 16:24:06 +0200
Subject: [PATCH] Fix test failure

---
 0003-Fix-test-failure.patch | 25 +++++++++++++++++++++++++
 xmlunit.spec                |  4 ++++
 2 files changed, 29 insertions(+)
 create mode 100644 0003-Fix-test-failure.patch

diff --git a/0003-Fix-test-failure.patch b/0003-Fix-test-failure.patch
new file mode 100644
index 0000000..cad643e
--- /dev/null
+++ b/0003-Fix-test-failure.patch
@@ -0,0 +1,25 @@
+From e03f1786054c239e8562e0af4d1239970862e581 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Wed, 16 Oct 2019 09:32:19 +0200
+Subject: [PATCH] Fix test failure
+
+---
+ .../src/test/java/org/xmlunit/assertj/ValueAssertTest.java      | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java
+index d1e3545..87f77ee 100644
+--- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java
++++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java
+@@ -224,7 +224,7 @@ public class ValueAssertTest {
+     @Test
+     public void testIsEqualTo_withAttributeValueExpression_shouldFailed() {
+ 
+-        thrown.expectAssertionError("expected:<\"[something]\"> but was:<\"[abc]\">");
++        thrown.expectAssertionError("Expecting:\n <\"abc\">\nto be equal to:\n <\"something\">\nbut was not.");
+ 
+         String xml = "<a><b attr=\"abc\"></b></a>";
+ 
+-- 
+2.21.0
+
diff --git a/xmlunit.spec b/xmlunit.spec
index d38d79b..4a94ffe 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -39,6 +39,7 @@ URL:            https://www.xmlunit.org/
 
 Patch1:         0001-Disable-tests-requiring-network-access.patch
 Patch2:         0002-Port-to-hamcrest-2.1.patch
+Patch3:         0003-Fix-test-failure.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
@@ -97,6 +98,9 @@ This package provides %{summary}.
 
 %patch1 -p1
 %patch2 -p1
+# This test failure showed up after updating mockito to 3.X, but the error
+# message clearly points to assertj-core
+%patch3 -p1
 
 %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
 %pom_remove_plugin :maven-assembly-plugin