From 73abcb06636217e52a9d56b4dc3c69bd37141d44 Mon Sep 17 00:00:00 2001

From: Marian Koncek <mkoncek@redhat.com>

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(-)

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

--- 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");

     }

-    @Test

-    public void testNodesByXPath_withNull_shouldFailed() {

-

-        thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));

-

-        assertThat("<c/>").nodesByXPath(null);

-    }

-

     @Test

     public void testNodesByXPath_withWhitespacesOnly_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

index cfa46ce..8031ede 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);

     }

-    @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() {

@@ -131,16 +90,6 @@ public class XmlAssertValidationTest {

         assertThat(xml).isInvalid();

     }

-    @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() {

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

--- 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("<c/>").valueByXPath(null);

-    }

-

     @Test

     public void testValueByXPath_withWhitespacesOnly_shouldFailed() {

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

--- 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")))));

     }

-    @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")),

-- 

2.21.0