mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Handle cli-output_windows.txt with CRLF line endings

Browse source 
On Windows, it is likely that cli-output_windows.txt will have CRLF line
endings since core.autocrlf is normally true which converts LF endings
to CRLF on checkout. This causes BisqHelpFormatterTest to fail since
the actual content it is compared against uses LF endings.

As a result, when loading the cli-output_windows.txt file normalize
line endings to LF.
This commit is contained in:
Devin Bileck 2018-12-02 22:36:00 -08:00
parent de54518839
commit f3799187cc
No known key found for this signature in database
GPG key ID: C86D829C2399D073
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/test/java/bisq/core/app/BisqHelpFormatterTest.java
View file

@ -125,7 +125,10 @@ public class BisqHelpFormatterTest {
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));