This is an automated email from the ASF dual-hosted git repository.
jinmeiliao 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 58be3ff GEODE-3530 refactored ShellCommandDUnitTest (#2137)
58be3ff is described below
commit 58be3ff93b208cf40a2b03a4ec4f4d680ecb28f6
Author: FSOUTHERLAND <[email protected]>
AuthorDate: Mon Jul 16 08:55:46 2018 -0700
GEODE-3530 refactored ShellCommandDUnitTest (#2137)
* break the test into each individual command tests and change them to
integration tests
---
.../cli/commands/DebugCommandIntegrationTest.java | 36 ++
.../cli/commands/EchoCommandIntegrationTest.java | 94 +++++
.../commands/HistoryCommandIntegrationTest.java | 72 ++++
.../cli/commands/ShellCommandsDUnitTest.java | 437 ---------------------
4 files changed, 202 insertions(+), 437 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DebugCommandIntegrationTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DebugCommandIntegrationTest.java
new file mode 100644
index 0000000..bd512e3
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DebugCommandIntegrationTest.java
@@ -0,0 +1,36 @@
+package org.apache.geode.management.internal.cli.commands;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+
+
+@Category(IntegrationTest.class)
+public class DebugCommandIntegrationTest {
+ @ClassRule
+ public static GfshCommandRule gfsh = new GfshCommandRule();
+
+ @Test
+ public void debugWithCorrectValues() {
+ assertThat(gfsh.getGfsh().getDebug()).isFalse();
+ gfsh.executeAndAssertThat("debug --state=ON").statusIsSuccess();
+ assertThat(gfsh.getGfsh().getDebug()).isTrue();
+
+ gfsh.executeAndAssertThat("debug --state=off").statusIsSuccess();
+ assertThat(gfsh.getGfsh().getDebug()).isFalse();
+ }
+
+ @Test
+ public void debugWithIncorrectValues() {
+ String errorMsg = "Invalid state value : true. It should be \"ON\" or
\"OFF\"";
+ gfsh.executeAndAssertThat("debug --state=true").statusIsError()
+ .containsOutput(errorMsg);
+ gfsh.executeAndAssertThat("debug --state=0").statusIsError()
+ .containsOutput(errorMsg);
+ }
+}
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/EchoCommandIntegrationTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/EchoCommandIntegrationTest.java
new file mode 100644
index 0000000..5fe5c72
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/EchoCommandIntegrationTest.java
@@ -0,0 +1,94 @@
+package org.apache.geode.management.internal.cli.commands;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.management.internal.cli.result.CommandResult;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+
+@Category(IntegrationTest.class)
+public class EchoCommandIntegrationTest {
+
+ @ClassRule
+ public static GfshCommandRule gfsh = new GfshCommandRule();
+
+ @BeforeClass
+ public static void beforeClass() {
+ gfsh.executeAndAssertThat("set variable --name=TESTSYS
--value=SYS_VALUE").statusIsSuccess()
+ .containsOutput("Value for variable TESTSYS is now: SYS_VALUE");
+ }
+
+ @Test
+ public void echoWithNoVariable() {
+ gfsh.executeAndAssertThat("echo --string=\"Hello World! This is
pivotal\"").statusIsSuccess()
+ .containsOutput("Hello World! This is pivotal");
+ }
+
+ @Test
+ public void echoWithVariableAtEnd() {
+ gfsh.executeAndAssertThat("echo --string=\"Hello World! This is
${TESTSYS}\"")
+ .statusIsSuccess()
+ .containsOutput("Hello World! This is SYS_VALUE");
+ }
+
+ @Test
+ public void testEchoWithVariableAtStart() {
+ String command = "echo --string=\"${TESTSYS} Hello World! This is
Pivotal\"";
+ gfsh.executeAndAssertThat(command).statusIsSuccess()
+ .containsOutput("SYS_VALUE Hello World! This is Pivotal");
+ }
+
+ @Test
+ public void testEchoWithMultipleVariables() {
+ String command = "echo --string=\"${TESTSYS} Hello World! This is Pivotal
${TESTSYS}\"";
+ gfsh.executeAndAssertThat(command).statusIsSuccess()
+ .containsOutput("SYS_VALUE Hello World! This is Pivotal SYS_VALUE");
+ }
+
+ @Test
+ public void testEchoAllPropertyVariables() {
+ String command = "echo --string=\"$*\"";
+ CommandResult commandResult =
gfsh.executeAndAssertThat(command).statusIsSuccess()
+ .getCommandResult();
+ assertThat(commandResult.getTableColumnValues("Property"))
+ .containsExactlyInAnyOrder("APP_COLLECTION_LIMIT",
+ "APP_FETCH_SIZE",
+ "APP_LAST_EXIT_STATUS",
+ "APP_LOGGING_ENABLED",
+ "APP_LOG_FILE",
+ "APP_NAME",
+ "APP_PWD",
+ "APP_QUERY_RESULTS_DISPLAY_MODE",
+ "APP_QUIET_EXECUTION",
+ "APP_RESULT_VIEWER",
+ "SYS_CLASSPATH",
+ "SYS_GEODE_HOME_DIR",
+ "SYS_HOST_NAME",
+ "SYS_JAVA_VERSION",
+ "SYS_OS",
+ "SYS_OS_LINE_SEPARATOR",
+ "SYS_USER",
+ "SYS_USER_HOME",
+ "TESTSYS");
+ }
+
+ @Test
+ public void testEchoForSingleVariable() {
+ String command = "echo --string=${TESTSYS}";
+ gfsh.executeAndAssertThat(command).statusIsSuccess()
+ .containsOutput("SYS_VALUE");
+ }
+
+ @Test
+ public void testEchoForSingleVariable2() {
+ String command = "echo --string=\"${TESTSYS} ${TESTSYS}\"";
+
+ gfsh.executeAndAssertThat(command).statusIsSuccess()
+ .containsOutput("SYS_VALUE SYS_VALUE");
+ }
+}
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/HistoryCommandIntegrationTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/HistoryCommandIntegrationTest.java
new file mode 100644
index 0000000..56e1ce0
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/HistoryCommandIntegrationTest.java
@@ -0,0 +1,72 @@
+package org.apache.geode.management.internal.cli.commands;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.After;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+
+
+@Category(IntegrationTest.class)
+public class HistoryCommandIntegrationTest {
+ @ClassRule
+ public static GfshCommandRule gfsh = new GfshCommandRule();
+
+ @ClassRule
+ public static TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ @After
+ public void tearDown() throws Exception {
+ gfsh.getGfsh().clearHistory();
+ }
+
+ @Test
+ public void testHistoryWithEntry() {
+ // Generate a line of history
+ gfsh.executeCommand("echo --string=string");
+ gfsh.executeCommand("connect");
+
+ gfsh.executeAndAssertThat("history").statusIsSuccess()
+ .containsOutput(" 1 0: echo --string=string\n" + " 2 1:
connect\n\n\n");
+ }
+
+ @Test
+ public void testEmptyHistory() {
+ gfsh.executeAndAssertThat("history").statusIsSuccess();
+ assertThat(gfsh.getGfshOutput()).isEqualToIgnoringWhitespace("");
+ }
+
+ @Test
+ public void testHistoryWithFileName() throws IOException {
+ gfsh.executeCommand("echo --string=string");
+ File historyFile = temporaryFolder.newFile("history.txt");
+ historyFile.delete();
+ assertThat(historyFile).doesNotExist();
+
+ String command = "history --file=" + historyFile.getAbsolutePath();
+ gfsh.executeAndAssertThat(command).statusIsSuccess();
+
+ assertThat(historyFile).exists();
+ assertThat(historyFile).hasContent("0: echo --string=string");
+ }
+
+ @Test
+ public void testClearHistory() {
+ // Generate a line of history
+ gfsh.executeCommand("echo --string=string");
+ gfsh.executeAndAssertThat("history --clear").statusIsSuccess()
+ .containsOutput(CliStrings.HISTORY__MSG__CLEARED_HISTORY);
+
+ // only the history --clear is in the history now.
+ assertThat(gfsh.getGfsh().getGfshHistory().size()).isEqualTo(1);
+ }
+}
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java
deleted file mode 100644
index 007be0a..0000000
---
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
- * agreements. See the NOTICE file distributed with this work for additional
information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
- * or implied. See the License for the specific language governing permissions
and limitations under
- * the License.
- */
-package org.apache.geode.management.internal.cli.commands;
-
-import static org.apache.geode.test.dunit.Assert.assertEquals;
-import static org.apache.geode.test.dunit.Assert.assertNotNull;
-import static org.apache.geode.test.dunit.Assert.assertTrue;
-import static org.apache.geode.test.dunit.Assert.fail;
-import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.File;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.distributed.AbstractLauncher.Status;
-import org.apache.geode.distributed.LocatorLauncher;
-import org.apache.geode.distributed.LocatorLauncher.LocatorState;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.management.cli.Result;
-import org.apache.geode.management.internal.cli.domain.DataCommandRequest;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
-@Category({DistributedTest.class, FlakyTest.class}) // GEODE-989 GEODE-3530
-@SuppressWarnings("serial")
-public class ShellCommandsDUnitTest extends CliCommandTestBase {
-
- private static final long serialVersionUID = 1L;
-
- private transient LocatorLauncher locatorLauncher;
-
- @Override
- public final void postSetUpCliCommandTestBase() throws Exception {
- getDefaultShell();
- }
-
- @After
- public void after() throws Exception {
- if (locatorLauncher != null) {
- locatorLauncher.stop();
- }
- }
-
- protected CommandResult connectToLocator(final int locatorPort) {
- return executeCommand(new CommandStringBuilder(CliStrings.CONNECT)
- .addOption(CliStrings.CONNECT__LOCATOR, "localhost[" + locatorPort +
"]").toString());
- }
-
- @Test // FlakyTest: GEODE-989
- public void testConnectToLocatorBecomesManager() {
- final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
-
- final int jmxManagerPort = ports[0];
- final int locatorPort = ports[1];
-
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port",
- String.valueOf(jmxManagerPort));
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX +
"jmx-manager-http-port", "0");
-
- assertEquals(String.valueOf(jmxManagerPort),
- System.getProperty(DistributionConfig.GEMFIRE_PREFIX +
"jmx-manager-port"));
- assertEquals("0",
- System.getProperty(DistributionConfig.GEMFIRE_PREFIX +
"jmx-manager-http-port"));
-
- final String pathname = (getClass().getSimpleName() + "_" +
getTestMethodName());
- final File workingDirectory = new File(pathname);
-
- workingDirectory.mkdir();
-
- assertTrue(workingDirectory.isDirectory());
-
- locatorLauncher = new
LocatorLauncher.Builder().setBindAddress(null).setForce(true)
- .setMemberName(pathname).setPort(locatorPort)
-
.setWorkingDirectory(IOUtils.tryGetCanonicalPathElseGetAbsolutePath(workingDirectory))
- .build();
-
- assertNotNull(locatorLauncher);
- assertEquals(locatorPort, locatorLauncher.getPort().intValue());
-
- // fix for bug 46729
- locatorLauncher.start();
-
- final LocatorState locatorState =
- locatorLauncher.waitOnStatusResponse(60, 10, TimeUnit.SECONDS);
-
- assertThat(locatorState).isNotNull();
- assertThat(locatorState.getStatus()).isEqualTo(Status.ONLINE);
-
- final Result result = connectToLocator(locatorPort);
-
- assertThat(result).isNotNull();
- assertThat(result.getStatus()).as("Result is not OK: " +
result).isEqualTo(Result.Status.OK);
- }
-
- @Test
- public void testEchoWithVariableAtEnd() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testEcho command gfshInstance is null");
- }
- getLogWriter().info("Gsh " + gfshInstance);
-
- gfshInstance.setEnvProperty("TESTSYS", "SYS_VALUE");
- printAllEnvs(gfshInstance);
-
- String command = "echo --string=\"Hello World! This is ${TESTSYS}\"";
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- String stringResult = commandResultToString(cmdResult);
- assertEquals("Hello World! This is SYS_VALUE",
StringUtils.trim(stringResult));
- } else {
- fail("testEchoWithVariableAtEnd failed");
- }
- }
-
- @Test
- public void testEchoWithNoVariable() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testEcho command gfshInstance is null");
- }
-
- gfshInstance.setEnvProperty("TESTSYS", "SYS_VALUE");
- printAllEnvs(gfshInstance);
-
- String command = "echo --string=\"Hello World! This is Pivotal\"";
-
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- String stringResult = commandResultToString(cmdResult);
- assertTrue(stringResult.contains("Hello World! This is Pivotal"));
- } else {
- fail("testEchoWithNoVariable failed");
- }
- }
-
- @Test
- public void testEchoWithVariableAtStart() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testEcho command gfshInstance is null");
- }
-
- gfshInstance.setEnvProperty("TESTSYS", "SYS_VALUE");
- printAllEnvs(gfshInstance);
-
- String command = "echo --string=\"${TESTSYS} Hello World! This is
Pivotal\"";
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- String stringResult = commandResultToString(cmdResult);
- assertTrue(stringResult.contains("SYS_VALUE Hello World! This is
Pivotal"));
- } else {
- fail("testEchoWithVariableAtStart failed");
- }
- }
-
- @Test
- public void testEchoWithMultipleVariables() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testEcho command gfshInstance is null");
- }
-
- gfshInstance.setEnvProperty("TESTSYS", "SYS_VALUE");
- printAllEnvs(gfshInstance);
-
- String command = "echo --string=\"${TESTSYS} Hello World! This is Pivotal
${TESTSYS}\"";
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- String stringResult = commandResultToString(cmdResult);
- assertTrue(stringResult.contains("SYS_VALUE Hello World! This is Pivotal
SYS_VALUE"));
- } else {
- fail("testEchoWithMultipleVariables failed");
- }
- }
-
- @Test
- public void testEchoAllPropertyVariables() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testEcho command gfshInstance is null");
- }
-
- String command = "echo --string=\"$*\"";
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- } else {
- fail("testEchoAllPropertyVariables failed");
- }
- }
-
- @Test
- public void testEchoForSingleVariable() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testEcho command gfshInstance is null");
- }
-
- gfshInstance.setEnvProperty("TESTSYS", "SYS_VALUE");
- printAllEnvs(gfshInstance);
-
- String command = "echo --string=${TESTSYS}";
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- String stringResult = commandResultToString(cmdResult);
- assertTrue(stringResult.contains("SYS_VALUE"));
- } else {
- fail("testEchoForSingleVariable failed");
- }
- }
-
- @Test
- public void testEchoForSingleVariable2() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testEcho command gfshInstance is null");
- }
-
- gfshInstance.setEnvProperty("TESTSYS", "SYS_VALUE");
- printAllEnvs(gfshInstance);
-
- String command = "echo --string=\"${TESTSYS} ${TESTSYS}\"";
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- String stringResult = commandResultToString(cmdResult);
- assertTrue(stringResult.contains("SYS_VALUE"));
- } else {
- fail("testEchoForSingleVariable2 failed");
- }
- }
-
- @Test
- public void testDebug() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testDebug command gfshInstance is null");
- }
-
- gfshInstance.setDebug(false);
- String command = "debug --state=ON";
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- } else {
- fail("testDebug failed");
- }
- assertEquals(gfshInstance.getDebug(), true);
-
- }
-
- @Test
- public void testHistoryWithEntry() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testHistory command gfshInstance is null");
- }
-
- gfshInstance.setDebug(false);
-
- // Generate a line of history
- executeCommand("help");
- executeCommand("connect");
-
- String command = "history";
- CommandResult cmdResult = executeCommand(command);
- String result = printCommandOutput(cmdResult);
-
- assertEquals(" 1 0: help\n 2 1: connect\n\n\n", result);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- } else {
- fail("testHistory failed");
- }
- }
-
- @Test
- public void testEmptyHistory() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testHistory command gfshInstance is null");
- }
-
- gfshInstance.setDebug(false);
-
- String command = "history";
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
- cmdResult.resetToFirstLine();
- assertEquals("", cmdResult.nextLine());
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- } else {
- fail("testHistory failed");
- }
- }
-
- @Test
- public void testHistoryWithFileName() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testHistory command gfshInstance is null");
- }
-
- // Generate a line of history
- executeCommand("help");
-
- String historyFileName = gfshInstance.getGfshConfig().getHistoryFileName();
- File historyFile = new File(historyFileName);
- historyFile.deleteOnExit();
- String fileName = historyFile.getParent();
- fileName = fileName + File.separator + getClass().getSimpleName() + "_" +
getName()
- + "-exported.history";
-
- String command = "history --file=" + fileName;
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- } else {
- fail("testHistory failed");
- }
- assertTrue(historyFile.exists());
- assertTrue(0L != historyFile.length());
- }
-
- @Test
- public void testClearHistory() {
- Gfsh gfshInstance = Gfsh.getCurrentInstance();
-
- if (gfshInstance == null) {
- fail("In testClearHistory command gfshInstance is null");
- }
-
- gfshInstance.setDebug(false);
-
- // Generate a line of history
- executeCommand("help");
-
- String command = "history --clear";
- CommandResult cmdResult = executeCommand(command);
- printCommandOutput(cmdResult);
-
- if (cmdResult != null) {
- assertEquals(Result.Status.OK, cmdResult.getStatus());
- getLogWriter().info("testClearHistory cmdResult=" +
commandResultToString(cmdResult));
- String resultString = commandResultToString(cmdResult);
- getLogWriter().info("testClearHistory resultString=" + resultString);
-
assertTrue(resultString.contains(CliStrings.HISTORY__MSG__CLEARED_HISTORY));
- assertTrue(gfshInstance.getGfshHistory().size() <= 1);
- } else {
- fail("testClearHistory failed");
- }
- }
-
- private static String printCommandOutput(CommandResult cmdResult) {
- assertNotNull(cmdResult);
- getLogWriter().info("Command Output : ");
- StringBuilder sb = new StringBuilder();
- cmdResult.resetToFirstLine();
- while (cmdResult.hasNextLine()) {
- sb.append(cmdResult.nextLine()).append(DataCommandRequest.NEW_LINE);
- }
- getLogWriter().info(sb.toString());
- getLogWriter().info("");
- return sb.toString();
- }
-
- private void printAllEnvs(Gfsh gfsh) {
- getLogWriter().info("printAllEnvs : " +
StringUtils.objectToString(gfsh.getEnv(), false, 0));
- /*
- * getLogWriter().info("Gfsh printAllEnvs : " +
- * HydraUtil.ObjectToString(getDefaultShell().getEnv()));
getLogWriter().info("gfsh " + gfsh +
- * " default shell " + getDefaultShell());
- */
- }
-}
