issue-252: Adopt tests for Windows OS

xmlunit · Mar 10, 2022 · 50ff600 · 50ff600
1 parent 0a61c82
commit 50ff600
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/CompareAssertAreIdenticalTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/CompareAssertAreIdenticalTest.java
@@ -185,7 +185,7 @@ public void testAreIdentical_withIgnoreWhitespaceAndTextValue_shouldPass() {
     public void testAreIdentical_withIgnoreElementContentWhitespace_shouldFailed() {
 
         thrown.expectAssertionError("Expecting:%n <control instance> and <test instance> to be identical");
-        thrown.expectAssertionError("Expected text value 'x' but was '%nx '");
+        thrown.expectAssertionError("Expected text value 'x' but was '\nx '");
 
         String testXml = String.format("<a>%nx <b/>%n</a>");
         String controlXml = "<a>x<b/></a>";

diff --git a/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java b/xmlunit-assertj/src/test/java/org/xmlunit/assertj/XmlAssertValidationTest.java
@@ -79,7 +79,7 @@ public void testIsNotValidAgainst_withBrokenXml_andExternallyCreatedSchemaInstan
     @Test
     public void testIsValidAgainst_withBrokenXml_shouldFail() {
 
-        thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*" + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "invalidBook.xml>\\nto be valid but found following problems:\\n.*");
+        thrown.expectAssertionErrorPattern("^(\\r\\n?|\\n)Expecting:(\\r\\n?|\\n) <.*" + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "invalidBook.xml>(\\r\\n?|\\n)to be valid but found following problems:(\\r\\n?|\\n).*");
         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.");
@@ -167,8 +167,8 @@ public void testIsInvalid_withBrokenXml_shouldPass() {
     @Test
     public void testIsInvalid_shouldFail() {
 
-        thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*"
-            + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "BookXsdGenerated.xml>\\nto be invalid");
+        thrown.expectAssertionErrorPattern("^(\\r\\n?|\\n)Expecting:(\\r\\n?|\\n) <.*"
+            + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "BookXsdGenerated.xml>(\\r\\n?|\\n)to be invalid");
 
         StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml"));
 

diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/CompareAssertAreIdenticalTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/CompareAssertAreIdenticalTest.java
@@ -185,7 +185,7 @@ public void testAreIdentical_withIgnoreWhitespaceAndTextValue_shouldPass() {
     public void testAreIdentical_withIgnoreElementContentWhitespace_shouldFailed() {
 
         thrown.expectAssertionError("Expecting:%n <control instance> and <test instance> to be identical");
-        thrown.expectAssertionError("Expected text value 'x' but was '%nx '");
+        thrown.expectAssertionError("Expected text value 'x' but was '\nx '");
 
         String testXml = String.format("<a>%nx <b/>%n</a>");
         String controlXml = "<a>x<b/></a>";

diff --git a/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java b/xmlunit-assertj3/src/test/java/org/xmlunit/assertj3/XmlAssertValidationTest.java
@@ -79,7 +79,7 @@ public void testIsNotValidAgainst_withBrokenXml_andExternallyCreatedSchemaInstan
     @Test
     public void testIsValidAgainst_withBrokenXml_shouldFail() {
 
-        thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*" + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "invalidBook.xml>\\nto be valid but found following problems:\\n.*");
+        thrown.expectAssertionErrorPattern("^\\RExpecting:\\R <.*" + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "invalidBook.xml>\\Rto be valid but found following problems:\\R.*");
         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.");
@@ -167,8 +167,8 @@ public void testIsInvalid_withBrokenXml_shouldPass() {
     @Test
     public void testIsInvalid_shouldFail() {
 
-        thrown.expectAssertionErrorPattern("^\\nExpecting:\\n <.*"
-            + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "BookXsdGenerated.xml>\\nto be invalid");
+        thrown.expectAssertionErrorPattern("^\\RExpecting:\\R <.*"
+            + Pattern.quote(TestResources.TEST_RESOURCE_DIR) + "BookXsdGenerated.xml>\\Rto be invalid");
 
         StreamSource xml = new StreamSource(new File(TestResources.TEST_RESOURCE_DIR + "BookXsdGenerated.xml"));