From 6a4380595912b75c352bb3bdd79f4fd6e3e81961 Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Fri, 29 Jan 2021 13:44:46 -0600
Subject: [PATCH] Fix FTBFS by patchng ValueAssertTest to adjust for changed
 format of mismatched string exception

Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
---
 xmlunit-2.7.0-ValueAssertTest-fix.patch | 12 ++++++++++++
 xmlunit.spec                            |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 xmlunit-2.7.0-ValueAssertTest-fix.patch

diff --git a/xmlunit-2.7.0-ValueAssertTest-fix.patch b/xmlunit-2.7.0-ValueAssertTest-fix.patch
new file mode 100644
index 0000000..cb96820
--- /dev/null
+++ b/xmlunit-2.7.0-ValueAssertTest-fix.patch
@@ -0,0 +1,12 @@
+diff -ru ../xmlunit-2.7.0-src.ORIG/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java ./xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java
+--- ../xmlunit-2.7.0-src.ORIG/xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java	2020-04-28 03:09:04.000000000 -0500
++++ ./xmlunit-assertj/src/test/java/org/xmlunit/assertj/ValueAssertTest.java	2021-01-29 13:24:38.101158331 -0600
+@@ -263,7 +263,7 @@
+     @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>";
+ 
diff --git a/xmlunit.spec b/xmlunit.spec
index 1745cbf..94fd809 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -32,7 +32,7 @@ Name:           xmlunit
 Summary:        Provides classes to do asserts on xml
 Epoch:          0
 Version:        2.7.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 # xmlunit2 is licensed under ASL 2.0, xmlunit-legacy is still BSD-licensed
 License:        ASL 2.0 and BSD
 
@@ -40,6 +40,7 @@ URL:            https://www.xmlunit.org/
 Source0:        https://github.com/xmlunit/xmlunit/releases/download/v%{version}/%{name}-%{version}-src.tar.gz
 
 Patch0:         0001-Disable-tests-requiring-network-access.patch
+Patch1:         xmlunit-2.7.0-ValueAssertTest-fix.patch
 
 BuildArch:      noarch
 
@@ -109,6 +110,7 @@ This package provides %{summary}.
 %setup -q -n %{name}-%{version}-src
 
 %patch0 -p1
+%patch1 -p1
 
 %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
 %pom_remove_plugin :maven-assembly-plugin
@@ -141,6 +143,10 @@ This package provides %{summary}.
 
 
 %changelog
+* Fri Jan 29 2021 Merlin Mathesius <mmathesi@redhat.com> - 0:2.7.0-6
+- Fix FTBFS by patchng ValueAssertTest to adjust for changed format of
+  mismatched string exception
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild