Merge pull request #2032 from devinbileck/handle-cli-output_windows.t…

…xt-with-CRLF-line-endings Handle cli-output_windows.txt with CRLF line endings
bisq-network · Dec 3, 2018 · 6068106 · 6068106
2 parents 8c7bd76 + f379918
commit 6068106
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/src/test/java/bisq/core/app/BisqHelpFormatterTest.java b/core/src/test/java/bisq/core/app/BisqHelpFormatterTest.java
@@ -125,7 +125,10 @@ public void testHelpFormatter() throws IOException, URISyntaxException {
         ByteArrayOutputStream actual = new ByteArrayOutputStream();
         String expected = new String(Files.readAllBytes(Paths.get(getClass().getResource("cli-output.txt").toURI())));
         if (System.getProperty("os.name").startsWith("Windows")) {
-            expected = new String(Files.readAllBytes(Paths.get(getClass().getResource("cli-output_windows.txt").toURI())));
+            // Load the expected content from a different file for Windows due to different path separator
+            // And normalize line endings to LF in case the file has CRLF line endings
+            expected = new String(Files.readAllBytes(Paths.get(getClass().getResource("cli-output_windows.txt").toURI())))
+                    .replaceAll("\\r\\n?", "\n");
         }
 
         parser.printHelpOn(new PrintStream(actual));