github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Backport 7.17] Fix unit test under Windows (#13656) (#13665)

Browse source 
Backport #13656 to branch 7.17

----

Use the System.lineSeparator instead of "\n" to make the test portable across platforms

(cherry picked from commit 3fdc4c3aa7)

Co-authored-by: Andrea Selva <andrea.selva@elastic.co>
This commit is contained in:
Ry Biesemeyer 2022-01-24 01:05:55 -08:00 • committed by GitHub
parent 22e2e52d9c
commit fe4827132b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
logstash-core/src/test/java/org/logstash/launchers/JvmOptionsParserTest.java
View file

@ -40,7 +40,7 @@ public class JvmOptionsParserTest {
// Verify
final String output = outputStreamCaptor.toString();
assertEquals("Output MUST contains the options present in LS_JAVA_OPTS", "-Xblabla\n", output);
assertEquals("Output MUST contains the options present in LS_JAVA_OPTS", "-Xblabla" + System.lineSeparator(), output);
}
@SuppressWarnings({ "unchecked" })
@ -54,7 +54,7 @@ public class JvmOptionsParserTest {
@Test
public void testParseCommentLine() throws IOException {
final BufferedReader options = asReader("# this is a comment\n-XX:+UseConcMarkSweepGC");
final BufferedReader options = asReader("# this is a comment" + System.lineSeparator() + "-XX:+UseConcMarkSweepGC");
final JvmOptionsParser.ParseResult res = JvmOptionsParser.parse(11, options);
assertTrue("no invalid lines can be present", res.getInvalidLines().isEmpty());
@ -91,19 +91,19 @@ public class JvmOptionsParserTest {
@Test
public void testErrorLinesAreReportedCorrectly() throws IOException {
final String jvmOptionsContent = "10-11:-XX:+UseConcMarkSweepGC\n" +
"invalidOption\n" +
"-Duser.country=US\n" +
final String jvmOptionsContent = "10-11:-XX:+UseConcMarkSweepGC" + System.lineSeparator() +
"invalidOption" + System.lineSeparator() +
"-Duser.country=US" + System.lineSeparator() +
"anotherInvalidOption";
JvmOptionsParser.ParseResult res = JvmOptionsParser.parse(11, asReader(jvmOptionsContent));
verifyOptions("Option must be present for Java 11", "-XX:+UseConcMarkSweepGC\n-Duser.country=US", res);
verifyOptions("Option must be present for Java 11", "-XX:+UseConcMarkSweepGC" + System.lineSeparator() + "-Duser.country=US", res);
assertEquals("invalidOption", res.getInvalidLines().get(2));
assertEquals("anotherInvalidOption", res.getInvalidLines().get(4));
}
private void verifyOptions(String message, String expected, JvmOptionsParser.ParseResult res) {
assertEquals(message, expected, String.join("\n", res.getJvmOptions()));
assertEquals(message, expected, String.join(System.lineSeparator(), res.getJvmOptions()));
}
private BufferedReader asReader(String s) {