131 lines
6.2 KiB
Diff
131 lines
6.2 KiB
Diff
diff -r -u xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java
|
|
--- xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java 2018-08-21 22:03:14.000000000 +0200
|
|
+++ xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertNodesByXPathTest.java 2020-05-15 13:40:22.050239084 +0200
|
|
@@ -43,14 +43,6 @@
|
|
}
|
|
|
|
@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() {
|
|
|
|
thrown.expectAssertionError(format("%nExpecting not blank but was:<\" \n \t\">"));
|
|
diff -r -u xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
|
|
--- xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java 2020-05-03 21:05:12.000000000 +0200
|
|
+++ xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java 2020-05-15 13:44:15.720157403 +0200
|
|
@@ -91,64 +91,12 @@
|
|
}
|
|
|
|
@Test
|
|
- public void testIsValidAgainst_withEmptySourcesArray_shouldPass() {
|
|
-
|
|
- StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "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(TestResources.TEST_RESOURCE_DIR + "invalidBook.xml"));
|
|
-
|
|
- assertThat(xml).isValidAgainst();
|
|
- }
|
|
-
|
|
- @Test
|
|
- public void testIsValid_shouldPass() {
|
|
-
|
|
- StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "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(TestResources.TEST_RESOURCE_DIR + "invalidBook.xml"));
|
|
-
|
|
- assertThat(xml).isValid();
|
|
- }
|
|
-
|
|
- @Test
|
|
public void testIsInvalid_withBrokenXml_shouldPass() {
|
|
|
|
StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "invalidBook.xml"));
|
|
|
|
assertThat(xml).isInvalid();
|
|
}
|
|
-
|
|
- @Test
|
|
- public void testIsInvalid_shouldField() {
|
|
-
|
|
- thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*"
|
|
- + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "BookXsdGenerated.xml>\\nto be invalid");
|
|
-
|
|
- StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml"));
|
|
-
|
|
- assertThat(xml).isInvalid();
|
|
- }
|
|
|
|
@Test
|
|
public void testIsValidAgainst_withNullSchemaSources_shouldFailed() {
|
|
Nur in xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj: XmlAssertValidationTest.java~.
|
|
diff -r -u xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java
|
|
--- xmlunit-2.7.0-src-orig/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java 2020-04-28 10:10:30.000000000 +0200
|
|
+++ xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValueByXPathTest.java 2020-05-15 13:47:13.361335083 +0200
|
|
@@ -31,14 +31,6 @@
|
|
public static SetEnglishLocaleRule locale = new SetEnglishLocaleRule();
|
|
|
|
@Test
|
|
- public void testValueByXPath_withNull_shouldFailed() {
|
|
-
|
|
- thrown.expectAssertionError(format("%nExpecting not blank but was:<null>"));
|
|
-
|
|
- assertThat("<a><b></b><c/></a>").valueByXPath(null);
|
|
- }
|
|
-
|
|
- @Test
|
|
public void testValueByXPath_withWhitespacesOnly_shouldFailed() {
|
|
|
|
thrown.expectAssertionError(format("%nExpecting not blank but was:<\" \n \t\">"));
|
|
Nur in xmlunit-2.7.0-src/xmlunit-assertj/src/test/java/org/xmlunit/assertj: XmlAssertValueByXPathTest.java~.
|
|
diff -r -u xmlunit-2.7.0-src-orig/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java xmlunit-2.7.0-src/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java
|
|
--- xmlunit-2.7.0-src-orig/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java 2019-12-31 14:00:54.000000000 +0100
|
|
+++ xmlunit-2.7.0-src/xmlunit-matchers/src/test/java/org/xmlunit/matchers/ValidationMatcherTest.java 2020-05-15 13:49:17.980758207 +0200
|
|
@@ -78,19 +78,6 @@
|
|
is(valid(new StreamSource(new File(TestResources.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_RESOURCE_DIR + "BookXsdGenerated.xml")),
|
|
- is(new ValidationMatcher()));
|
|
-
|
|
- }
|
|
-
|
|
@Test(expected = AssertionError.class)
|
|
public void shouldThrowOnBrokenInstanceWithoutExplicitSchemaSource() {
|
|
assertThat(new StreamSource(new File(TEST_RESOURCE_DIR + "invalidBook.xml")),
|
|
Nur in xmlunit-2.7.0-src/xmlunit-matchers/src/test/java/org/xmlunit/matchers: ValidationMatcherTest.java~.
|