You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2017/11/14 04:42:26 UTC
[geode] branch develop updated: GEODE-3539: rename
GfshShellConnectionRule to GfshCommandRule (#1051)
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 576bf71 GEODE-3539: rename GfshShellConnectionRule to GfshCommandRule (#1051)
576bf71 is described below
commit 576bf716cbe75cff49e492bf800d84f525321b38
Author: jinmeiliao <ji...@pivotal.io>
AuthorDate: Mon Nov 13 20:42:23 2017 -0800
GEODE-3539: rename GfshShellConnectionRule to GfshCommandRule (#1051)
---
.../session/tests/TomcatClientServerTest.java | 4 +-
.../TomcatSessionBackwardsCompatibilityTest.java | 4 +-
.../ExtensionClusterConfigurationDUnitTest.java | 4 +-
.../management/internal/cli/CliUtilDUnitTest.java | 4 +-
.../management/internal/cli/NetstatDUnitTest.java | 16 +--
.../AlterRegionCommandIntegrationTest.java | 6 +-
.../commands/ChangeLogLevelCommandDUnitTest.java | 8 +-
.../cli/commands/ConcurrentDeployDUnitTest.java | 8 +-
.../cli/commands/CreateRegionCommandDUnitTest.java | 4 +-
.../CreateRegionCommandIntegrationTest.java | 6 +-
...DeployCommandFunctionRegistrationDUnitTest.java | 4 +-
.../commands/DeployCommandRedeployDUnitTest.java | 4 +-
.../cli/commands/DeployWithGroupsDUnitTest.java | 4 +-
.../DescribeConfigCommandIntegrationTest.java | 7 +-
.../commands/DescribeMembersCommandDUnitTest.java | 4 +-
.../commands/DestroyIndexCommandsDUnitTest.java | 4 +-
.../commands/DestroyRegionCommandDUnitTest.java | 4 +-
.../ExecuteFunctionCommandSecurityTest.java | 28 +++---
.../cli/commands/ExportDataIntegrationTest.java | 7 +-
.../internal/cli/commands/ExportLogsDUnitTest.java | 4 +-
.../cli/commands/ExportLogsIntegrationTest.java | 4 +-
.../commands/ExportLogsOnServerManagerDUnit.java | 9 +-
.../cli/commands/ExportLogsStatsDUnitTest.java | 4 +-
.../ExportLogsWithMemberGroupDUnitTest.java | 4 +-
.../cli/commands/FunctionCommandsDUnitTest.java | 6 +-
.../internal/cli/commands/GcCommandDUnitTest.java | 8 +-
.../cli/commands/GetCommandIntegrationTest.java | 6 +-
.../cli/commands/GfshCommandIntegrationTest.java | 6 +-
.../cli/commands/ImportDataIntegrationTest.java | 7 +-
.../cli/commands/IndexCommandsIntegrationTest.java | 6 +-
.../IndexCommandsShareConfigurationDUnitTest.java | 6 +-
.../commands/ListAndDescribeRegionDUnitTest.java | 30 +++---
.../cli/commands/ListIndexCommandDUnitTest.java | 6 +-
.../cli/commands/ListMembersCommandDUnitTest.java | 4 +-
.../cli/commands/LocateEntryDUnitTest.java | 4 +-
.../cli/commands/PutCommandIntegrationTest.java | 6 +-
.../internal/cli/commands/QueryCommandTest.java | 9 +-
.../cli/commands/RemoveCommandDUnitTest.java | 4 +-
.../cli/commands/RemoveCommandJsonDUnitTest.java | 4 +-
.../cli/commands/ShowDeadlockDUnitTest.java | 4 +-
.../cli/commands/ShowLogCommandDUnitTest.java | 8 +-
.../cli/commands/ShowMetricsDUnitTest.java | 4 +-
.../commands/ShowMissingDiskStoresDUnitTest.java | 8 +-
.../cli/commands/ShutdownCommandDUnitTest.java | 8 +-
.../cli/commands/VersionCommandJUnitTest.java | 4 +-
.../GfshStatusCommandsIntegrationTest.java | 4 +-
.../cli/shell/GfshMultilineCommandTest.java | 6 +-
.../ClusterConfigDeployJarDUnitTest.java | 4 +-
.../ClusterConfigDistributionDUnitTest.java | 4 +-
.../ClusterConfigImportDUnitTest.java | 4 +-
.../ClusterConfigWithSecurityDUnitTest.java | 4 +-
.../ImportClusterConfigDistributedTest.java | 4 +-
.../ImportOldClusterConfigDUnitTest.java | 4 +-
.../security/GfshCommandsPostProcessorTest.java | 7 +-
.../security/GfshCommandsSecurityTest.java | 6 +-
.../internal/security/MultiUserDUnitTest.java | 10 +-
.../PDXGfshPostProcessorOnRemoteServerTest.java | 6 +-
.../geode/security/PDXPostProcessorDUnitTest.java | 8 +-
...ellConnectionRule.java => GfshCommandRule.java} | 10 +-
.../lucene/LuceneCommandsSecurityDUnitTest.java | 28 +++---
.../internal/cli/LuceneIndexCommandsDUnitTest.java | 6 +-
.../LuceneClusterConfigurationDUnitTest.java | 4 +-
...teAndDestroyGatewaySenderCommandsDUnitTest.java | 4 +-
.../CreateGatewayReceiverCommandDUnitTest.java | 4 +-
.../CreateGatewaySenderCommandDUnitTest.java | 4 +-
.../DestroyGatewaySenderCommandDUnitTest.java | 4 +-
.../PauseGatewaySenderCommandDUnitTest.java | 4 +-
.../ResumeGatewaySenderCommandDUnitTest.java | 4 +-
.../StartGatewayReceiverCommandDUnitTest.java | 4 +-
.../StartGatewaySenderCommandDUnitTest.java | 4 +-
.../StatusGatewayReceiverCommandDUnitTest.java | 4 +-
.../StatusGatewaySenderCommandDUnitTest.java | 4 +-
.../StopGatewayReceiverCommandDUnitTest.java | 4 +-
.../StopGatewaySenderCommandDUnitTest.java | 4 +-
.../wan/wancommand/WanCommandListDUnitTest.java | 4 +-
...rConfigurationIndexWithFromClauseDUnitTest.java | 16 +--
.../WANClusterConfigurationDUnitTest.java | 4 +-
.../cli/commands/AlterRuntimeCommandDUnitTest.java | 112 ++++++++++-----------
.../commands/ClusterConfigurationDUnitTest.java | 6 +-
.../internal/cli/commands/CommandOverHttpTest.java | 6 +-
.../commands/ConnectCommandIntegrationTest.java | 8 +-
.../cli/commands/ConnectCommandWithSSLTest.java | 70 ++++++-------
.../commands/ConnectCommandWithSecurityTest.java | 14 +--
.../commands/DescribeConfigCommandDUnitTest.java | 8 +-
...xecuteFunctionCommandWithSecurityDUnitTest.java | 8 +-
.../cli/commands/ExportConfigCommandDUnitTest.java | 8 +-
.../ExportLogsOverHttpIntegrationTest.java | 4 +-
.../commands/ExportLogsStatsOverHttpDUnitTest.java | 4 +-
.../FunctionCommandsOverHttpDUnitTest.java | 4 +-
.../cli/commands/IndexCommandOverHttpTest.java | 4 +-
.../ListIndexCommandOverHttpDUnitTest.java | 4 +-
.../security/GfshCommandsOverHttpSecurityTest.java | 5 +-
.../internal/security/LogNoPasswordTest.java | 6 +-
.../HttpOperationInvokerMBeanOperationTest.java | 6 +-
.../shell/HttpOperationInvokerSecurityTest.java | 12 +--
95 files changed, 387 insertions(+), 396 deletions(-)
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java
index 4d7688a..cb94e74 100644
--- a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java
@@ -25,7 +25,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.DUnitEnv;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
/**
* Setup class for Tomcat Client Server tests
@@ -39,7 +39,7 @@ public abstract class TomcatClientServerTest extends CargoTestBase {
public transient TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
- public transient GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public transient GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public transient LocatorServerStartupRule locatorStartup = new LocatorServerStartupRule();
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
index e38a374..aae71e4 100644
--- a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -61,7 +61,7 @@ public class TomcatSessionBackwardsCompatibilityTest {
}
@Rule
- public transient GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public transient GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
index 8fb5feb..8cfd624 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category({DistributedTest.class})
@SuppressWarnings("serial")
@@ -48,7 +48,7 @@ public class ExtensionClusterConfigurationDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private static final String REPLICATE_REGION = "ReplicateRegion1";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
index ebcd7fe..f1050d8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.management.internal.cli.exceptions.UserErrorException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class CliUtilDUnitTest {
@@ -44,7 +44,7 @@ public class CliUtilDUnitTest {
public static LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@ClassRule
- public static GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public static GfshCommandRule gfsh = new GfshCommandRule();
private static MemberVM locator;
private static Set<DistributedMember> members;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
index 9649ab5..571d2b5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class NetstatDUnitTest {
@@ -36,7 +36,7 @@ public class NetstatDUnitTest {
public static LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@ClassRule
- public static GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public static GfshCommandRule gfshConnector = new GfshCommandRule();
private static int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(3);
@@ -75,40 +75,40 @@ public class NetstatDUnitTest {
@Test
public void testConnectToLocator() throws Exception {
- gfshConnector.connect(ports[0], GfshShellConnectionRule.PortType.locator);
+ gfshConnector.connect(ports[0], GfshCommandRule.PortType.locator);
gfshConnector.executeAndAssertThat(netStatCommand).statusIsSuccess();
}
@Test
public void testConnectToJmxManagerOne() throws Exception {
- gfshConnector.connect(ports[1], GfshShellConnectionRule.PortType.jmxManager);
+ gfshConnector.connect(ports[1], GfshCommandRule.PortType.jmxManager);
gfshConnector.executeAndAssertThat(netStatCommand).statusIsSuccess();
}
@Test
public void testConnectToJmxManagerTwo() throws Exception {
- gfshConnector.connect(ports[2], GfshShellConnectionRule.PortType.jmxManager);
+ gfshConnector.connect(ports[2], GfshCommandRule.PortType.jmxManager);
gfshConnector.executeAndAssertThat(netStatCommand).statusIsSuccess();
}
@Ignore("GEODE-2488")
@Test
public void testConnectToLocatorWithLargeCommandResponse() throws Exception {
- gfshConnector.connect(ports[0], GfshShellConnectionRule.PortType.locator);
+ gfshConnector.connect(ports[0], GfshCommandRule.PortType.locator);
gfshConnector.executeAndAssertThat(netStatLsofCommand).statusIsSuccess();
}
@Ignore("GEODE-2488")
@Test
public void testConnectToJmxManagerOneWithLargeCommandResponse() throws Exception {
- gfshConnector.connect(ports[1], GfshShellConnectionRule.PortType.jmxManager);
+ gfshConnector.connect(ports[1], GfshCommandRule.PortType.jmxManager);
gfshConnector.executeAndAssertThat(netStatLsofCommand).statusIsSuccess();
}
@Ignore("GEODE-2488")
@Test
public void testConnectToJmxManagerTwoWithLargeCommandResponse() throws Exception {
- gfshConnector.connect(ports[2], GfshShellConnectionRule.PortType.jmxManager);
+ gfshConnector.connect(ports[2], GfshCommandRule.PortType.jmxManager);
gfshConnector.executeAndAssertThat(netStatLsofCommand).statusIsSuccess();
}
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandIntegrationTest.java
index 44aa4e1..5ab4faf 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandIntegrationTest.java
@@ -22,7 +22,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
@@ -32,11 +32,11 @@ public class AlterRegionCommandIntegrationTest {
new ServerStarterRule().withJMXManager().withRegion(RegionShortcut.REPLICATE, "REPLICATED");
@ClassRule
- public static GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public static GfshCommandRule gfsh = new GfshCommandRule();
@BeforeClass
public static void before() throws Exception {
- gfsh.connectAndVerify(server.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(server.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommandDUnitTest.java
index d417995..3fd908c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommandDUnitTest.java
@@ -16,8 +16,8 @@ package org.apache.geode.management.internal.cli.commands;
import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.http;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.jmxManager;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.http;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.jmxManager;
import java.util.Properties;
@@ -31,7 +31,7 @@ import org.junit.runners.Parameterized;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@@ -48,7 +48,7 @@ public class ChangeLogLevelCommandDUnitTest {
public static LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@ClassRule
- public static GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public static GfshCommandRule gfsh = new GfshCommandRule();
@Parameterized.Parameter
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java
index f4e6635..3449c21 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.JarFileRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@@ -44,7 +44,7 @@ public class ConcurrentDeployDUnitTest {
public JarFileRule jar1Rule = new JarFileRule("classOne", "jar1.jar", true);
// This is a reference used to refer to connections in VM 2 and VM 3
- private static GfshShellConnectionRule gfsh;
+ private static GfshCommandRule gfsh;
private VM gfsh1, gfsh2, gfsh3;
@@ -79,8 +79,8 @@ public class ConcurrentDeployDUnitTest {
}
public static void connectToLocator(int locatorPort) throws Exception {
- gfsh = new GfshShellConnectionRule();
- gfsh.connectAndVerify(locatorPort, GfshShellConnectionRule.PortType.locator);
+ gfsh = new GfshCommandRule();
+ gfsh.connectAndVerify(locatorPort, GfshCommandRule.PortType.locator);
}
public static void loopThroughDeployAndUndeploys(File jar1) throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java
index 7b8a5e8..b9f6513 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.test.compiler.JarBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
@@ -49,7 +49,7 @@ public class CreateRegionCommandDUnitTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TestName testName = new SerializableTestName();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandIntegrationTest.java
index ce580a5..28dffab 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandIntegrationTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
@@ -55,11 +55,11 @@ public class CreateRegionCommandIntegrationTest {
new ServerStarterRule().withJMXManager().withRegion(RegionShortcut.REPLICATE, "REPLICATED");
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
public void before() throws Exception {
- gfsh.connectAndVerify(server.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(server.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java
index c2a03bf..a043ff2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.test.compiler.JarBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@Category(DistributedTest.class)
@@ -52,7 +52,7 @@ public class DeployCommandFunctionRegistrationDUnitTest implements Serializable
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public transient GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public transient GfshCommandRule gfshConnector = new GfshCommandRule();
@Before
public void setup() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
index ed8de9e..4b91ce5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
@@ -43,7 +43,7 @@ import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@Category(DistributedTest.class)
@@ -73,7 +73,7 @@ public class DeployCommandRedeployDUnitTest implements Serializable {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public transient GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public transient GfshCommandRule gfshConnector = new GfshCommandRule();
@Before
public void setup() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
index 34402a5..145bbe4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
/**
@@ -73,7 +73,7 @@ public class DeployWithGroupsDUnitTest implements Serializable {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public transient GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public transient GfshCommandRule gfshConnector = new GfshCommandRule();
@Before
public void setup() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandIntegrationTest.java
index cdbdf2d..e76a26b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandIntegrationTest.java
@@ -21,8 +21,8 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule.PortType;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
@@ -38,8 +38,7 @@ public class DescribeConfigCommandIntegrationTest {
.withName("server").withRegion(RegionShortcut.PARTITION, "region").withAutoStart();
@Rule
- public GfshShellConnectionRule gfsh =
- new GfshShellConnectionRule(server::getJmxPort, PortType.jmxManager);
+ public GfshCommandRule gfsh = new GfshCommandRule(server::getJmxPort, PortType.jmxManager);
@Test
public void describeConfig() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java
index 9db128e..65b3b8c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java
@@ -25,7 +25,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class DescribeMembersCommandDUnitTest {
@@ -34,7 +34,7 @@ public class DescribeMembersCommandDUnitTest {
private static MemberVM locator;
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@BeforeClass
public static void setup() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
index 0959804..9902ca7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.management.internal.cli.domain.Stock;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class DestroyIndexCommandsDUnitTest {
@@ -47,7 +47,7 @@ public class DestroyIndexCommandsDUnitTest {
public LocatorServerStartupRule rule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
public void before() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
index cf85a8a..51e2102 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class DestroyRegionCommandDUnitTest {
@@ -45,7 +45,7 @@ public class DestroyRegionCommandDUnitTest {
public static LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private static MemberVM locator, server1, server2, server3;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandSecurityTest.java
index 5247dae..4ab8b2e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandSecurityTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandSecurityTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ExecuteFunctionCommandSecurityTest implements Serializable {
@@ -53,7 +53,7 @@ public class ExecuteFunctionCommandSecurityTest implements Serializable {
public static LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private static MemberVM locator, server1, server2;
@@ -87,8 +87,8 @@ public class ExecuteFunctionCommandSecurityTest implements Serializable {
@Test
public void dataReaderCanExecuteReadFunction() throws Exception {
- gfsh.secureConnectAndVerify(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "dataRead", "dataRead");
+ gfsh.secureConnectAndVerify(locator.getPort(), GfshCommandRule.PortType.locator, "dataRead",
+ "dataRead");
gfsh.executeAndAssertThat("execute function --id=" + new ReadFunction().getId())
.statusIsSuccess();
assertThat(gfsh.getGfshOutput()).contains(ReadFunction.SUCCESS_OUTPUT);
@@ -96,8 +96,8 @@ public class ExecuteFunctionCommandSecurityTest implements Serializable {
@Test
public void dataReaderCanNotExecuteWriteFunction() throws Exception {
- gfsh.secureConnectAndVerify(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "dataRead", "dataRead");
+ gfsh.secureConnectAndVerify(locator.getPort(), GfshCommandRule.PortType.locator, "dataRead",
+ "dataRead");
gfsh.executeAndAssertThat("execute function --id=" + new WriteFunction().getId())
.containsOutput("dataRead not authorized for DATA:WRITE")
.doesNotContainOutput(WriteFunction.SUCCESS_OUTPUT);
@@ -105,8 +105,8 @@ public class ExecuteFunctionCommandSecurityTest implements Serializable {
@Test
public void dataWriterCanExecuteWriteFunction() throws Exception {
- gfsh.secureConnectAndVerify(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "dataWrite", "dataWrite");
+ gfsh.secureConnectAndVerify(locator.getPort(), GfshCommandRule.PortType.locator, "dataWrite",
+ "dataWrite");
gfsh.executeAndAssertThat("execute function --id=" + new WriteFunction().getId())
.statusIsSuccess();
assertThat(gfsh.getGfshOutput()).contains(WriteFunction.SUCCESS_OUTPUT);
@@ -114,8 +114,8 @@ public class ExecuteFunctionCommandSecurityTest implements Serializable {
@Test
public void dataWriterCanNotExecuteReadFunction() throws Exception {
- gfsh.secureConnectAndVerify(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "dataWrite", "dataWrite");
+ gfsh.secureConnectAndVerify(locator.getPort(), GfshCommandRule.PortType.locator, "dataWrite",
+ "dataWrite");
gfsh.executeCommand("execute function --id=" + new ReadFunction().getId());
assertThat(gfsh.getGfshOutput()).contains("dataWrite not authorized for DATA:READ");
assertThat(gfsh.getGfshOutput()).doesNotContain(ReadFunction.SUCCESS_OUTPUT);
@@ -123,8 +123,8 @@ public class ExecuteFunctionCommandSecurityTest implements Serializable {
@Test
public void readOnlyUserOnReplicatedRegion() throws Exception {
- gfsh.secureConnectAndVerify(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "dataRead", "dataRead");
+ gfsh.secureConnectAndVerify(locator.getPort(), GfshCommandRule.PortType.locator, "dataRead",
+ "dataRead");
gfsh.executeAndAssertThat(
"execute function --id=" + new ReadFunction().getId() + " --region=" + REPLICATED_REGION)
.statusIsSuccess().containsOutput(ReadFunction.SUCCESS_OUTPUT);
@@ -137,8 +137,8 @@ public class ExecuteFunctionCommandSecurityTest implements Serializable {
@Test
public void readOnlyUserOnPartitionedRegion() throws Exception {
- gfsh.secureConnectAndVerify(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "dataRead", "dataRead");
+ gfsh.secureConnectAndVerify(locator.getPort(), GfshCommandRule.PortType.locator, "dataRead",
+ "dataRead");
gfsh.executeAndAssertThat(
"execute function --id=" + new ReadFunction().getId() + " --region=" + PARTITIONED_REGION)
.statusIsSuccess().containsOutput(ReadFunction.SUCCESS_OUTPUT);
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
index cefc685..fda9f6f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
@@ -50,7 +50,7 @@ public class ExportDataIntegrationTest {
.withRegion(RegionShortcut.PARTITION, TEST_REGION_NAME).withEmbeddedLocator();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder tempDir = new TemporaryFolder();
@@ -61,8 +61,7 @@ public class ExportDataIntegrationTest {
@Before
public void setup() throws Exception {
- gfsh.connectAndVerify(server.getEmbeddedLocatorPort(),
- GfshShellConnectionRule.PortType.locator);
+ gfsh.connectAndVerify(server.getEmbeddedLocatorPort(), GfshCommandRule.PortType.locator);
region = server.getCache().getRegion(TEST_REGION_NAME);
loadRegion("value");
Path basePath = tempDir.getRoot().toPath();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
index 43adca6..c23393f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
@@ -57,7 +57,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.Member;
@Category(DistributedTest.class)
@@ -69,7 +69,7 @@ public class ExportLogsDUnitTest {
new LocatorServerStartupRule().withTempWorkingDir().withLogFile();
@Rule
- public GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public GfshCommandRule gfshConnector = new GfshCommandRule();
private MemberVM locator;
private MemberVM server1;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java
index c798ee0..f992f9a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java
@@ -28,7 +28,7 @@ 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.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(IntegrationTest.class)
@@ -38,7 +38,7 @@ public class ExportLogsIntegrationTest {
new LocatorStarterRule().withWorkingDir().withLogFile().withAutoStart();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
public void connect() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
index f1e3bbd..c7696a5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@@ -41,12 +41,12 @@ public class ExportLogsOnServerManagerDUnit {
new LocatorServerStartupRule().withTempWorkingDir().withLogFile();
@Rule
- public GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public GfshCommandRule gfshConnector = new GfshCommandRule();
@Test
public void testExportWithOneServer() throws Exception {
MemberVM server0 = lsRule.startServerAsJmxManager(0);
- gfshConnector.connect(server0.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfshConnector.connect(server0.getJmxPort(), GfshCommandRule.PortType.jmxManager);
gfshConnector.executeAndAssertThat("export logs").statusIsSuccess();
String message = gfshConnector.getGfshOutput();
@@ -64,8 +64,7 @@ public class ExportLogsOnServerManagerDUnit {
public void testExportWithPeerLocator() throws Exception {
MemberVM server0 = lsRule.startServerAsEmbededLocator(0);
lsRule.startServerVM(1, server0.getEmbeddedLocatorPort());
- gfshConnector.connect(server0.getEmbeddedLocatorPort(),
- GfshShellConnectionRule.PortType.locator);
+ gfshConnector.connect(server0.getEmbeddedLocatorPort(), GfshCommandRule.PortType.locator);
gfshConnector.executeAndAssertThat("export logs").statusIsSuccess();
String message = gfshConnector.getGfshOutput();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
index d7e6095..009053b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
@@ -48,7 +48,7 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ExportLogsStatsDUnitTest {
@@ -57,7 +57,7 @@ public class ExportLogsStatsDUnitTest {
new LocatorServerStartupRule().withTempWorkingDir().withLogFile();
@ClassRule
- public static GfshShellConnectionRule connector = new GfshShellConnectionRule();
+ public static GfshCommandRule connector = new GfshCommandRule();
protected static int jmxPort, httpPort;
protected static Set<String> expectedZipEntries = new HashSet<>();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
index ad5ea93..b4ae334 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ExportLogsWithMemberGroupDUnitTest {
@@ -50,7 +50,7 @@ public class ExportLogsWithMemberGroupDUnitTest {
new LocatorServerStartupRule().withTempWorkingDir().withLogFile();
@ClassRule
- public static GfshShellConnectionRule connector = new GfshShellConnectionRule();
+ public static GfshCommandRule connector = new GfshCommandRule();
protected static int jmxPort, httpPort;
protected static Set<String> expectedZipEntries = new HashSet<>();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index cc5227f..ab67cd3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.management.ManagementService;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class FunctionCommandsDUnitTest {
@@ -54,7 +54,7 @@ public class FunctionCommandsDUnitTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
public void before() throws Exception {
@@ -116,7 +116,7 @@ public class FunctionCommandsDUnitTest {
}
public void connectGfsh(MemberVM vm) throws Exception {
- gfsh.connectAndVerify(vm.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(vm.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GcCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GcCommandDUnitTest.java
index a3e2937..bf00b73 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GcCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GcCommandDUnitTest.java
@@ -17,8 +17,8 @@ package org.apache.geode.management.internal.cli.commands;
import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.http;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.jmxManager;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.http;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.jmxManager;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Properties;
@@ -35,7 +35,7 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@@ -61,7 +61,7 @@ public class GcCommandDUnitTest {
public static LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@ClassRule
- public static GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public static GfshCommandRule gfsh = new GfshCommandRule();
@BeforeClass
public static void setup() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandIntegrationTest.java
index 226edc3..d840613 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandIntegrationTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@@ -47,8 +47,8 @@ public class GetCommandIntegrationTest {
private static ServerStarterRule server =
new ServerStarterRule().withJMXManager().withAutoStart();
- private static GfshShellConnectionRule gfsh =
- new GfshShellConnectionRule(server::getJmxPort, GfshShellConnectionRule.PortType.jmxManager);
+ private static GfshCommandRule gfsh =
+ new GfshCommandRule(server::getJmxPort, GfshCommandRule.PortType.jmxManager);
@ClassRule
public static RuleChain chain = RuleChain.outerRule(server).around(gfsh);
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
index 3436cde..2902daa 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
@@ -15,15 +15,13 @@
package org.apache.geode.management.internal.cli.commands;
-import static org.assertj.core.api.Assertions.assertThat;
-
import org.junit.ClassRule;
import org.junit.Rule;
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.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(IntegrationTest.class)
@@ -32,7 +30,7 @@ public class GfshCommandIntegrationTest {
public static LocatorStarterRule locator = new LocatorStarterRule().withAutoStart();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Test
public void invalidCommandWhenNotConnected() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java
index d599a6d..7f774dd 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
@@ -51,7 +51,7 @@ public class ImportDataIntegrationTest {
.withRegion(RegionShortcut.PARTITION, TEST_REGION_NAME).withEmbeddedLocator();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder tempDir = new TemporaryFolder();
@@ -62,8 +62,7 @@ public class ImportDataIntegrationTest {
@Before
public void setup() throws Exception {
- gfsh.connectAndVerify(server.getEmbeddedLocatorPort(),
- GfshShellConnectionRule.PortType.locator);
+ gfsh.connectAndVerify(server.getEmbeddedLocatorPort(), GfshCommandRule.PortType.locator);
region = server.getCache().getRegion(TEST_REGION_NAME);
loadRegion("value");
Path basePath = tempDir.getRoot().toPath();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java
index 0da3595..85a3792 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java
@@ -39,7 +39,7 @@ 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.util.CommandStringBuilder;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.Server;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@@ -66,7 +66,7 @@ public class IndexCommandsIntegrationTest {
}
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
public void before() throws Exception {
@@ -86,7 +86,7 @@ public class IndexCommandsIntegrationTest {
}
public void connect(Server server) throws Exception {
- gfsh.connectAndVerify(server.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(server.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java
index 54d03ae..61eae9c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java
@@ -51,13 +51,13 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class IndexCommandsShareConfigurationDUnitTest {
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public LocatorServerStartupRule startupRule = new LocatorServerStartupRule();
@@ -86,7 +86,7 @@ public class IndexCommandsShareConfigurationDUnitTest {
locator = startupRule.startLocatorVM(0, locatorProps);
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
Properties props = new Properties();
props.setProperty(GROUPS, groupName);
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index c56124c..f85816e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -56,7 +56,7 @@ import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ListAndDescribeRegionDUnitTest implements Serializable {
@@ -73,7 +73,7 @@ public class ListAndDescribeRegionDUnitTest implements Serializable {
public static LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@ClassRule
- public static GfshShellConnectionRule gfshShellConnectionRule = new GfshShellConnectionRule();
+ public static GfshCommandRule gfshCommandRule = new GfshCommandRule();
@BeforeClass
public static void setupSystem() throws Exception {
@@ -127,13 +127,13 @@ public class ListAndDescribeRegionDUnitTest implements Serializable {
createRegionsWithSubRegions();
});
- gfshShellConnectionRule.connectAndVerify(locator);
+ gfshCommandRule.connectAndVerify(locator);
}
@Test
public void listAllRegions() throws Exception {
String listRegions = new CommandStringBuilder(LIST_REGION).toString();
- gfshShellConnectionRule.executeAndAssertThat(listRegions).statusIsSuccess().containsOutput(PR1,
+ gfshCommandRule.executeAndAssertThat(listRegions).statusIsSuccess().containsOutput(PR1,
LOCALREGIONONMANAGER, REGION1, REGION2, REGION3);
}
@@ -141,7 +141,7 @@ public class ListAndDescribeRegionDUnitTest implements Serializable {
public void listRegionsOnManager() throws Exception {
String listRegions =
new CommandStringBuilder(LIST_REGION).addOption(MEMBER, "Manager").toString();
- gfshShellConnectionRule.executeAndAssertThat(listRegions).statusIsSuccess().containsOutput(PR1,
+ gfshCommandRule.executeAndAssertThat(listRegions).statusIsSuccess().containsOutput(PR1,
LOCALREGIONONMANAGER);
}
@@ -149,39 +149,39 @@ public class ListAndDescribeRegionDUnitTest implements Serializable {
public void listRegionsOnServer() throws Exception {
CommandStringBuilder csb = new CommandStringBuilder(LIST_REGION);
csb.addOption(MEMBER, "Server");
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess()
- .containsOutput(PR1, REGION1, REGION2, REGION3, SUBREGION1A);
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess().containsOutput(PR1,
+ REGION1, REGION2, REGION3, SUBREGION1A);
}
@Test
public void listRegionsInGroup1() throws Exception {
CommandStringBuilder csb = new CommandStringBuilder(LIST_REGION);
csb.addOption(GROUP, "G1");
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess()
- .containsOutput(PR1, LOCALREGIONONMANAGER);
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess().containsOutput(PR1,
+ LOCALREGIONONMANAGER);
}
@Test
public void listRegionsInGroup2() throws Exception {
CommandStringBuilder csb = new CommandStringBuilder(LIST_REGION);
csb.addOption(GROUP, "G2");
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess()
- .containsOutput(PR1, REGION1, REGION2, REGION3, SUBREGION1A);
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess().containsOutput(PR1,
+ REGION1, REGION2, REGION3, SUBREGION1A);
}
@Test
public void describeRegionsOnManager() throws Exception {
CommandStringBuilder csb = new CommandStringBuilder(DESCRIBE_REGION);
csb.addOption(DESCRIBE_REGION__NAME, PR1);
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess()
- .containsOutput(PR1, "Server");
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess().containsOutput(PR1,
+ "Server");
}
@Test
public void describeRegionsOnServer() throws Exception {
CommandStringBuilder csb = new CommandStringBuilder(DESCRIBE_REGION);
csb.addOption(DESCRIBE_REGION__NAME, LOCALREGIONONMANAGER);
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess()
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess()
.containsOutput(LOCALREGIONONMANAGER, "Manager");
}
@@ -204,7 +204,7 @@ public class ListAndDescribeRegionDUnitTest implements Serializable {
CommandStringBuilder csb = new CommandStringBuilder(DESCRIBE_REGION);
csb.addOption(DESCRIBE_REGION__NAME, regionName);
String commandString = csb.toString();
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess().containsOutput(
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess().containsOutput(
regionName, RegionAttributesNames.COMPRESSOR,
RegionEntryContext.DEFAULT_COMPRESSION_PROVIDER);
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index 8857625..5522cf0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ListIndexCommandDUnitTest {
@@ -44,7 +44,7 @@ public class ListIndexCommandDUnitTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
public void before() throws Exception {
@@ -65,7 +65,7 @@ public class ListIndexCommandDUnitTest {
}
public void connectGfsh(MemberVM vm) throws Exception {
- gfsh.connectAndVerify(vm.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(vm.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
index 9dbbc30..05b83c9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ListMembersCommandDUnitTest {
@@ -38,7 +38,7 @@ public class ListMembersCommandDUnitTest {
private static MemberVM locator;
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@BeforeClass
public static void setup() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LocateEntryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LocateEntryDUnitTest.java
index 573fc63..2528dbf 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LocateEntryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LocateEntryDUnitTest.java
@@ -25,7 +25,7 @@ import org.apache.geode.management.internal.cli.dto.Value;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@@ -34,7 +34,7 @@ public class LocateEntryDUnitTest {
public static LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@ClassRule
- public static GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public static GfshCommandRule gfsh = new GfshCommandRule();
private static MemberVM locator, server1, server2;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandIntegrationTest.java
index 8ec785a..e164d10 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandIntegrationTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.management.internal.cli.dto.ObjectWithCharAttr;
import org.apache.geode.management.internal.cli.dto.Value;
import org.apache.geode.management.internal.cli.dto.Value2;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@@ -41,8 +41,8 @@ public class PutCommandIntegrationTest {
private static ServerStarterRule server =
new ServerStarterRule().withJMXManager().withRegion(RegionShortcut.REPLICATE, "testRegion");
- private static GfshShellConnectionRule gfsh =
- new GfshShellConnectionRule(server::getJmxPort, GfshShellConnectionRule.PortType.jmxManager);
+ private static GfshCommandRule gfsh =
+ new GfshCommandRule(server::getJmxPort, GfshCommandRule.PortType.jmxManager);
@ClassRule
public static RuleChain chain = RuleChain.outerRule(server).around(gfsh);
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandTest.java
index bafd47f..afc1dbc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandTest.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
-import java.util.regex.Pattern;
import com.google.common.io.Files;
import org.apache.commons.io.FileUtils;
@@ -40,7 +39,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
@@ -62,7 +61,7 @@ public class QueryCommandTest {
.withRegion(RegionShortcut.REPLICATE, "complexRegion");
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -84,9 +83,9 @@ public class QueryCommandTest {
@Before
public void connect() throws Exception {
if (useHttp) {
- gfsh.connectAndVerify(server.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(server.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(server.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(server.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandDUnitTest.java
index 5a0bb17..4051dc1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandDUnitTest.java
@@ -39,7 +39,7 @@ import org.apache.geode.test.dunit.SerializableCallableIF;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class RemoveCommandDUnitTest implements Serializable {
@@ -51,7 +51,7 @@ public class RemoveCommandDUnitTest implements Serializable {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public transient GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public transient GfshCommandRule gfsh = new GfshCommandRule();
private transient MemberVM locator;
private transient MemberVM server1;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandJsonDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandJsonDUnitTest.java
index 4137820..bc1c80a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandJsonDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandJsonDUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.dunit.SerializableCallableIF;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class RemoveCommandJsonDUnitTest implements Serializable {
@@ -50,7 +50,7 @@ public class RemoveCommandJsonDUnitTest implements Serializable {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public transient GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public transient GfshCommandRule gfsh = new GfshCommandRule();
private transient MemberVM locator;
private transient MemberVM server1;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index 885370b..6d27f7b 100755
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.concurrent.FileBasedCountDownLatch;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
/**
* Distributed tests for show deadlock command in {@link ShowDeadlockCommand}.
@@ -65,7 +65,7 @@ public class ShowDeadlockDUnitTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
public void setup() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java
index 233fb71..19ecff1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java
@@ -18,8 +18,8 @@ import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.http;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.jmxManager;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.http;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.jmxManager;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.Serializable;
@@ -44,7 +44,7 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@RunWith(Parameterized.class)
@@ -65,7 +65,7 @@ public class ShowLogCommandDUnitTest implements Serializable {
public static LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@ClassRule
- public static GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public static GfshCommandRule gfsh = new GfshCommandRule();
@Parameterized.Parameter
public static boolean useHttp;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
index 1a34a3e..151d396 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.management.RegionMXBean;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ShowMetricsDUnitTest {
@@ -52,7 +52,7 @@ public class ShowMetricsDUnitTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java
index f0f4a69..9245100 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ShowMissingDiskStoresDUnitTest {
@@ -55,7 +55,7 @@ public class ShowMissingDiskStoresDUnitTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public GfshCommandRule gfshConnector = new GfshCommandRule();
@Before
public void before() throws Exception {
@@ -126,7 +126,7 @@ public class ShowMissingDiskStoresDUnitTest {
return restart;
}
- private void checkAsyncResults(AsyncInvocation ai, GfshShellConnectionRule gfsh, int secsToWait)
+ private void checkAsyncResults(AsyncInvocation ai, GfshCommandRule gfsh, int secsToWait)
throws Exception {
try {
Awaitility.await().atLeast(secsToWait, TimeUnit.SECONDS).until(() -> ai.isDone());
@@ -142,7 +142,7 @@ public class ShowMissingDiskStoresDUnitTest {
System.out.println(result);
}
- private void putUsingGfsh(GfshShellConnectionRule gfsh, String regionName, int key, String val)
+ private void putUsingGfsh(GfshCommandRule gfsh, String regionName, int key, String val)
throws Exception {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.PUT)
.addOption(CliStrings.PUT__KEY, Integer.toString(key)).addOption(CliStrings.PUT__VALUE, val)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandDUnitTest.java
index 84e2803..e108867 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandDUnitTest.java
@@ -17,8 +17,8 @@ package org.apache.geode.management.internal.cli.commands;
import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.http;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.jmxManager;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.http;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.jmxManager;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Properties;
@@ -40,7 +40,7 @@ import org.apache.geode.test.dunit.SerializableCallableIF;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@@ -70,7 +70,7 @@ public class ShutdownCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/VersionCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/VersionCommandJUnitTest.java
index 6a23b1c..6884123 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/VersionCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/VersionCommandJUnitTest.java
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(IntegrationTest.class)
@@ -49,7 +49,7 @@ public class VersionCommandJUnitTest {
public static LocatorStarterRule locator = new LocatorStarterRule().withAutoStart();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Test
@Parameters({"version", "version --full=false"})
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java
index 83f58e7..ddfa7c0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java
@@ -27,7 +27,7 @@ import org.junit.rules.TestName;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(IntegrationTest.class)
@@ -39,7 +39,7 @@ public class GfshStatusCommandsIntegrationTest {
new LocatorStarterRule().withJMXManager().withName(LOCATOR_NAME).withAutoStart();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
index 80bfe62..95fcb15 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
@@ -25,7 +25,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@@ -37,11 +37,11 @@ public class GfshMultilineCommandTest {
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Test
public void testMultiLineCommand() throws Exception {
- gfsh.connectAndVerify(server.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(server.getJmxPort(), GfshCommandRule.PortType.jmxManager);
// Execute a command
CommandStringBuilder csb = new CommandStringBuilder(LIST_MEMBER);
csb.addOption(GROUP, "nogroup");
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
index 6d8da39..0d12a18 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
@@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ClusterConfigDeployJarDUnitTest extends ClusterConfigTestBase {
@@ -36,7 +36,7 @@ public class ClusterConfigDeployJarDUnitTest extends ClusterConfigTestBase {
private String group2Jar;
@Rule
- public GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public GfshCommandRule gfshConnector = new GfshCommandRule();
@Before
public void before() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
index 99d40e1..1c0890b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@Category(DistributedTest.class)
@@ -60,7 +60,7 @@ public class ClusterConfigDistributionDUnitTest {
@Rule
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public GfshCommandRule gfshConnector = new GfshCommandRule();
@Before
public void before() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
index b70c71b..fe170e9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ClusterConfigImportDUnitTest extends ClusterConfigTestBase {
@@ -50,7 +50,7 @@ public class ClusterConfigImportDUnitTest extends ClusterConfigTestBase {
private MemberVM locatorVM;
@Rule
- public GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public GfshCommandRule gfshConnector = new GfshCommandRule();
@Before
public void before() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
index 2c76362..030e4ef 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@Category({DistributedTest.class, SecurityTest.class})
@@ -57,7 +57,7 @@ public class ClusterConfigWithSecurityDUnitTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule connector = new GfshShellConnectionRule();
+ public GfshCommandRule connector = new GfshCommandRule();
@Before
public void before() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java
index c214246..46d1f7a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ImportClusterConfigDistributedTest {
@@ -50,7 +50,7 @@ public class ImportClusterConfigDistributedTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
public void exportClusterConfig() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportOldClusterConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportOldClusterConfigDUnitTest.java
index 8ef523d..396a40a9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportOldClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportOldClusterConfigDUnitTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.management.internal.configuration.utils.ZipUtils;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ImportOldClusterConfigDUnitTest {
@@ -41,7 +41,7 @@ public class ImportOldClusterConfigDUnitTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
index f09a2e4..ba32771 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.management.internal.security;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST_PROCESSOR;
-import static org.assertj.core.api.Assertions.assertThat;
import org.junit.BeforeClass;
import org.junit.ClassRule;
@@ -30,7 +29,7 @@ import org.apache.geode.security.TestPostProcessor;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({IntegrationTest.class, SecurityTest.class})
@@ -42,8 +41,8 @@ public class GfshCommandsPostProcessorTest {
.withProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName()).withAutoStart();
@Rule
- public GfshShellConnectionRule gfshConnection = new GfshShellConnectionRule(
- serverStarter::getJmxPort, GfshShellConnectionRule.PortType.jmxManager);
+ public GfshCommandRule gfshConnection =
+ new GfshCommandRule(serverStarter::getJmxPort, GfshCommandRule.PortType.jmxManager);
@BeforeClass
public static void beforeClass() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
index 9e3478cb..a2980b7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({IntegrationTest.class, SecurityTest.class})
@@ -46,8 +46,8 @@ public class GfshCommandsSecurityTest {
.withRegion(RegionShortcut.REPLICATE_PERSISTENT, "persistentRegion");
@Rule
- public GfshShellConnectionRule gfshConnection = new GfshShellConnectionRule(
- serverStarter::getJmxPort, GfshShellConnectionRule.PortType.jmxManager);
+ public GfshCommandRule gfshConnection =
+ new GfshCommandRule(serverStarter::getJmxPort, GfshCommandRule.PortType.jmxManager);
@BeforeClass
public static void beforeClass() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
index c33da97..749d58a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
@@ -43,8 +43,8 @@ import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule.PortType;
import org.apache.geode.test.junit.rules.Member;
@Category({DistributedTest.class, SecurityTest.class})
@@ -73,7 +73,7 @@ public class MultiUserDUnitTest {
// test is done.
VM vm1 = lsRule.getVM(1);
AsyncInvocation vm1Invoke = vm1.invokeAsync("run as data-reader", () -> {
- GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ GfshCommandRule gfsh = new GfshCommandRule();
gfsh.secureConnectAndVerify(jmxPort, PortType.jmxManager, "dataRead", "dataRead");
Awaitility.waitAtMost(5, TimeUnit.MILLISECONDS);
@@ -84,7 +84,7 @@ public class MultiUserDUnitTest {
// set up vm_2 as a gfsh vm, and then connect as "stranger" and try to execute the commands and
// assert errors comes back are NotAuthorized
AsyncInvocation vm2Invoke = vm2.invokeAsync("run as guest", () -> {
- GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ GfshCommandRule gfsh = new GfshCommandRule();
gfsh.secureConnectAndVerify(jmxPort, PortType.jmxManager, "guest", "guest");
List<TestCommand> allCommands = TestCommand.getOnlineCommands();
@@ -119,7 +119,7 @@ public class MultiUserDUnitTest {
// set up vm_3 as another gfsh vm, and then connect as "super-user" and try to execute the
// commands and assert we don't get a NotAuthorized Exception
AsyncInvocation vm3Invoke = vm3.invokeAsync("run as superUser", () -> {
- GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ GfshCommandRule gfsh = new GfshCommandRule();
gfsh.secureConnectAndVerify(jmxPort, PortType.jmxManager, "data,cluster", "data,cluster");
List<TestCommand> allCommands = TestCommand.getOnlineCommands();
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java b/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
index b747d73..7cea40c 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
@@ -39,7 +39,7 @@ import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category({DistributedTest.class, SecurityTest.class})
public class PDXGfshPostProcessorOnRemoteServerTest {
@@ -50,7 +50,7 @@ public class PDXGfshPostProcessorOnRemoteServerTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Test
public void testGfshCommand() throws Exception {
@@ -96,7 +96,7 @@ public class PDXGfshPostProcessorOnRemoteServerTest {
});
});
- gfsh.connectAndVerify(locatorVM.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager,
+ gfsh.connectAndVerify(locatorVM.getJmxPort(), GfshCommandRule.PortType.jmxManager,
CliStrings.CONNECT__USERNAME, "dataUser", CliStrings.CONNECT__PASSWORD, "1234567");
// get command
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
index 1e051d7..15ae43d 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
@@ -49,7 +49,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@@ -211,9 +211,9 @@ public class PDXPostProcessorDUnitTest extends JUnit4DistributedTestCase {
});
this.client1.invoke(() -> {
- GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
- gfsh.secureConnectAndVerify(this.server.getJmxPort(),
- GfshShellConnectionRule.PortType.jmxManager, "dataUser", "1234567");
+ GfshCommandRule gfsh = new GfshCommandRule();
+ gfsh.secureConnectAndVerify(this.server.getJmxPort(), GfshCommandRule.PortType.jmxManager,
+ "dataUser", "1234567");
// get command
gfsh.executeAndAssertThat("get --key=key1 --region=AuthRegion").statusIsSuccess();
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshShellConnectionRule.java b/geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
similarity index 96%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshShellConnectionRule.java
rename to geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
index 1b09cb9..3583684 100644
--- a/geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshShellConnectionRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
@@ -52,7 +52,7 @@ import org.apache.geode.test.junit.assertions.CommandResultAssert;
* you can use this as Rule:
*
* <pre>
- * {@literal @}Rule GfshShellConnectionRule rule = new GfshShellConnectionRule();
+ * {@literal @}Rule GfshCommandRule rule = new GfshCommandRule();
* </pre>
*
* then after you connect to a locator, you don't have to call disconnect() or close() at all, since
@@ -62,13 +62,13 @@ import org.apache.geode.test.junit.assertions.CommandResultAssert;
* Or as a ClassRule:
*
* <pre>
- * {@literal @}ClassRule GfshShellConnectionRule rule = new GfshShellConnectionRule();
+ * {@literal @}ClassRule GfshCommandRule rule = new GfshCommandRule();
* </pre>
*
* When using as a ClassRule, if you call connect in a test, you will need to call disconnect after
* the test as well. See NetstatDUnitTest for example.
*/
-public class GfshShellConnectionRule extends DescribedExternalResource {
+public class GfshCommandRule extends DescribedExternalResource {
private Supplier<Integer> portSupplier;
private PortType portType = PortType.jmxManager;
@@ -78,7 +78,7 @@ public class GfshShellConnectionRule extends DescribedExternalResource {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
private File workingDir;
- public GfshShellConnectionRule() {
+ public GfshCommandRule() {
try {
temporaryFolder.create();
} catch (IOException e) {
@@ -86,7 +86,7 @@ public class GfshShellConnectionRule extends DescribedExternalResource {
}
}
- public GfshShellConnectionRule(Supplier<Integer> portSupplier, PortType portType) {
+ public GfshCommandRule(Supplier<Integer> portSupplier, PortType portType) {
this();
this.portType = portType;
this.portSupplier = portSupplier;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
index 8de5ea1..0606b10 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category({DistributedTest.class, SecurityTest.class})
@RunWith(JUnitParamsRunner.class)
@@ -54,7 +54,7 @@ public class LuceneCommandsSecurityDUnitTest {
public LocatorServerStartupRule locatorServer = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfshShell = new GfshShellConnectionRule();
+ public GfshCommandRule gfshShell = new GfshCommandRule();
private MemberVM locator;
@@ -84,8 +84,8 @@ public class LuceneCommandsSecurityDUnitTest {
@Parameters(method = "getCreateIndexUserNameAndExpectedResponses")
public void verifyCreateIndexPermissions(UserNameAndExpectedResponse user) throws Exception {
// Connect gfsh
- this.gfshShell.secureConnectAndVerify(this.locator.getPort(),
- GfshShellConnectionRule.PortType.locator, user.getUserName(), user.getUserName());
+ this.gfshShell.secureConnectAndVerify(this.locator.getPort(), GfshCommandRule.PortType.locator,
+ user.getUserName(), user.getUserName());
// Attempt to create lucene index
CommandResult result = this.gfshShell.executeCommand(getCreateIndexCommand());
@@ -108,8 +108,8 @@ public class LuceneCommandsSecurityDUnitTest {
createIndexAndRegion();
// Connect gfsh
- this.gfshShell.secureConnectAndVerify(this.locator.getPort(),
- GfshShellConnectionRule.PortType.locator, user.getUserName(), user.getUserName());
+ this.gfshShell.secureConnectAndVerify(this.locator.getPort(), GfshCommandRule.PortType.locator,
+ user.getUserName(), user.getUserName());
// Attempt to search lucene index
CommandResult result = this.gfshShell.executeCommand(getSearchIndexCommand());
@@ -132,8 +132,8 @@ public class LuceneCommandsSecurityDUnitTest {
createIndexAndRegion();
// Connect gfsh
- this.gfshShell.secureConnectAndVerify(this.locator.getPort(),
- GfshShellConnectionRule.PortType.locator, user.getUserName(), user.getUserName());
+ this.gfshShell.secureConnectAndVerify(this.locator.getPort(), GfshCommandRule.PortType.locator,
+ user.getUserName(), user.getUserName());
// Attempt to search lucene index
CommandResult result = this.gfshShell.executeCommand(getListIndexesCommand());
@@ -156,8 +156,8 @@ public class LuceneCommandsSecurityDUnitTest {
createIndexAndRegion();
// Connect gfsh
- this.gfshShell.secureConnectAndVerify(this.locator.getPort(),
- GfshShellConnectionRule.PortType.locator, user.getUserName(), user.getUserName());
+ this.gfshShell.secureConnectAndVerify(this.locator.getPort(), GfshCommandRule.PortType.locator,
+ user.getUserName(), user.getUserName());
// Attempt to search lucene index
CommandResult result = this.gfshShell.executeCommand(getDescribeIndexCommand());
@@ -181,8 +181,8 @@ public class LuceneCommandsSecurityDUnitTest {
createIndexAndRegion();
// Connect gfsh
- this.gfshShell.secureConnectAndVerify(this.locator.getPort(),
- GfshShellConnectionRule.PortType.locator, user.getUserName(), user.getUserName());
+ this.gfshShell.secureConnectAndVerify(this.locator.getPort(), GfshCommandRule.PortType.locator,
+ user.getUserName(), user.getUserName());
// Attempt to search lucene index
CommandResult result = this.gfshShell.executeCommand(getDestroyIndexCommand());
@@ -193,8 +193,8 @@ public class LuceneCommandsSecurityDUnitTest {
private void createIndexAndRegion() throws Exception {
// Connect gfsh to locator with permissions necessary to create an index and region
- this.gfshShell.secureConnectAndVerify(this.locator.getPort(),
- GfshShellConnectionRule.PortType.locator, "cluster,data", "cluster,data");
+ this.gfshShell.secureConnectAndVerify(this.locator.getPort(), GfshCommandRule.PortType.locator,
+ "cluster,data", "cluster,data");
// Create lucene index
this.gfshShell.executeAndAssertThat(getCreateIndexCommand()).statusIsSuccess();
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
index 4f2f61f..64c9ec0 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
@@ -61,7 +61,7 @@ import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
@@ -70,7 +70,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
public class LuceneIndexCommandsDUnitTest implements Serializable {
@Rule
- public transient GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public transient GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public LocatorServerStartupRule startupRule = new LocatorServerStartupRule();
@@ -88,7 +88,7 @@ public class LuceneIndexCommandsDUnitTest implements Serializable {
}
public void connect(MemberVM serverVM) throws Exception {
- gfsh.connectAndVerify(serverVM.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(serverVM.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
index 0c0f8ff..e7189e4 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
@@ -48,7 +48,7 @@ import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@@ -58,7 +58,7 @@ public class LuceneClusterConfigurationDUnitTest {
public LocatorServerStartupRule ls = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfshConnector = new GfshShellConnectionRule();
+ public GfshCommandRule gfshConnector = new GfshCommandRule();
private MemberVM locator = null;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateAndDestroyGatewaySenderCommandsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateAndDestroyGatewaySenderCommandsDUnitTest.java
index 0594dd3..613b620 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateAndDestroyGatewaySenderCommandsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateAndDestroyGatewaySenderCommandsDUnitTest.java
@@ -46,7 +46,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class CreateAndDestroyGatewaySenderCommandsDUnitTest {
@@ -55,7 +55,7 @@ public class CreateAndDestroyGatewaySenderCommandsDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
index 287f9ea..d8d7fde 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
@@ -49,7 +49,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
/**
* DUnit tests for 'create gateway-receiver' command.
@@ -63,7 +63,7 @@ public class CreateGatewayReceiverCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewaySenderCommandDUnitTest.java
index 21a89e5..61b7891 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewaySenderCommandDUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class CreateGatewaySenderCommandDUnitTest {
@@ -49,7 +49,7 @@ public class CreateGatewaySenderCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
index 5166bc7..61f9163 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class DestroyGatewaySenderCommandDUnitTest {
@@ -47,7 +47,7 @@ public class DestroyGatewaySenderCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
index 1b2e3f8..fa1bf34 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class PauseGatewaySenderCommandDUnitTest {
@@ -53,7 +53,7 @@ public class PauseGatewaySenderCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
index a85604e..df19f73 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
@@ -46,7 +46,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ResumeGatewaySenderCommandDUnitTest {
@@ -55,7 +55,7 @@ public class ResumeGatewaySenderCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
index 17b8106..f7e2aa3 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
@@ -43,7 +43,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class StartGatewayReceiverCommandDUnitTest {
@@ -52,7 +52,7 @@ public class StartGatewayReceiverCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
index 2a41db3..a1fa23a 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class StartGatewaySenderCommandDUnitTest {
@@ -53,7 +53,7 @@ public class StartGatewaySenderCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
index c863fe2..760405a 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class StatusGatewayReceiverCommandDUnitTest {
@@ -53,7 +53,7 @@ public class StatusGatewayReceiverCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
index d7270400..da9aab7 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class StatusGatewaySenderCommandDUnitTest {
@@ -53,7 +53,7 @@ public class StatusGatewaySenderCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
index f3cd676..ed6b016 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class StopGatewayReceiverCommandDUnitTest {
@@ -53,7 +53,7 @@ public class StopGatewayReceiverCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
index 01bbdda..1b2174a 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
@@ -45,7 +45,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class StopGatewaySenderCommandDUnitTest {
@@ -54,7 +54,7 @@ public class StopGatewaySenderCommandDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index 39c6393..3ab3cf8 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class WanCommandListDUnitTest {
@@ -52,7 +52,7 @@ public class WanCommandListDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private MemberVM locatorSite1;
private MemberVM locatorSite2;
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
index 6c4c0c4..894668d 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
@@ -51,7 +51,7 @@ public class ClusterConfigurationIndexWithFromClauseDUnitTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfshShellConnectionRule = new GfshShellConnectionRule();
+ public GfshCommandRule gfshCommandRule = new GfshCommandRule();
private MemberVM locator = null;
@@ -65,12 +65,12 @@ public class ClusterConfigurationIndexWithFromClauseDUnitTest {
public void indexCreatedWithEntrySetInFromClauseMustPersist(RegionShortcut regionShortcut)
throws Exception {
MemberVM vm1 = lsRule.startServerVM(1, locator.getPort());
- gfshShellConnectionRule.connectAndVerify(locator);
+ gfshCommandRule.connectAndVerify(locator);
createRegionUsingGfsh(REGION_NAME, regionShortcut, null);
createIndexUsingGfsh("\"" + REGION_NAME + ".entrySet() z\"", "z.key", INDEX_NAME);
String serverName = vm1.getName();
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.LIST_MEMBER);
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess();
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess();
lsRule.stopVM(1);
lsRule.startServerVM(1, locator.getPort());
verifyIndexRecreated(INDEX_NAME);
@@ -78,8 +78,8 @@ public class ClusterConfigurationIndexWithFromClauseDUnitTest {
private void verifyIndexRecreated(String indexName) throws Exception {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.LIST_INDEX);
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess();
- String resultAsString = gfshShellConnectionRule.getGfshOutput();
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess();
+ String resultAsString = gfshCommandRule.getGfshOutput();
assertTrue(resultAsString.contains(indexName));
}
@@ -89,7 +89,7 @@ public class ClusterConfigurationIndexWithFromClauseDUnitTest {
csb.addOption(CliStrings.CREATE_INDEX__EXPRESSION, expression);
csb.addOption(CliStrings.CREATE_INDEX__REGION, regionName);
csb.addOption(CliStrings.CREATE_INDEX__NAME, indexName);
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess();
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess();
}
private void createRegionUsingGfsh(String regionName, RegionShortcut regionShortCut, String group)
@@ -98,6 +98,6 @@ public class ClusterConfigurationIndexWithFromClauseDUnitTest {
csb.addOption(CliStrings.CREATE_REGION__REGION, regionName);
csb.addOption(CliStrings.CREATE_REGION__REGIONSHORTCUT, regionShortCut.name());
csb.addOptionWithValueCheck(CliStrings.GROUP, group);
- gfshShellConnectionRule.executeAndAssertThat(csb.toString()).statusIsSuccess();
+ gfshCommandRule.executeAndAssertThat(csb.toString()).statusIsSuccess();
}
}
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
index e42573d..63cc212 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category({DistributedTest.class})
@SuppressWarnings("serial")
@@ -44,7 +44,7 @@ public class WANClusterConfigurationDUnitTest {
public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private static final String REPLICATE_REGION = "ReplicateRegion1";
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
index c748b94..081ed72 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
@@ -51,7 +51,7 @@ public class AlterRuntimeCommandDUnitTest {
new LocatorServerStartupRule().withTempWorkingDir().withLogFile();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -83,9 +83,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server0 = startupRule.startServerAsJmxManager(0, props);
if (connectOverHttp) {
- gfsh.connectAndVerify(server0.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(server0.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(server0.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(server0.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -137,9 +137,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -173,9 +173,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csbSetFileSizeLimit =
@@ -221,9 +221,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -264,9 +264,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final int TEST_LIMIT = 10;
@@ -314,9 +314,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -352,9 +352,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -382,9 +382,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -423,9 +423,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final String TEST_NAME = "statisticsArchive";
@@ -460,9 +460,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final String TEST_NAME = "statisticsArchive";
@@ -505,9 +505,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final String TEST_NAME = "statisticsArchive";
@@ -549,9 +549,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -585,9 +585,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final int TEST_RATE = 2000;
@@ -631,9 +631,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final int TEST_RATE = 2500;
@@ -678,9 +678,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -713,9 +713,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final int TEST_LIMIT = 10;
@@ -752,9 +752,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final int TEST_LIMIT = 10;
@@ -799,9 +799,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final int TEST_LIMIT = 25;
@@ -847,9 +847,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -895,9 +895,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final int TEST_LIMIT = 10;
@@ -934,9 +934,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final int TEST_LIMIT = 10;
@@ -981,9 +981,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
final int TEST_LIMIT = 25;
@@ -1029,9 +1029,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -1064,9 +1064,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -1105,9 +1105,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server2 = startupRule.startServerVM(2, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
server2.invoke(() -> {
@@ -1151,9 +1151,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM server1 = startupRule.startServerVM(1, props, locator.getPort());
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
@@ -1182,9 +1182,9 @@ public class AlterRuntimeCommandDUnitTest {
MemberVM locator = startupRule.startLocatorVM(0);
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
Properties props = new Properties();
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
index f5ddf62..eda609a 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@RunWith(Parameterized.class)
@@ -45,7 +45,7 @@ public class ClusterConfigurationDUnitTest {
public LocatorServerStartupRule startupRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -63,7 +63,7 @@ public class ClusterConfigurationDUnitTest {
public void testStartServerAndExecuteCommands() throws Exception {
MemberVM locator = startupRule.startLocatorVM(0);
if (connectOverHttp) {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
} else {
gfsh.connectAndVerify(locator);
}
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
index 80c60e6..6932124 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(IntegrationTest.class)
@@ -41,14 +41,14 @@ public class CommandOverHttpTest {
new ServerStarterRule().withWorkingDir().withLogFile().withJMXManager().withAutoStart();
@Rule
- public GfshShellConnectionRule gfshRule = new GfshShellConnectionRule();
+ public GfshCommandRule gfshRule = new GfshCommandRule();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Before
public void before() throws Exception {
- gfshRule.connectAndVerify(server.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfshRule.connectAndVerify(server.getHttpPort(), GfshCommandRule.PortType.http);
}
@Test
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
index 1c7cdcb..23015ce 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
@@ -21,7 +21,7 @@ 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.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(IntegrationTest.class)
@@ -31,7 +31,7 @@ public class ConnectCommandIntegrationTest {
public static LocatorStarterRule locator = new LocatorStarterRule().withAutoStart();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Test
public void connectToLocator() throws Exception {
@@ -40,11 +40,11 @@ public class ConnectCommandIntegrationTest {
@Test
public void connectOverJmx() throws Exception {
- gfsh.connectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
@Test
public void connectOverHttp() throws Exception {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
}
}
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
index 0c1744b..74c2b89 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
@@ -70,7 +70,7 @@ import org.apache.geode.test.dunit.rules.CleanupDUnitVMsRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ConnectCommandWithSSLTest {
@@ -169,22 +169,22 @@ public class ConnectCommandWithSSLTest {
}
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Test
public void connectWithNoSSL() throws Exception {
- gfsh.connect(locator.getPort(), GfshShellConnectionRule.PortType.locator);
+ gfsh.connect(locator.getPort(), GfshCommandRule.PortType.locator);
assertThat(gfsh.isConnected()).isFalse();
// should fail at connecting to locator stage
assertThat(gfsh.getGfshOutput()).doesNotContain("Connecting to Manager at");
assertThat(gfsh.getGfshOutput())
.contains("trying to connect a non-SSL-enabled client to an SSL-enabled locator");
- gfsh.connect(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connect(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager);
assertThat(gfsh.isConnected()).isFalse();
assertThat(gfsh.getGfshOutput()).contains("non-JRMP server at remote endpoint");
- gfsh.connect(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connect(locator.getHttpPort(), GfshCommandRule.PortType.http);
assertThat(gfsh.isConnected()).isFalse();
assertThat(gfsh.getGfshOutput()).contains("Unexpected end of file from server");
}
@@ -193,18 +193,18 @@ public class ConnectCommandWithSSLTest {
public void connectWithSSL() throws Exception {
sslProperties.store(out, null);
- gfsh.connect(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "security-properties-file", sslConfigFile.getAbsolutePath());
+ gfsh.connect(locator.getPort(), GfshCommandRule.PortType.locator, "security-properties-file",
+ sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isTrue();
gfsh.disconnect();
- gfsh.connect(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager,
+ gfsh.connect(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager,
"security-properties-file", sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isTrue();
gfsh.disconnect();
- gfsh.connect(locator.getHttpPort(), GfshShellConnectionRule.PortType.http,
- "security-properties-file", sslConfigFile.getAbsolutePath(), "skip-ssl-validation", "true");
+ gfsh.connect(locator.getHttpPort(), GfshCommandRule.PortType.http, "security-properties-file",
+ sslConfigFile.getAbsolutePath(), "skip-ssl-validation", "true");
assertThat(gfsh.isConnected()).isTrue();
}
@@ -212,22 +212,22 @@ public class ConnectCommandWithSSLTest {
public void connectWithJmxSSL() throws Exception {
jmxSslProperties.store(out, null);
// can't connect locator
- gfsh.connect(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "security-properties-file", sslConfigFile.getAbsolutePath());
+ gfsh.connect(locator.getPort(), GfshCommandRule.PortType.locator, "security-properties-file",
+ sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isFalse();
assertThat(gfsh.getGfshOutput()).doesNotContain("Connecting to Manager at");
assertThat(gfsh.getGfshOutput())
.contains("trying to connect a non-SSL-enabled client to an SSL-enabled locator");
// can connect to jmx
- gfsh.connect(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager,
+ gfsh.connect(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager,
"security-properties-file", sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isTrue();
gfsh.disconnect();
// cannot connect to http
- gfsh.connect(locator.getHttpPort(), GfshShellConnectionRule.PortType.http,
- "security-properties-file", sslConfigFile.getAbsolutePath());
+ gfsh.connect(locator.getHttpPort(), GfshCommandRule.PortType.http, "security-properties-file",
+ sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isFalse();
}
@@ -241,20 +241,20 @@ public class ConnectCommandWithSSLTest {
public void connectWithClusterSSL() throws Exception {
clusterSslProperties.store(out, null);
// can connect to locator and jmx
- gfsh.connect(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "security-properties-file", sslConfigFile.getAbsolutePath());
+ gfsh.connect(locator.getPort(), GfshCommandRule.PortType.locator, "security-properties-file",
+ sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isTrue();
gfsh.disconnect();
// can connect to jmx
- gfsh.connect(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager,
+ gfsh.connect(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager,
"security-properties-file", sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isTrue();
gfsh.disconnect();
// can connect to http
- gfsh.connect(locator.getHttpPort(), GfshShellConnectionRule.PortType.http,
- "security-properties-file", sslConfigFile.getAbsolutePath(), "skip-ssl-validation", "true");
+ gfsh.connect(locator.getHttpPort(), GfshCommandRule.PortType.http, "security-properties-file",
+ sslConfigFile.getAbsolutePath(), "skip-ssl-validation", "true");
assertThat(gfsh.isConnected()).isTrue();
}
@@ -262,18 +262,18 @@ public class ConnectCommandWithSSLTest {
public void connectWithHttpSSL() throws Exception {
httpSslProperties.store(out, null);
// can connect to locator and jmx
- gfsh.connect(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "security-properties-file", sslConfigFile.getAbsolutePath());
+ gfsh.connect(locator.getPort(), GfshCommandRule.PortType.locator, "security-properties-file",
+ sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isFalse();
// cannot connect to jmx
- gfsh.connect(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager,
+ gfsh.connect(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager,
"security-properties-file", sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isFalse();
// can connect to http
- gfsh.connect(locator.getHttpPort(), GfshShellConnectionRule.PortType.http,
- "security-properties-file", sslConfigFile.getAbsolutePath(), "skip-ssl-validation", "true");
+ gfsh.connect(locator.getHttpPort(), GfshCommandRule.PortType.http, "security-properties-file",
+ sslConfigFile.getAbsolutePath(), "skip-ssl-validation", "true");
assertThat(gfsh.isConnected()).isTrue();
}
@@ -281,18 +281,18 @@ public class ConnectCommandWithSSLTest {
public void connectWithHttpSSLAndSkipSSLValidation() throws Exception {
httpSslPropertiesSkipValidation.store(out, null);
// cannot connect to locator and jmx
- gfsh.connect(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "security-properties-file", sslConfigFile.getAbsolutePath());
+ gfsh.connect(locator.getPort(), GfshCommandRule.PortType.locator, "security-properties-file",
+ sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isFalse();
// cannot connect to jmx
- gfsh.connect(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager,
+ gfsh.connect(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager,
"security-properties-file", sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isFalse();
// can connect to http
- gfsh.connect(locator.getHttpPort(), GfshShellConnectionRule.PortType.http,
- "security-properties-file", sslConfigFile.getAbsolutePath(), "skip-ssl-validation", "true");
+ gfsh.connect(locator.getHttpPort(), GfshCommandRule.PortType.http, "security-properties-file",
+ sslConfigFile.getAbsolutePath(), "skip-ssl-validation", "true");
assertThat(gfsh.isConnected()).isTrue();
}
@@ -304,8 +304,8 @@ public class ConnectCommandWithSSLTest {
combined.store(out, null);
// can connect to both locator and jmx
- gfsh.connect(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "security-properties-file", sslConfigFile.getAbsolutePath());
+ gfsh.connect(locator.getPort(), GfshCommandRule.PortType.locator, "security-properties-file",
+ sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isTrue();
}
@@ -315,13 +315,13 @@ public class ConnectCommandWithSSLTest {
sslProperties.store(out, null);
// can connect to both locator and jmx
- gfsh.connect(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "security-properties-file", sslConfigFile.getAbsolutePath());
+ gfsh.connect(locator.getPort(), GfshCommandRule.PortType.locator, "security-properties-file",
+ sslConfigFile.getAbsolutePath());
assertThat(gfsh.isConnected()).isTrue();
gfsh.disconnect();
// reconnect again with no SSL should fail
- gfsh.connect(locator.getPort(), GfshShellConnectionRule.PortType.locator);
+ gfsh.connect(locator.getPort(), GfshCommandRule.PortType.locator);
assertThat(gfsh.isConnected()).isFalse();
// it should fail at connecting to locator, not connecting to manager
assertThat(gfsh.getGfshOutput()).doesNotContain("Connecting to Manager at");
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
index b0128a4..628ef1d 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
@@ -22,7 +22,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(IntegrationTest.class)
@@ -33,26 +33,26 @@ public class ConnectCommandWithSecurityTest {
new LocatorStarterRule().withSecurityManager(SimpleTestSecurityManager.class).withAutoStart();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Test
public void connectToLocator() throws Exception {
- gfsh.secureConnectAndVerify(locator.getPort(), GfshShellConnectionRule.PortType.locator,
- "clusterRead", "clusterRead");
+ gfsh.secureConnectAndVerify(locator.getPort(), GfshCommandRule.PortType.locator, "clusterRead",
+ "clusterRead");
gfsh.executeAndAssertThat("list members").statusIsSuccess();
}
@Test
public void connectOverJmx() throws Exception {
- gfsh.secureConnectAndVerify(locator.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager,
+ gfsh.secureConnectAndVerify(locator.getJmxPort(), GfshCommandRule.PortType.jmxManager,
"clusterRead", "clusterRead");
gfsh.executeAndAssertThat("list members").statusIsSuccess();
}
@Test
public void connectOverHttp() throws Exception {
- gfsh.secureConnectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http,
- "clusterRead", "clusterRead");
+ gfsh.secureConnectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http, "clusterRead",
+ "clusterRead");
gfsh.executeAndAssertThat("list members").statusIsSuccess();
}
}
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
index 370670b..a3d24ce 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
@@ -46,7 +46,7 @@ public class DescribeConfigCommandDUnitTest {
new LocatorServerStartupRule().withTempWorkingDir().withLogFile();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -61,9 +61,9 @@ public class DescribeConfigCommandDUnitTest {
MemberVM server0 = startupRule.startServerAsJmxManager(0, localProps);
if (connectOverHttp) {
- gfsh.connectAndVerify(server0.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(server0.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(server0.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(server0.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
server0.invoke(() -> {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
index 3b90842..87f3b34 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
@@ -17,8 +17,8 @@ package org.apache.geode.management.internal.cli.commands;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.apache.geode.management.internal.security.TestFunctions.ReadFunction;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.http;
-import static org.apache.geode.test.junit.rules.GfshShellConnectionRule.PortType.jmxManager;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.http;
+import static org.apache.geode.test.junit.rules.GfshCommandRule.PortType.jmxManager;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Properties;
@@ -36,7 +36,7 @@ import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ExecuteFunctionCommandWithSecurityDUnitTest {
@@ -44,7 +44,7 @@ public class ExecuteFunctionCommandWithSecurityDUnitTest {
public static LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
private static MemberVM locator;
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
index a8504de..1ab1fba 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
@@ -45,7 +45,7 @@ public class ExportConfigCommandDUnitTest {
new LocatorServerStartupRule().withTempWorkingDir().withLogFile();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -59,9 +59,9 @@ public class ExportConfigCommandDUnitTest {
MemberVM server0 = startupRule.startServerAsEmbededLocator(0, props);
if (connectOverHttp) {
- gfsh.connectAndVerify(server0.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(server0.getHttpPort(), GfshCommandRule.PortType.http);
} else {
- gfsh.connectAndVerify(server0.getJmxPort(), GfshShellConnectionRule.PortType.jmxManager);
+ gfsh.connectAndVerify(server0.getJmxPort(), GfshCommandRule.PortType.jmxManager);
}
// start server1 and server2 in group2
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
index 68527e2..63ad379 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
@@ -20,14 +20,14 @@ import java.io.File;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(IntegrationTest.class)
public class ExportLogsOverHttpIntegrationTest extends ExportLogsIntegrationTest {
@Override
public void connect() throws Exception {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
}
public File getWorkingDirectory() throws Exception {
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
index 0775259..99793c4 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ExportLogsStatsOverHttpDUnitTest extends ExportLogsStatsDUnitTest {
@@ -41,7 +41,7 @@ public class ExportLogsStatsOverHttpDUnitTest extends ExportLogsStatsDUnitTest {
@Override
public void connectIfNeeded() throws Exception {
if (!connector.isConnected())
- connector.connect(httpPort, GfshShellConnectionRule.PortType.http);
+ connector.connect(httpPort, GfshCommandRule.PortType.http);
}
@Test
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
index d1aacbb..55285d5 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
@@ -19,12 +19,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class FunctionCommandsOverHttpDUnitTest extends FunctionCommandsDUnitTest {
@Override
public void connectGfsh(MemberVM vm) throws Exception {
- gfsh.connectAndVerify(vm.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(vm.getHttpPort(), GfshCommandRule.PortType.http);
}
}
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
index 64b2707..abe9480 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
@@ -18,13 +18,13 @@ package org.apache.geode.management.internal.cli.commands;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.Server;
@Category(IntegrationTest.class)
public class IndexCommandOverHttpTest extends IndexCommandsIntegrationTest {
@Override
public void connect(Server server) throws Exception {
- gfsh.connectAndVerify(server.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(server.getHttpPort(), GfshCommandRule.PortType.http);
}
}
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
index 0c15a52..64fae9a 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
@@ -19,12 +19,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(DistributedTest.class)
public class ListIndexCommandOverHttpDUnitTest extends ListIndexCommandDUnitTest {
@Override
public void connectGfsh(MemberVM vm) throws Exception {
- gfsh.connectAndVerify(vm.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(vm.getHttpPort(), GfshCommandRule.PortType.http);
}
}
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
index 74e9277..2b60a8f 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
@@ -19,12 +19,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category({IntegrationTest.class, SecurityTest.class})
public class GfshCommandsOverHttpSecurityTest extends GfshCommandsSecurityTest {
public GfshCommandsOverHttpSecurityTest() {
- gfshConnection = new GfshShellConnectionRule(serverStarter::getHttpPort,
- GfshShellConnectionRule.PortType.http);
+ gfshConnection = new GfshCommandRule(serverStarter::getHttpPort, GfshCommandRule.PortType.http);
}
}
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
index 97f2a96..fa63d07 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.security.SecurityManager;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category(IntegrationTest.class)
public class LogNoPasswordTest {
@@ -43,7 +43,7 @@ public class LogNoPasswordTest {
public LocatorServerStartupRule lsRule = new LocatorServerStartupRule().withLogFile();
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Test
public void testPasswordInLogs() throws Exception {
@@ -51,7 +51,7 @@ public class LogNoPasswordTest {
properties.setProperty(LOG_LEVEL, "debug");
properties.setProperty(SECURITY_MANAGER, MySecurityManager.class.getName());
MemberVM locator = lsRule.startLocatorVM(0, properties);
- gfsh.secureConnectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http, "any",
+ gfsh.secureConnectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http, "any",
PASSWORD);
gfsh.executeAndAssertThat("list members").statusIsSuccess();
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
index ab11ddd..71f92f3 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
@@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.DistributedSystemMXBean;
import org.apache.geode.management.internal.ManagementConstants;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(IntegrationTest.class)
@@ -46,11 +46,11 @@ public class HttpOperationInvokerMBeanOperationTest {
private HttpOperationInvoker invoker;
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Before
public void before() throws Exception {
- gfsh.connectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http);
+ gfsh.connectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http);
invoker = (HttpOperationInvoker) gfsh.getGfsh().getOperationInvoker();
}
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
index 1a352ed..fef7bbe 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.management.internal.cli.CommandRequest;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@Category(IntegrationTest.class)
@@ -48,15 +48,15 @@ public class HttpOperationInvokerSecurityTest {
new LocatorStarterRule().withSecurityManager(SimpleTestSecurityManager.class).withAutoStart();
@ClassRule
- public static GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public static GfshCommandRule gfsh = new GfshCommandRule();
private static HttpOperationInvoker invoker;
private static CommandRequest request;
@Test
public void performBeanOperationsHasAuthorizationCheck() throws Exception {
- gfsh.secureConnectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http,
- "test", "test");
+ gfsh.secureConnectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http, "test",
+ "test");
invoker = (HttpOperationInvoker) gfsh.getGfsh().getOperationInvoker();
Integer distributedSystemId =
@@ -84,8 +84,8 @@ public class HttpOperationInvokerSecurityTest {
@Test
public void processCommandHasAuthorizationCheck() throws Exception {
- gfsh.secureConnectAndVerify(locator.getHttpPort(), GfshShellConnectionRule.PortType.http,
- "test", "test");
+ gfsh.secureConnectAndVerify(locator.getHttpPort(), GfshCommandRule.PortType.http, "test",
+ "test");
invoker = (HttpOperationInvoker) gfsh.getGfsh().getOperationInvoker();
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].