2022-04-22 01:33:18 +00:00
|
|
|
From 81808e548ddc6cf0a3cc12285f48caa2bd517a07 Mon Sep 17 00:00:00 2001
|
2019-04-15 12:37:10 +00:00
|
|
|
From: Marian Koncek <mkoncek@redhat.com>
|
|
|
|
Date: Mon, 4 Mar 2019 14:52:59 +0100
|
2022-04-22 01:33:18 +00:00
|
|
|
Subject: [PATCH 1/3] Disable tests requiring network access
|
2019-04-15 12:37:10 +00:00
|
|
|
|
|
|
|
---
|
2022-04-22 01:33:18 +00:00
|
|
|
.../org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java | 2 ++
|
|
|
|
.../java/org/xmlunit/assertj3/XmlAssertValidationTest.java | 6 ++++++
|
|
|
|
.../org/xmlunit/assertj3/XmlAssertValueByXPathTest.java | 2 ++
|
|
|
|
.../org/custommonkey/xmlunit/test_AbstractNodeTester.java | 2 +-
|
|
|
|
.../org/custommonkey/xmlunit/test_DifferenceEngine.java | 2 +-
|
|
|
|
.../org/custommonkey/xmlunit/test_NewDifferenceEngine.java | 2 +-
|
|
|
|
.../test/java/org/custommonkey/xmlunit/test_Validator.java | 2 +-
|
2020-07-29 07:54:23 +00:00
|
|
|
.../java/org/xmlunit/matchers/ValidationMatcherTest.java | 2 ++
|
2022-04-22 01:33:18 +00:00
|
|
|
8 files changed, 16 insertions(+), 4 deletions(-)
|
2019-04-15 12:37:10 +00:00
|
|
|
|
2021-01-28 14:00:57 +00:00
|
|
|
diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java
|
2022-04-22 01:33:18 +00:00
|
|
|
index 166633e..926c647 100644
|
2021-01-28 14:00:57 +00:00
|
|
|
--- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java
|
|
|
|
+++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertNodesByXPathTest.java
|
2020-07-29 07:54:23 +00:00
|
|
|
@@ -13,6 +13,7 @@
|
|
|
|
*/
|
2021-01-28 14:00:57 +00:00
|
|
|
package org.xmlunit.assertj3;
|
2020-07-29 07:54:23 +00:00
|
|
|
|
|
|
|
+import org.junit.Ignore;
|
|
|
|
import org.junit.Rule;
|
|
|
|
import org.junit.Test;
|
|
|
|
|
2022-04-22 01:33:18 +00:00
|
|
|
@@ -43,6 +44,7 @@ public void testAssertThat_withNull_shouldFailed() {
|
2019-04-15 12:37:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
2020-07-29 07:54:23 +00:00
|
|
|
+ @Ignore
|
|
|
|
public void testNodesByXPath_withNull_shouldFailed() {
|
2019-04-15 12:37:10 +00:00
|
|
|
|
2020-07-29 07:54:23 +00:00
|
|
|
thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
|
2021-01-28 14:00:57 +00:00
|
|
|
diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java
|
2022-04-22 01:33:18 +00:00
|
|
|
index d4f1e82..027e7e9 100644
|
2021-01-28 14:00:57 +00:00
|
|
|
--- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java
|
|
|
|
+++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java
|
2020-07-29 07:54:23 +00:00
|
|
|
@@ -14,6 +14,7 @@
|
2021-01-28 14:00:57 +00:00
|
|
|
package org.xmlunit.assertj3;
|
2020-07-29 07:54:23 +00:00
|
|
|
|
|
|
|
import org.junit.ClassRule;
|
|
|
|
+import org.junit.Ignore;
|
|
|
|
import org.junit.Rule;
|
|
|
|
import org.junit.Test;
|
|
|
|
import org.xmlunit.TestResources;
|
2022-04-22 01:33:18 +00:00
|
|
|
@@ -91,6 +92,7 @@ public void testIsValidAgainst_withBrokenXml_shouldFailed() {
|
2020-07-29 07:54:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
|
|
+ @Ignore
|
|
|
|
public void testIsValidAgainst_withEmptySourcesArray_shouldPass() {
|
|
|
|
|
|
|
|
StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml"));
|
2022-04-22 01:33:18 +00:00
|
|
|
@@ -100,6 +102,7 @@ public void testIsValidAgainst_withEmptySourcesArray_shouldPass() {
|
2019-04-15 12:37:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
2020-07-29 07:54:23 +00:00
|
|
|
+ @Ignore
|
|
|
|
public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed() {
|
2019-04-15 12:37:10 +00:00
|
|
|
|
2020-07-29 07:54:23 +00:00
|
|
|
thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" +
|
2022-04-22 01:33:18 +00:00
|
|
|
@@ -112,6 +115,7 @@ public void testIsValidAgainst_withBrokenXmlAndEmptySourcesArray_shouldFailed()
|
2019-04-15 12:37:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
2020-07-29 07:54:23 +00:00
|
|
|
+ @Ignore
|
|
|
|
public void testIsValid_shouldPass() {
|
2019-04-15 12:37:10 +00:00
|
|
|
|
2020-07-29 07:54:23 +00:00
|
|
|
StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml"));
|
2022-04-22 01:33:18 +00:00
|
|
|
@@ -120,6 +124,7 @@ public void testIsValid_shouldPass() {
|
2020-07-29 07:54:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
|
|
+ @Ignore
|
|
|
|
public void testIsValid_withBrokenXml_shouldPass() {
|
|
|
|
|
|
|
|
thrown.expectAssertionError("1. line=9; column=8; type=ERROR;" +
|
2022-04-22 01:33:18 +00:00
|
|
|
@@ -140,6 +145,7 @@ public void testIsInvalid_withBrokenXml_shouldPass() {
|
2020-07-29 07:54:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
|
|
+ @Ignore
|
|
|
|
public void testIsInvalid_shouldField() {
|
|
|
|
|
|
|
|
thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*"
|
2021-01-28 14:00:57 +00:00
|
|
|
diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java
|
2022-04-22 01:33:18 +00:00
|
|
|
index 7ac9a3f..3cb825b 100644
|
2021-01-28 14:00:57 +00:00
|
|
|
--- a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java
|
|
|
|
+++ b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValueByXPathTest.java
|
2020-07-29 07:54:23 +00:00
|
|
|
@@ -14,6 +14,7 @@
|
2021-01-28 14:00:57 +00:00
|
|
|
package org.xmlunit.assertj3;
|
2020-07-29 07:54:23 +00:00
|
|
|
|
|
|
|
import org.junit.ClassRule;
|
|
|
|
+import org.junit.Ignore;
|
|
|
|
import org.junit.Rule;
|
|
|
|
import org.junit.Test;
|
2021-01-28 14:00:57 +00:00
|
|
|
import org.xmlunit.assertj3.util.SetEnglishLocaleRule;
|
2020-07-29 07:54:23 +00:00
|
|
|
@@ -31,6 +32,7 @@ public class XmlAssertValueByXPathTest {
|
|
|
|
public static SetEnglishLocaleRule locale = new SetEnglishLocaleRule();
|
|
|
|
|
2019-04-15 12:37:10 +00:00
|
|
|
@Test
|
2020-07-29 07:54:23 +00:00
|
|
|
+ @Ignore
|
|
|
|
public void testValueByXPath_withNull_shouldFailed() {
|
2019-04-15 12:37:10 +00:00
|
|
|
|
2020-07-29 07:54:23 +00:00
|
|
|
thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
|
2022-04-22 01:33:18 +00:00
|
|
|
diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java
|
|
|
|
index 3a8ac80..df02659 100644
|
|
|
|
--- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java
|
|
|
|
+++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_AbstractNodeTester.java
|
|
|
|
@@ -176,7 +176,7 @@ public void testTextNode() {
|
|
|
|
}
|
|
|
|
|
|
|
|
// never called as NodeTest directly jumps to the document element
|
|
|
|
- public void testDocumentType() throws Exception {
|
|
|
|
+ public void no_testDocumentType() throws Exception {
|
|
|
|
AbstractNodeTester t = new AbstractNodeTester() { };
|
|
|
|
DocumentType n = XMLUnit
|
|
|
|
.buildControlDocument("<!DOCTYPE Book PUBLIC \"XMLUNIT/TEST/PUB1\" \"../test-resources/Book.dtd\">"
|
|
|
|
diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java
|
|
|
|
index 344d66c..35220b8 100644
|
|
|
|
--- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java
|
|
|
|
+++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_DifferenceEngine.java
|
|
|
|
@@ -1020,7 +1020,7 @@ public void testIgnoresDifferencesBetweenDocAndRootElement()
|
|
|
|
listener.different);
|
|
|
|
}
|
|
|
|
|
|
|
|
- public void testDoctypeDifferences() throws Exception {
|
|
|
|
+ public void no_testDoctypeDifferences() throws Exception {
|
|
|
|
String control = "<?xml version = \"1.0\" encoding = \"UTF-8\"?>"
|
|
|
|
+ "<!DOCTYPE Book PUBLIC \"XMLUNIT/TEST/PUB1\" \"../test-resources/Book.dtd\">"
|
|
|
|
+ "<Book/>";
|
|
|
|
diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java
|
|
|
|
index 0e23767..526be89 100644
|
|
|
|
--- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java
|
|
|
|
+++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_NewDifferenceEngine.java
|
|
|
|
@@ -567,7 +567,7 @@ public void testIgnoresDifferencesBetweenDocAndRootElement()
|
|
|
|
listener.different);
|
|
|
|
}
|
|
|
|
|
|
|
|
- public void testDoctypeDifferences() throws Exception {
|
|
|
|
+ public void no_testDoctypeDifferences() throws Exception {
|
|
|
|
String control = "<?xml version = \"1.0\" encoding = \"UTF-8\"?>"
|
|
|
|
+ "<!DOCTYPE Book PUBLIC \"XMLUNIT/TEST/PUB1\" \"../test-resources/Book.dtd\">"
|
|
|
|
+ "<Book/>";
|
|
|
|
diff --git a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_Validator.java b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_Validator.java
|
|
|
|
index ad63592..cfcc5e2 100644
|
|
|
|
--- a/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_Validator.java
|
|
|
|
+++ b/xmlunit-legacy/src/test/java/org/custommonkey/xmlunit/test_Validator.java
|
|
|
|
@@ -57,7 +57,7 @@ public class test_Validator extends XMLTestCase {
|
|
|
|
private Validator validator;
|
|
|
|
private File tempDTDFile;
|
|
|
|
|
|
|
|
- public void testXSchema() throws Exception{
|
|
|
|
+ public void no_testXSchema() throws Exception{
|
|
|
|
File xsdFile = new File(test_Constants.TEST_RESOURCE_DIR + "Book.xsd");
|
|
|
|
assertTrue("xsdFile " + xsdFile.getAbsolutePath() + " exists",
|
|
|
|
xsdFile.exists());
|
2019-04-15 12:37:10 +00:00
|
|
|
diff --git a/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java b/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
|
2020-07-29 07:54:23 +00:00
|
|
|
index 6f26927..bf9a153 100644
|
2019-04-15 12:37:10 +00:00
|
|
|
--- a/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
|
|
|
|
+++ b/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
|
2020-07-29 07:54:23 +00:00
|
|
|
@@ -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;
|
2022-04-22 01:33:18 +00:00
|
|
|
@@ -79,6 +80,7 @@ public void shouldThrowOnBrokenInstance() {
|
2019-04-15 12:37:10 +00:00
|
|
|
}
|
|
|
|
|
2020-07-29 07:54:23 +00:00
|
|
|
@Test
|
|
|
|
+ @Ignore
|
|
|
|
public void shouldSuccessfullyValidateInstanceWithoutExplicitSchemaSource() {
|
|
|
|
try {
|
|
|
|
Class.forName("java.nio.file.FileSystem");
|
2019-04-15 12:37:10 +00:00
|
|
|
--
|
2022-04-22 01:33:18 +00:00
|
|
|
2.35.1
|
2019-04-15 12:37:10 +00:00
|
|
|
|