Compare commits
No commits in common. "c8-stream-201902" and "c9-beta" have entirely different histories.
c8-stream-
...
c9-beta
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/xmlunit-2.6.3-src.tar.gz
|
SOURCES/xmlunit-2.8.2.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
19d9c8df1d4645d59e15a27e978370964fd45030 SOURCES/xmlunit-2.6.3-src.tar.gz
|
be39d0bab77de816ae04be6d2f58cef6138f0461 SOURCES/xmlunit-2.8.2.tar.gz
|
||||||
|
@ -4,143 +4,124 @@ Date: Mon, 4 Mar 2019 14:52:59 +0100
|
|||||||
Subject: [PATCH 1/4] Disable tests requiring network access
|
Subject: [PATCH 1/4] Disable tests requiring network access
|
||||||
|
|
||||||
---
|
---
|
||||||
.../assertj/XmlAssertNodesByXPathTest.java | 8 ---
|
.../java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java | 2 ++
|
||||||
.../assertj/XmlAssertValidationTest.java | 51 -------------------
|
.../java/org/xmlunit/assertj3/XmlAssertValidationTest.java | 6 ++++++
|
||||||
.../assertj/XmlAssertValueByXPathTest.java | 8 ---
|
.../java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java | 2 ++
|
||||||
.../matchers/ValidationMatcherTest.java | 13 -----
|
.../java/org/xmlunit/matchers/ValidationMatcherTest.java | 2 ++
|
||||||
4 files changed, 80 deletions(-)
|
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
|
diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java
|
||||||
index 6499f67..71267c3 100644
|
index 6499f67..c465a51 100644
|
||||||
--- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
|
--- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java
|
||||||
+++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
|
+++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java
|
||||||
@@ -42,14 +42,6 @@ public class XmlAssertNodesByXPathTest {
|
@@ -13,6 +13,7 @@
|
||||||
assertThat(null).nodesByXPath("//foo");
|
*/
|
||||||
|
package org.xmlunit.assertj3;
|
||||||
|
|
||||||
|
+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
|
@Test
|
||||||
public void testNodesByXPath_withWhitespacesOnly_shouldFailed() {
|
+ @Ignore
|
||||||
|
public void testNodesByXPath_withNull_shouldFailed() {
|
||||||
|
|
||||||
diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
|
thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
|
||||||
index cfa46ce..8031ede 100644
|
diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java
|
||||||
--- a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
|
index 7e2dc0e..f743cc4 100644
|
||||||
+++ b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
|
--- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java
|
||||||
@@ -82,47 +82,6 @@ public class XmlAssertValidationTest {
|
+++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java
|
||||||
assertThat(xml).isValidAgainst(xsd);
|
@@ -14,6 +14,7 @@
|
||||||
|
package org.xmlunit.assertj3;
|
||||||
|
|
||||||
|
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
|
|
||||||
- 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
|
@Test
|
||||||
public void testIsInvalid_withBrokenXml_shouldPass() {
|
+ @Ignore
|
||||||
|
public void testIsValidAgainst_withEmptySourcesArray_shouldPass() {
|
||||||
|
|
||||||
@@ -131,16 +90,6 @@ public class XmlAssertValidationTest {
|
StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml"));
|
||||||
assertThat(xml).isInvalid();
|
@@ -100,6 +102,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
|
@Test
|
||||||
public void testIsValidAgainst_withNullSchemaSources_shouldFailed() {
|
+ @Ignore
|
||||||
|
public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() {
|
||||||
|
|
||||||
diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
|
thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" +
|
||||||
index 4aaf96b..d3a9cdd 100644
|
@@ -112,6 +115,7 @@ public class XmlAssertValidationTest {
|
||||||
--- 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);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
@Test
|
@Test
|
||||||
public void testValueByXPath_withWhitespacesOnly_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-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java
|
||||||
|
index 3ce5284..63c3db0 100644
|
||||||
|
--- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java
|
||||||
|
+++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java
|
||||||
|
@@ -14,6 +14,7 @@
|
||||||
|
package org.xmlunit.assertj3;
|
||||||
|
|
||||||
|
import org.junit.ClassRule;
|
||||||
|
+import org.junit.Ignore;
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.xmlunit.assertj3.util.SetEnglishLocaleRule;
|
||||||
|
@@ -31,6 +32,7 @@ public class XmlAssertValueByXPathTest {
|
||||||
|
public static SetEnglishLocaleRule locale = new SetEnglishLocaleRule();
|
||||||
|
|
||||||
|
@Test
|
||||||
|
+ @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
|
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
|
--- a/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
|
||||||
+++ b/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 {
|
@@ -13,6 +13,7 @@
|
||||||
is(valid(new StreamSource(new File("../test-resources/Book.xsd")))));
|
*/
|
||||||
|
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
|
@Test
|
||||||
- public void shouldSuccessfullyValidateInstanceWithoutExplicitSchemaSource() {
|
+ @Ignore
|
||||||
- try {
|
public void shouldSuccessfullyValidateInstanceWithoutExplicitSchemaSource() {
|
||||||
- Class.forName("java.nio.file.FileSystem");
|
try {
|
||||||
- } catch (Throwable t) {
|
Class.forName("java.nio.file.FileSystem");
|
||||||
- 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")),
|
|
||||||
--
|
--
|
||||||
2.21.0
|
2.25.4
|
||||||
|
|
||||||
|
@ -9,10 +9,10 @@ Subject: [PATCH 4/4] Drop support for JAXB
|
|||||||
2 files changed, 2 insertions(+), 9 deletions(-)
|
2 files changed, 2 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
diff --git a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java b/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java
|
diff --git a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java b/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java
|
||||||
index 5321ff7..2b13cac 100644
|
index 27d9c5a..81165cc 100644
|
||||||
--- a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java
|
--- a/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java
|
||||||
+++ b/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java
|
+++ b/xmlunit-core/src/main/java/org/xmlunit/builder/Input.java
|
||||||
@@ -150,8 +150,8 @@ public class Input {
|
@@ -153,8 +153,8 @@ public class Input {
|
||||||
/**
|
/**
|
||||||
* Build a Source from a Jaxb-Object.
|
* Build a Source from a Jaxb-Object.
|
||||||
*/
|
*/
|
||||||
@ -24,7 +24,7 @@ index 5321ff7..2b13cac 100644
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
diff --git a/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java b/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java
|
diff --git a/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java b/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java
|
||||||
index 83ff38a..fac270d 100644
|
index e767f38..98e3fe7 100644
|
||||||
--- a/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java
|
--- a/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java
|
||||||
+++ b/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java
|
+++ b/xmlunit-core/src/test/java/org/xmlunit/builder/InputTest.java
|
||||||
@@ -31,7 +31,6 @@ import org.w3c.dom.Document;
|
@@ -31,7 +31,6 @@ import org.w3c.dom.Document;
|
||||||
@ -35,7 +35,7 @@ index 83ff38a..fac270d 100644
|
|||||||
import org.xmlunit.util.Convert;
|
import org.xmlunit.util.Convert;
|
||||||
import org.xmlunit.xpath.JAXPXPathEngine;
|
import org.xmlunit.xpath.JAXPXPathEngine;
|
||||||
|
|
||||||
@@ -148,10 +147,6 @@ public class InputTest {
|
@@ -132,10 +131,6 @@ public class InputTest {
|
||||||
allIsWellFor(s, "furry");
|
allIsWellFor(s, "furry");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,15 +46,15 @@ index 83ff38a..fac270d 100644
|
|||||||
@Test public void shouldParseUnknownToSource() throws Exception {
|
@Test public void shouldParseUnknownToSource() throws Exception {
|
||||||
// from Source
|
// from Source
|
||||||
allIsWellFor(Input.from(Input.fromByteArray(readTestFile()).build()).build());
|
allIsWellFor(Input.from(Input.fromByteArray(readTestFile()).build()).build());
|
||||||
@@ -169,8 +164,6 @@ public class InputTest {
|
@@ -153,8 +148,6 @@ public class InputTest {
|
||||||
allIsWellFor(Input.from(new URI("file:" + TestResources.ANIMAL_FILE)).build());
|
allIsWellFor(Input.from(new URI("file:" + TestResources.ANIMAL_FILE)).build());
|
||||||
// from URL
|
// from URL
|
||||||
allIsWellFor(Input.from(new URL("file:" + TestResources.ANIMAL_FILE)).build());
|
allIsWellFor(Input.from(new URL("file:" + TestResources.ANIMAL_FILE)).build());
|
||||||
- // from Jaxb-Object
|
- // from Jaxb-Object
|
||||||
- allIsWellFor(Input.from(new ComplexNode()).build(), "complexNode");
|
- allIsWellFor(Input.from(new ComplexNode()).build(), "complexNode");
|
||||||
// from InputStream
|
// from InputStream
|
||||||
FileInputStream is = null;
|
try (FileInputStream is = new FileInputStream(TestResources.ANIMAL_FILE)) {
|
||||||
try {
|
allIsWellFor(Input.from(is).build());
|
||||||
--
|
--
|
||||||
2.21.0
|
2.29.2
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
From 2aa7002c9ff0d6226ff75048dd3cee15a180dd99 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marian Koncek <mkoncek@redhat.com>
|
|
||||||
Date: Wed, 16 Oct 2019 09:32:19 +0200
|
|
||||||
Subject: [PATCH 3/4] 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..5078360 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
|
|
||||||
|
|
20
SOURCES/generate-tarball.sh
Executable file
20
SOURCES/generate-tarball.sh
Executable file
@ -0,0 +1,20 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
name=xmlunit
|
||||||
|
version="$(sed -n 's/Version:\s*//p' *.spec)"
|
||||||
|
|
||||||
|
# RETRIEVE
|
||||||
|
wget "https://github.com/xmlunit/xmlunit/releases/download/v${version}/${name}-${version}-src.tar.gz" -O "${name}-${version}.orig.tar.gz"
|
||||||
|
|
||||||
|
rm -rf tarball-tmp
|
||||||
|
mkdir tarball-tmp
|
||||||
|
pushd tarball-tmp
|
||||||
|
tar xf "../${name}-${version}.orig.tar.gz"
|
||||||
|
|
||||||
|
# CLEAN TARBALL
|
||||||
|
rm */GPATH */GRTAGS */GTAGS
|
||||||
|
|
||||||
|
tar -czf "../${name}-${version}.tar.gz" *
|
||||||
|
popd
|
||||||
|
rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
|
@ -1,27 +1,35 @@
|
|||||||
|
%bcond_with bootstrap
|
||||||
|
|
||||||
Name: xmlunit
|
Name: xmlunit
|
||||||
Version: 2.6.3
|
Version: 2.8.2
|
||||||
Release: 2%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: Provides classes to do asserts on xml
|
Summary: Provides classes to do asserts on xml
|
||||||
# The whole package is ASL 2.0 except for xmlunit-legacy which is BSD
|
# The whole package is ASL 2.0 except for xmlunit-legacy which is BSD
|
||||||
License: ASL 2.0 and BSD
|
License: ASL 2.0 and BSD
|
||||||
Source0: https://github.com/xmlunit/xmlunit/releases/download/v%{version}/%{name}-%{version}-src.tar.gz
|
|
||||||
URL: https://www.xmlunit.org/
|
URL: https://www.xmlunit.org/
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
# ./generate-tarball.sh
|
||||||
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
# Remove bundled binaries which cannot be easily verified for licensing
|
||||||
|
Source1: generate-tarball.sh
|
||||||
|
|
||||||
Patch1: 0001-Disable-tests-requiring-network-access.patch
|
Patch1: 0001-Disable-tests-requiring-network-access.patch
|
||||||
Patch2: 0002-Port-to-hamcrest-2.1.patch
|
Patch2: 0002-Port-to-hamcrest-2.1.patch
|
||||||
Patch3: 0003-Fix-test-failure.patch
|
Patch3: 0003-Drop-support-for-JAXB.patch
|
||||||
Patch4: 0004-Drop-support-for-JAXB.patch
|
|
||||||
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
|
%if %{with bootstrap}
|
||||||
|
BuildRequires: javapackages-bootstrap
|
||||||
|
%else
|
||||||
BuildRequires: mvn(junit:junit)
|
BuildRequires: mvn(junit:junit)
|
||||||
|
BuildRequires: mvn(net.bytebuddy:byte-buddy)
|
||||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
|
|
||||||
BuildRequires: mvn(org.assertj:assertj-core)
|
BuildRequires: mvn(org.assertj:assertj-core)
|
||||||
BuildRequires: mvn(org.hamcrest:hamcrest-core)
|
BuildRequires: mvn(org.hamcrest:hamcrest-core)
|
||||||
BuildRequires: mvn(org.hamcrest:hamcrest-library)
|
BuildRequires: mvn(org.hamcrest:hamcrest-library)
|
||||||
BuildRequires: mvn(org.mockito:mockito-core)
|
BuildRequires: mvn(org.mockito:mockito-core)
|
||||||
|
%endif
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
XMLUnit provides you with the tools to verify the XML you emit is the one you
|
XMLUnit provides you with the tools to verify the XML you emit is the one you
|
||||||
@ -69,20 +77,25 @@ This package provides %{summary}.
|
|||||||
|
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -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
|
%patch3 -p1
|
||||||
%patch4 -p1
|
|
||||||
|
# Tests compare the string constent of thrown exceptions
|
||||||
|
# and we use a different version of assertj
|
||||||
|
find xmlunit-assertj3/src/test -name '*.java' -exec sed -i 's/\(Expecting not blank but was:\)<\(.*\)>/\1 \2/' {} +
|
||||||
|
sed -i 's/\(expected:\)<\\"\[\(something\)\]\\"> but was:<\\"\[\(abc\)\]\\">/\1 \\"\2\\"\\nbut was : \\"\3\\"/' xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/ValueAssertTest.java
|
||||||
|
|
||||||
|
%pom_disable_module xmlunit-assertj
|
||||||
|
|
||||||
%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
|
%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
|
||||||
%pom_remove_plugin :maven-assembly-plugin
|
%pom_remove_plugin :maven-assembly-plugin
|
||||||
|
%pom_remove_plugin -r :maven-shade-plugin
|
||||||
|
|
||||||
%mvn_alias "org.xmlunit:xmlunit-legacy" "xmlunit:xmlunit"
|
%mvn_alias org.xmlunit:xmlunit-legacy xmlunit:xmlunit
|
||||||
|
%mvn_alias org.xmlunit:xmlunit-assertj3 org.xmlunit:xmlunit-assertj
|
||||||
|
|
||||||
# JAXB and JAF are not available in JDK11
|
# JAXB and JAF are not available in JDK11
|
||||||
%pom_remove_dep javax.activation:* xmlunit-core
|
%pom_remove_dep org.glassfish.jaxb: xmlunit-core
|
||||||
%pom_remove_dep javax.xml.bind:* xmlunit-core
|
%pom_remove_dep jakarta.xml.bind: xmlunit-core
|
||||||
%pom_remove_dep com.sun.xml.bind:* xmlunit-core
|
|
||||||
rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java}
|
rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -96,16 +109,71 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.
|
|||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%files javadoc -f .mfiles-javadoc
|
%files javadoc -f .mfiles-javadoc
|
||||||
%files assertj -f .mfiles-xmlunit-assertj
|
%files assertj -f .mfiles-xmlunit-assertj3
|
||||||
%files core -f .mfiles-xmlunit-core
|
%files core -f .mfiles-xmlunit-core
|
||||||
%files legacy -f .mfiles-xmlunit-legacy
|
%files legacy -f .mfiles-xmlunit-legacy
|
||||||
%files matchers -f .mfiles-xmlunit-matchers
|
%files matchers -f .mfiles-xmlunit-matchers
|
||||||
%files placeholders -f .mfiles-xmlunit-placeholders
|
%files placeholders -f .mfiles-xmlunit-placeholders
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.8.2-6
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Jun 18 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-5
|
||||||
|
- Clean tarball from content with questionable licensing
|
||||||
|
- Resolves: rhbz#1973743
|
||||||
|
|
||||||
|
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-4
|
||||||
|
- Rebuild to workaround DistroBaker issue
|
||||||
|
|
||||||
|
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-3
|
||||||
|
- Bootstrap Maven for CentOS Stream 9
|
||||||
|
|
||||||
|
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.2-2
|
||||||
|
- Bootstrap build
|
||||||
|
- Non-bootstrap build
|
||||||
|
|
||||||
|
* Thu Feb 04 2021 Merlin Mathesius <mmathesi@redhat.com> - 0:2.7.0-7
|
||||||
|
- Update previous patch to use improved version that was merged upstream
|
||||||
|
|
||||||
|
* Fri Jan 29 2021 Merlin Mathesius <mmathesi@redhat.com> - 0:2.7.0-6
|
||||||
|
- Fix FTBFS by patching 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
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 2.8.2-1
|
||||||
|
- Update to upstream version 2.8.2
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 2.7.0-1
|
||||||
|
- Update to upstream version 2.7.0
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 20 2020 Mat Booth <mat.booth@redhat.com> - 0:2.7.0-3
|
||||||
|
- Allow building against JDK 11
|
||||||
|
|
||||||
|
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.7.0-2
|
||||||
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||||
|
|
||||||
|
* Wed May 13 2020 Dr. Tilmann Bubeck <bubeck@fedoraproject.org> - 0:2.7.0-1
|
||||||
|
- Update to version 2.7.0.
|
||||||
|
|
||||||
|
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.6.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.3-2
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.3-2
|
||||||
- Mass rebuild for javapackages-tools 201902
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
|
* Mon Jul 29 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.6.3-1
|
||||||
|
- Update to version 2.6.3.
|
||||||
|
|
||||||
|
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.6-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 2.6.3-1
|
* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 2.6.3-1
|
||||||
- Update to upstream version 2.6.3
|
- Update to upstream version 2.6.3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user