This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 3192d62 GEODE-5468: Make line separators platform independent (#2178)
3192d62 is described below
commit 3192d62a86d344dde6a041145e9b31125f197e9f
Author: Jens Deppe <[email protected]>
AuthorDate: Tue Jul 24 16:59:12 2018 -0700
GEODE-5468: Make line separators platform independent (#2178)
---
.../geode/management/internal/cli/GfshParserAutoCompletionTest.java | 5 +++--
.../apache/geode/management/internal/cli/GfshParserParsingTest.java | 5 +++--
.../internal/cli/commands/HistoryCommandIntegrationTest.java | 4 +++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
index b653bb1..2114459 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
@@ -269,11 +269,12 @@ public class GfshParserAutoCompletionTest {
@Test
public void testObtainHelp() {
String command = CliStrings.START_PULSE;
- String helpString = "NAME\n" + "start pulse\n" + "IS AVAILABLE\n" +
"true\n" + "SYNOPSIS\n"
+ String helpString = ("NAME\n" + "start pulse\n" + "IS AVAILABLE\n" +
"true\n" + "SYNOPSIS\n"
+ "Open a new window in the default Web browser with the URL for the
Pulse application.\n"
+ "SYNTAX\n" + "start pulse [--url=value]\n" + "PARAMETERS\n" + "url\n"
+ "URL of the Pulse Web application.\n" + "Required: false\n"
- + "Default (if the parameter is not specified):
http://localhost:7070/pulse\n";;
+ + "Default (if the parameter is not specified):
http://localhost:7070/pulse\n";).replace(
+ "\n", System.lineSeparator());
assertThat(parser.getCommandManager().obtainHelp(command)).isEqualTo(helpString);
}
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
index a84fa7a..50a78fa 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
@@ -245,11 +245,12 @@ public class GfshParserParsingTest {
@Test
public void testObtainHelp() {
String command = CliStrings.START_PULSE;
- String helpString = "NAME\n" + "start pulse\n" + "IS AVAILABLE\n" +
"true\n" + "SYNOPSIS\n"
+ String helpString = ("NAME\n" + "start pulse\n" + "IS AVAILABLE\n" +
"true\n" + "SYNOPSIS\n"
+ "Open a new window in the default Web browser with the URL for the
Pulse application.\n"
+ "SYNTAX\n" + "start pulse [--url=value]\n" + "PARAMETERS\n" + "url\n"
+ "URL of the Pulse Web application.\n" + "Required: false\n"
- + "Default (if the parameter is not specified):
http://localhost:7070/pulse\n";;
+ + "Default (if the parameter is not specified):
http://localhost:7070/pulse\n";).replace(
+ "\n", System.lineSeparator());
assertThat(parser.getCommandManager().obtainHelp(command)).isEqualTo(helpString);
}
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/HistoryCommandIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/HistoryCommandIntegrationTest.java
index 1a38fd5..b7afb54 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/HistoryCommandIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/HistoryCommandIntegrationTest.java
@@ -48,7 +48,9 @@ public class HistoryCommandIntegrationTest {
gfsh.executeCommand("connect");
gfsh.executeAndAssertThat("history").statusIsSuccess()
- .containsOutput(" 1 0: echo --string=string\n" + " 2 1:
connect\n\n\n");
+ .containsOutput(
+ " 1 0: echo --string=string" + System.lineSeparator() + " 2 1:
connect" +
+ System.lineSeparator() + System.lineSeparator() +
System.lineSeparator());
}
@Test
