Notification time stamped 2020-11-30 20:27:12 UTC
From ac68d202597f41909222a03002e1ebb095d3932d Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek(a)redhat.com>
Date: Jul 29 2020 07:54:23 +0000
Subject: Update to upstream version 2.7.0
---
diff --git a/.gitignore b/.gitignore
index 7e85c99..3ce3159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xmlunit-1.3-src.zip
/xmlunit-1.6-src.zip
/xmlunit-2.6.2-src.tar.gz
/xmlunit-2.6.3-src.tar.gz
+/xmlunit-2.7.0-src.tar.gz
diff --git a/0001-Disable-tests-requiring-network-access.patch
b/0001-Disable-tests-requiring-network-access.patch
index e3abb0f..a6c2a0b 100644
--- a/0001-Disable-tests-requiring-network-access.patch
+++ b/0001-Disable-tests-requiring-network-access.patch
@@ -4,143 +4,124 @@ Date: Mon, 4 Mar 2019 14:52:59 +0100
Subject: [PATCH 1/4] Disable tests requiring network access
---
- .../assertj/XmlAssertNodesByXPathTest.java | 8 ---
- .../assertj/XmlAssertValidationTest.java | 51 -------------------
- .../assertj/XmlAssertValueByXPathTest.java | 8 ---
- .../matchers/ValidationMatcherTest.java | 13 -----
- 4 files changed, 80 deletions(-)
+ .../java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java | 2 ++
+ .../java/org/xmlunit/assertj/XmlAssertValidationTest.java | 6 ++++++
+ .../java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java | 2 ++
+ .../java/org/xmlunit/matchers/ValidationMatcherTest.java | 2 ++
+ 4 files changed, 12 insertions(+)
diff --git
a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
-index 6499f67..71267c3 100644
+index 6499f67..c465a51 100644
--- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
+++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
-@@ -42,14 +42,6 @@ public class XmlAssertNodesByXPathTest {
- assertThat(null).nodesByXPath("//foo");
+@@ -13,6 +13,7 @@
+ */
+ package org.xmlunit.assertj;
+
++import org.junit.Ignore;
+ import org.junit.Rule;
+ import org.junit.Test;
+
+@@ -43,6 +44,7 @@ public class XmlAssertNodesByXPathTest {
}
-- @Test
-- public void testNodesByXPath_withNull_shouldFailed() {
--
-- thrown.expectAssertionError(format("%nExpecting not blank but
was:<null>"));
--
--
assertThat("<a><b></b><c/></a>").nodesByXPath(null);
-- }
--
@Test
- public void testNodesByXPath_withWhitespacesOnly_shouldFailed() {
++ @Ignore
+ public void testNodesByXPath_withNull_shouldFailed() {
+ thrown.expectAssertionError(format("%nExpecting not blank but
was:<null>"));
diff --git
a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
-index cfa46ce..8031ede 100644
+index 7e2dc0e..f743cc4 100644
--- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
+++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
-@@ -82,47 +82,6 @@ public class XmlAssertValidationTest {
- assertThat(xml).isValidAgainst(xsd);
+@@ -14,6 +14,7 @@
+ package org.xmlunit.assertj;
+
+ import org.junit.ClassRule;
++import org.junit.Ignore;
+ import org.junit.Rule;
+ import org.junit.Test;
+ import org.xmlunit.TestResources;
+@@ -91,6 +92,7 @@ public class XmlAssertValidationTest {
+ }
+
+ @Test
++ @Ignore
+ public void testIsValidAgainst_withEmptySourcesArray_shouldPass() {
+
+ StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR +
"BookXsdGenerated.xml"));
+@@ -100,6 +102,7 @@ public class XmlAssertValidationTest {
}
-- @Test
-- public void testIsValidAgainst_withEmptySourcesArray_shouldPass() {
--
-- StreamSource xml = new StreamSource(new
File("../test-resources/BookXsdGenerated.xml"));
--
-- assertThat(xml).isValidAgainst();
-- assertThat(xml).isValidAgainst(new Object[0]);
-- }
--
-- @Test
-- public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() {
--
-- thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" +
-- " message=cvc-complex-type.2.4.b: The content of element
'Book' is not complete." +
-- " One of
'{\"https://www.xmlunit.org/publishing\":Publisher}' is
expected.");
--
-- StreamSource xml = new StreamSource(new
File("../test-resources/invalidBook.xml"));
--
-- assertThat(xml).isValidAgainst();
-- }
--
-- @Test
-- public void testIsValid_shouldPass() {
--
-- StreamSource xml = new StreamSource(new
File("../test-resources/BookXsdGenerated.xml"));
--
-- assertThat(xml).isValid();
-- }
--
-- @Test
-- public void testIsValid_withBrokenXml_shouldPass() {
--
-- thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" +
-- " message=cvc-complex-type.2.4.b: The content of element
'Book' is not complete." +
-- " One of
'{\"https://www.xmlunit.org/publishing\":Publisher}' is
expected.");
--
-- StreamSource xml = new StreamSource(new
File("../test-resources/invalidBook.xml"));
--
-- assertThat(xml).isValid();
-- }
--
@Test
- public void testIsInvalid_withBrokenXml_shouldPass() {
++ @Ignore
+ public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() {
-@@ -131,16 +90,6 @@ public class XmlAssertValidationTest {
- assertThat(xml).isInvalid();
+ thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" +
+@@ -112,6 +115,7 @@ public class XmlAssertValidationTest {
}
-- @Test
-- public void testIsInvalid_shouldField() {
--
-- thrown.expectAssertionErrorPattern("^\\nExpecting:\\n
<.*\\.\\.\\/test-resources\\/BookXsdGenerated.xml>\\nto be invalid");
--
-- StreamSource xml = new StreamSource(new
File("../test-resources/BookXsdGenerated.xml"));
--
-- assertThat(xml).isInvalid();
-- }
--
@Test
- public void testIsValidAgainst_withNullSchemaSources_shouldFailed() {
++ @Ignore
+ public void testIsValid_shouldPass() {
+ StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR +
"BookXsdGenerated.xml"));
+@@ -120,6 +124,7 @@ public class XmlAssertValidationTest {
+ }
+
+ @Test
++ @Ignore
+ public void testIsValid_withBrokenXml_shouldPass() {
+
+ thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" +
+@@ -140,6 +145,7 @@ public class XmlAssertValidationTest {
+ }
+
+ @Test
++ @Ignore
+ public void testIsInvalid_shouldField() {
+
+ thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*"
diff --git
a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
-index 4aaf96b..d3a9cdd 100644
+index 3ce5284..63c3db0 100644
--- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
+++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
-@@ -25,14 +25,6 @@ public class XmlAssertValueByXPathTest {
- @Rule
- public ExpectedException thrown = none();
-
-- @Test
-- public void testValueByXPath_withNull_shouldFailed() {
--
-- thrown.expectAssertionError(format("%nExpecting not blank but
was:<null>"));
--
--
assertThat("<a><b></b><c/></a>").valueByXPath(null);
-- }
--
+@@ -14,6 +14,7 @@
+ package org.xmlunit.assertj;
+
+ import org.junit.ClassRule;
++import org.junit.Ignore;
+ import org.junit.Rule;
+ import org.junit.Test;
+ import org.xmlunit.assertj.util.SetEnglishLocaleRule;
+@@ -31,6 +32,7 @@ public class XmlAssertValueByXPathTest {
+ public static SetEnglishLocaleRule locale = new SetEnglishLocaleRule();
+
@Test
- public void testValueByXPath_withWhitespacesOnly_shouldFailed() {
++ @Ignore
+ public void testValueByXPath_withNull_shouldFailed() {
+ thrown.expectAssertionError(format("%nExpecting not blank but
was:<null>"));
diff --git
a/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
b/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
-index 793e26a..eb4e9fa 100644
+index 6f26927..bf9a153 100644
--- a/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
+++ b/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
-@@ -76,19 +76,6 @@ public class ValidationMatcherTest {
- is(valid(new StreamSource(new
File("../test-resources/Book.xsd")))));
+@@ -13,6 +13,7 @@
+ */
+ package org.xmlunit.matchers;
+
++import org.junit.Ignore;
+ import org.junit.Rule;
+ import org.junit.Test;
+ import org.junit.rules.ExpectedException;
+@@ -79,6 +80,7 @@ public class ValidationMatcherTest {
}
-- @Test
-- public void shouldSuccessfullyValidateInstanceWithoutExplicitSchemaSource() {
-- try {
-- Class.forName("java.nio.file.FileSystem");
-- } catch (Throwable t) {
-- assumeTrue("Skipping on Java6 as it doesn't like xmlunit.org's
certificate",
-- false);
-- }
-- assertThat(new StreamSource(new
File("../test-resources/BookXsdGenerated.xml")),
-- is(new ValidationMatcher()));
--
-- }
--
- @Test(expected = AssertionError.class)
- public void shouldThrowOnBrokenInstanceWithoutExplicitSchemaSource() {
- assertThat(new StreamSource(new
File("../test-resources/invalidBook.xml")),
+ @Test
++ @Ignore
+ public void shouldSuccessfullyValidateInstanceWithoutExplicitSchemaSource() {
+ try {
+ Class.forName("java.nio.file.FileSystem");
--
-2.21.0
+2.25.4
diff --git a/sources b/sources
index afb883f..4d4b1d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlunit-2.6.3-src.tar.gz) =
c52e9dc1d67ee61d266d35e59e7c54ca554fcc8fd7036ed1c6dacb85ebf8cc545da0cae9863b1c228b59abfd1ae659b080f691c02257b96f3882a9d9ecb8dbf9
+SHA512 (xmlunit-2.7.0-src.tar.gz) =
888e13165962d1a3906236e760fccd28cb7053f962a34da58d8c3b9305cd1a610aca7be19f7fca9fec69ef4be4cb5e2a8355a0c43f27c14d6d3b693e1a0f8d6e
diff --git a/xmlunit.spec b/xmlunit.spec
index 9b52196..7ebf0dc 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -1,6 +1,6 @@
Name: xmlunit
-Version: 2.6.3
-Release: 2%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
Summary: Provides classes to do asserts on xml
# The whole package is ASL 2.0 except for xmlunit-legacy which is BSD
License: ASL 2.0 and BSD
@@ -14,6 +14,7 @@ Patch4: 0004-Drop-support-for-JAXB.patch
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(net.bytebuddy:byte-buddy)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.assertj:assertj-core)
BuildRequires: mvn(org.hamcrest:hamcrest-core)
@@ -103,6 +104,9 @@ rm -rf
xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.
%files placeholders -f .mfiles-xmlunit-placeholders
%changelog
+* Wed Jul 29 2020 Marian Koncek <mkoncek(a)redhat.com> - 2.7.0-1
+- Update to upstream version 2.7.0
+
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.6.3-2
- Mass rebuild for javapackages-tools 201902
https://src.fedoraproject.org/rpms/xmlunit/c/ac68d202597f41909222a03002e1...