Fix tests to work on windows too.

creek-service · Dec 22, 2023 · 95508ac · 95508ac
1 parent ef77742
commit 95508ac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/...r/src/test/java/org/creekservice/internal/system/test/executor/cli/PicoCliParserTest.java b/...r/src/test/java/org/creekservice/internal/system/test/executor/cli/PicoCliParserTest.java
@@ -555,15 +555,15 @@ void shouldImplementToStringOnMinimalOptions() {
     @Test
     void shouldImplementToStringOnFullOptions() {
         // Given:
-        final Path mrS0 = Path.of(File.separator, "a", "b");
-        final Path mrD0 = Path.of(File.separator, "c");
+        final Path mrS0 = Path.of("a", "b");
+        final Path mrD0 = Path.of("c");
         final Path mrS1 = Path.of("d", "e");
-        final Path mrD1 = Path.of(File.separator, "f");
+        final Path mrD1 = Path.of("f");
 
-        final Path mwS0 = Path.of(File.separator, "a");
-        final Path mwD0 = Path.of(File.separator, "b", "c");
-        final Path mwS1 = Path.of(File.separator, "d");
-        final Path mwD1 = Path.of(File.separator, "f");
+        final Path mwS0 = Path.of("a");
+        final Path mwD0 = Path.of("b", "c");
+        final Path mwS1 = Path.of("d");
+        final Path mwD1 = Path.of("g");
 
         final String[] args =
                 minimalArgs(

diff --git a/...java/org/creekservice/internal/system/test/executor/result/xml/XmlTestCaseResultTest.java b/...java/org/creekservice/internal/system/test/executor/result/xml/XmlTestCaseResultTest.java
@@ -108,7 +108,7 @@ void shouldSerializeFailed() throws Exception {
                                 + lineSeparator()
                                 + "  <failure message=\"Expectation not met\""
                                 + " type=\"java.lang.AssertionError\">"
-                                + stackTrace
+                                + stackTrace.replaceAll("\r", "&#xd;")
                                 + "</failure>"
                                 + lineSeparator()
                                 + "</testcase>"
@@ -133,7 +133,7 @@ void shouldSerializeError() throws Exception {
                                 + lineSeparator()
                                 + "  <error message=\"bad state\""
                                 + " type=\"java.lang.IllegalStateException\">"
-                                + stackTrace.replaceAll(lineSeparator(), "\n")
+                                + stackTrace.replaceAll("\r", "&#xd;")
                                 + "</error>"
                                 + lineSeparator()
                                 + "</testcase>"

diff --git a/...ava/org/creekservice/internal/system/test/executor/result/xml/XmlTestSuiteResultTest.java b/...ava/org/creekservice/internal/system/test/executor/result/xml/XmlTestSuiteResultTest.java
@@ -129,7 +129,7 @@ void shouldSerializeSuiteError() throws Exception {
                                 + lineSeparator()
                                 + "  <error message=\"Boom\""
                                 + " type=\"java.lang.IllegalArgumentException\">"
-                                + stackTrace.replaceAll(lineSeparator(), "\n")
+                                + stackTrace.replaceAll("\r", "&#xd;")
                                 + "</error>"
                                 + lineSeparator()
                                 + "</testsuite>"