honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tests: Fix line endings to match mock terminal line endings 

The MockTerminal class always uses "\n" as line endings, so
the tests should not use `System.lineSeparator`, but also
a newline.

relates elastic/x-pack-elasticsearch#1758

Original commit: elastic/x-pack-elasticsearch@364a4e43ad
This commit is contained in:
Alexander Reelsen 2017-06-19 13:48:54 +02:00
parent ae70a657dd
commit 22d57ca96e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeRealmMigrateToolTests.java
View File

@ -76,12 +76,12 @@ public class ESNativeRealmMigrateToolTests extends CommandTestCase {
} }
terminalLogger.log(Level.ERROR, "logging an error"); terminalLogger.log(Level.ERROR, "logging an error");
assertEquals("logging an error" + System.lineSeparator(), terminal.getOutput()); assertEquals("logging an error\n", terminal.getOutput());
terminal.reset(); terminal.reset();
assertThat(terminal.getOutput(), isEmptyString()); assertThat(terminal.getOutput(), isEmptyString());
terminalLogger.log(Level.FATAL, "logging a fatal message"); terminalLogger.log(Level.FATAL, "logging a fatal message");
assertEquals("logging a fatal message" + System.lineSeparator(), terminal.getOutput()); assertEquals("logging a fatal message\n", terminal.getOutput());
terminal.reset(); terminal.reset();
assertThat(terminal.getOutput(), isEmptyString()); assertThat(terminal.getOutput(), isEmptyString());
@ -91,7 +91,7 @@ public class ESNativeRealmMigrateToolTests extends CommandTestCase {
loggingLevels.remove(Level.OFF); loggingLevels.remove(Level.OFF);
for (Level level : loggingLevels) { for (Level level : loggingLevels) {
terminalLogger.log(level, "this level should log " + level.name()); terminalLogger.log(level, "this level should log " + level.name());
assertEquals("this level should log " + level.name() + System.lineSeparator(), terminal.getOutput()); assertEquals("this level should log " + level.name() + "\n", terminal.getOutput());
terminal.reset(); terminal.reset();
assertThat(terminal.getOutput(), isEmptyString()); assertThat(terminal.getOutput(), isEmptyString());
} }