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 2016/04/29 21:23:24 UTC
[14/50] [abbrv] incubator-geode git commit: GEODE-17:
CliCommandTestBase refactor
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshShellConnectionRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshShellConnectionRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshShellConnectionRule.java
new file mode 100644
index 0000000..9dc8e5e
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshShellConnectionRule.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.management.internal.security;
+
+import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh;
+import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
+import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
+import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
+import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+import com.gemstone.gemfire.test.junit.rules.DescribedExternalResource;
+import org.junit.runner.Description;
+
+/**
+ * Class which eases the creation of MBeans for security testing. When combined with {@link JMXConnectionConfiguration}
+ * it allows for the creation of per-test connections with different user/password combinations.
+ *
+ */
+public class GfshShellConnectionRule extends DescribedExternalResource {
+
+ private int jmxPort = 0 ;
+ private int httpPort = 0;
+ private boolean useHttpOnConnect = false;
+ private HeadlessGfsh gfsh;
+ private CommandResult result;
+ /**
+ * Rule constructor
+ *
+ */
+ public GfshShellConnectionRule(int jmxPort, int httpPort, boolean useHttpOnConnect) {
+ this.jmxPort = jmxPort;
+ this.httpPort = httpPort;
+ this.useHttpOnConnect = useHttpOnConnect;
+ }
+
+ protected void before(Description description) throws Throwable {
+ JMXConnectionConfiguration config = description.getAnnotation(JMXConnectionConfiguration.class);
+ if(config==null)
+ return;
+
+ Gfsh.SUPPORT_MUTLIPLESHELL = true;
+ String shellId = getClass().getSimpleName() + "_" + description.getMethodName();
+ gfsh = new HeadlessGfsh(shellId, 30);
+
+ final CommandStringBuilder command = new CommandStringBuilder(CliStrings.CONNECT);
+ command.addOption(CliStrings.CONNECT__USERNAME, config.user());
+ command.addOption(CliStrings.CONNECT__PASSWORD, config.password());
+
+ String endpoint;
+ if (useHttpOnConnect) {
+ endpoint = "http://localhost:" + httpPort + "/gemfire/v1";
+ command.addOption(CliStrings.CONNECT__USE_HTTP, Boolean.TRUE.toString());
+ command.addOption(CliStrings.CONNECT__URL, endpoint);
+ } else {
+ endpoint = "localhost[" + jmxPort + "]";
+ command.addOption(CliStrings.CONNECT__JMX_MANAGER, endpoint);
+ }
+ System.out.println(getClass().getSimpleName()+" using endpoint: "+endpoint);
+
+ gfsh.executeCommand(command.toString());
+
+ result = (CommandResult) gfsh.getResult();
+
+ if(result.getContent().toString().contains("Authentication Failed Wrong username/password")){
+ throw new SecurityException(result.getContent().toString());
+ }
+ }
+
+ /**
+ * Override to tear down your specific external resource.
+ */
+ protected void after(Description description) throws Throwable {
+ if (gfsh != null) {
+ gfsh.clearEvents();
+ gfsh.executeCommand("exit");
+ gfsh.terminate();
+ gfsh = null;
+ }
+ }
+
+ public HeadlessGfsh getGfsh() {
+ return gfsh;
+ }
+
+ public CommandResult getResult() {
+ return result;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JMXConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JMXConnectionConfiguration.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JMXConnectionConfiguration.java
index 9dca55e..d61a7c5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JMXConnectionConfiguration.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JMXConnectionConfiguration.java
@@ -29,6 +29,5 @@ import java.lang.annotation.Target;
@Target({ElementType.METHOD})
public @interface JMXConnectionConfiguration {
String user();
-
String password();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
index 872c611..1dd865f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
@@ -25,7 +25,8 @@ import java.util.Properties;
public class JsonAuthorizationCacheStartRule extends ExternalResource {
private Cache cache;
- private int jmxManagerPort;
+ private int jmxManagerPort = 0;
+ private int httpPort = 0;
private String jsonFile;
private boolean doAuthorization;
@@ -35,6 +36,13 @@ public class JsonAuthorizationCacheStartRule extends ExternalResource {
this.doAuthorization = true;
}
+ public JsonAuthorizationCacheStartRule(int jmxManagerPort, int httpPort, String jsonFile) {
+ this.jmxManagerPort = jmxManagerPort;
+ this.httpPort = httpPort;
+ this.jsonFile = jsonFile;
+ this.doAuthorization = true;
+ }
+
public JsonAuthorizationCacheStartRule(int jmxManagerPort, String jsonFile, boolean doAuthorization) {
this.jmxManagerPort = jmxManagerPort;
this.jsonFile = jsonFile;
@@ -49,7 +57,7 @@ public class JsonAuthorizationCacheStartRule extends ExternalResource {
properties.put(DistributionConfig.JMX_MANAGER_NAME, "true");
properties.put(DistributionConfig.JMX_MANAGER_START_NAME, "true");
properties.put(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(jmxManagerPort));
- properties.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, "0");
+ properties.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(httpPort));
properties.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME,
JSONAuthorization.class.getName() + ".create");
if (doAuthorization) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 878d122..6abac09 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -95,10 +95,6 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase {
int port0 = 0;
int port1= 0;
- public ClientCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
public void waitForListClientMbean(){
final VM manager = Host.getHost(0).getVM(0);
@@ -776,7 +772,7 @@ public void waitForListClientMbean2(){
private void setupSystemForListClient() throws Exception {
disconnectAllFromDS();
final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(3);
- createDefaultSetup(getServerProperties());
+ setUpJmxManagerOnVm0ThenConnect(getServerProperties());
final VM server1 = Host.getHost(0).getVM(1);
final VM client1 = Host.getHost(0).getVM(2);
@@ -795,7 +791,7 @@ public void waitForListClientMbean2(){
private void setupSystem() throws Exception {
disconnectAllFromDS();
final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(2);
- createDefaultSetup(getServerProperties());
+ setUpJmxManagerOnVm0ThenConnect(getServerProperties());
final VM manager = Host.getHost(0).getVM(0);
final VM server1 = Host.getHost(0).getVM(1);
@@ -830,7 +826,7 @@ public void waitForListClientMbean2(){
private void setupSystem2() throws Exception {
disconnectAllFromDS();
final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(3);
- createDefaultSetup(getServerProperties());
+ setUpJmxManagerOnVm0ThenConnect(getServerProperties());
final VM manager = Host.getHost(0).getVM(0);
final VM server1 = Host.getHost(0).getVM(1);
@@ -864,7 +860,7 @@ public void waitForListClientMbean2(){
private void setupSystem3() throws Exception {
disconnectAllFromDS();
final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(3);
- createDefaultSetup(getServerProperties());
+ setUpJmxManagerOnVm0ThenConnect(getServerProperties());
final VM manager = Host.getHost(0).getVM(0);
final VM server1 = Host.getHost(0).getVM(1);
@@ -1319,7 +1315,7 @@ void executeAndVerifyResultsForMixedClients(String commandString, String serverN
private void setUpNonSubscribedClient() throws Exception {
disconnectAllFromDS();
final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(2);
- createDefaultSetup(getServerProperties());
+ setUpJmxManagerOnVm0ThenConnect(getServerProperties());
final VM manager = Host.getHost(0).getVM(0);
final VM server1 = Host.getHost(0).getVM(1);
@@ -1356,7 +1352,7 @@ private void setUpNonSubscribedClient() throws Exception {
String[] cliendIds = new String[2];
disconnectAllFromDS();
final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(3);
- createDefaultSetup(getServerProperties());
+ setUpJmxManagerOnVm0ThenConnect(getServerProperties());
final VM manager = Host.getHost(0).getVM(0);
final VM server1 = Host.getHost(0).getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index e3d8731..ecf9975 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -66,10 +66,6 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
final String cq3 = "cq3";
final String clientName = "dc1";
- public DurableClientCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
@Test
public void testListDurableClientCqs() throws Exception {
setupSystem();
@@ -253,7 +249,7 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
private void setupSystem() throws Exception {
disconnectAllFromDS();
final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(2);
- createDefaultSetup(getServerProperties());
+ setUpJmxManagerOnVm0ThenConnect(getServerProperties());
final VM manager = Host.getHost(0).getVM(0);
final VM server1 = Host.getHost(0).getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index 1d685ea..1ee5c33 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -69,10 +69,6 @@ public abstract class WANCommandTestBase extends CliCommandTestBase {
static VM vm6;
static VM vm7;
- public WANCommandTestBase(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
@Override
public final void postSetUp() throws Exception {
final Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index a7f1e04..2bd8ee7 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -44,10 +44,6 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
private static final long serialVersionUID = 1L;
- public WanCommandCreateGatewayReceiverDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
/**
* GatewayReceiver with all default attributes
*/
@@ -61,7 +57,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -124,7 +120,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -181,7 +177,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -242,7 +238,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -306,7 +302,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -355,7 +351,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -411,7 +407,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -470,7 +466,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -529,7 +525,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -585,7 +581,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
index 622abc5..ab9d567 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
@@ -42,10 +42,6 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
private static final long serialVersionUID = 1L;
- public WanCommandCreateGatewaySenderDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
private CommandResult executeCommandWithIgnoredExceptions(String command) {
final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect");
try {
@@ -69,7 +65,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -118,7 +114,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -190,7 +186,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -246,7 +242,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -321,7 +317,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -394,7 +390,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -459,7 +455,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -524,7 +520,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -586,7 +582,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -656,7 +652,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+ "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
index a0d907c..cf1010f 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
@@ -40,10 +40,6 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
private static final long serialVersionUID = 1L;
- public WanCommandGatewayReceiverStartDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
/**
* Test wan commands for error in input 1> start gateway-sender command needs
* only one of member or group.
@@ -57,7 +53,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -90,7 +86,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -136,7 +132,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -182,7 +178,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -233,7 +229,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
index b4fa91b..522c8aa 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
@@ -40,10 +40,6 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
private static final long serialVersionUID = 1L;
- public WanCommandGatewayReceiverStopDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
/**
* Test wan commands for error in input 1> start gateway-sender command needs
* only one of member or group.
@@ -57,7 +53,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -91,7 +87,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -139,7 +135,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -186,7 +182,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -238,7 +234,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
index 5d6aea9..ccea2a3 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
@@ -39,10 +39,6 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
private static final long serialVersionUID = 1L;
- public WanCommandGatewaySenderStartDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
/**
* Test wan commands for error in input 1> start gateway-sender command needs
* only one of member or group.
@@ -56,7 +52,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -101,7 +97,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -162,7 +158,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -206,7 +202,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -272,7 +268,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -353,7 +349,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
index a5787c8..73f15b9 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
@@ -39,10 +39,6 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
private static final long serialVersionUID = 1L;
- public WanCommandGatewaySenderStopDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
private CommandResult executeCommandWithIgnoredExceptions(String command) {
final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect");
CommandResult commandResult = executeCommand(command);
@@ -59,7 +55,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -94,7 +90,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -160,7 +156,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -206,7 +202,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -278,7 +274,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index 8be2d78..79ad8a8 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -39,10 +39,6 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
private static final long serialVersionUID = 1L;
- public WanCommandListDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
@Test
public void testListGatewayWithNoSenderReceiver() {
@@ -52,7 +48,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -81,7 +77,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -134,7 +130,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
@@ -184,7 +180,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
@@ -246,7 +242,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index 500e7ef..8462a37 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -38,10 +38,6 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
private static final long serialVersionUID = 1L;
- public WanCommandPauseResumeDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
@Test
public void testPauseGatewaySender_ErrorConditions() {
@@ -51,7 +47,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -90,7 +86,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -132,7 +128,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -198,7 +194,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -269,7 +265,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -353,7 +349,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -389,7 +385,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -466,7 +462,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -517,7 +513,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
@@ -598,7 +594,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
index d2e295e..fb18256 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
@@ -39,10 +39,6 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
private static final long serialVersionUID = 1L;
- public WanCommandStatusDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
@Test
public void testGatewaySenderStatus(){
@@ -51,7 +47,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
@@ -141,7 +137,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
@@ -242,7 +238,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
@@ -336,7 +332,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
@@ -413,7 +409,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
@@ -487,7 +483,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
- createDefaultSetup(props);
+ setUpJmxManagerOnVm0ThenConnect(props);
Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2322827b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
index f67f22a..5f9674e 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -106,10 +106,6 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
- public ClusterConfigurationDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
- super(useHttpOnConnect, jsonAuthorization);
- }
-
@Test
public void testConfigDistribution() throws IOException {
IgnoredException.addIgnoredException("could not get remote locator");