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:20 UTC
[10/50] [abbrv] incubator-geode git commit: GEODE-17: refactor
CliCommandTestBase to use Parameterized Junit runs to do all combinations of
http/non-http and security/non-security runs
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/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 b54b27f..500e7ef 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
@@ -16,16 +16,6 @@
*/
package com.gemstone.gemfire.internal.cache.wan.wancommand;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.management.cli.Result;
@@ -33,16 +23,29 @@ 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.result.TabularResultData;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.List;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.pause;
@Category(DistributedTest.class)
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() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -50,13 +53,13 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createCache( punePort ));
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+ final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
+ CliStrings.PAUSE_GATEWAYSENDER__ID + "=ln --"
@@ -81,7 +84,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testPauseGatewaySender_onMember() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -89,18 +92,18 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createCache( punePort ));
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+ vm3.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+ final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
+ CliStrings.PAUSE_GATEWAYSENDER__ID + "=ln --"
@@ -116,14 +119,14 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testPauseGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
}
@Test
public void testPauseGatewaySender() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -131,27 +134,27 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createCache( punePort ));
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm4.invoke(() -> createCache( punePort ));
+ vm4.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm5.invoke(() -> createCache( punePort ));
+ vm5.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+ vm3.invoke(() -> startSender( "ln" ));
+ vm4.invoke(() -> startSender( "ln" ));
+ vm5.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
pause(10000);
@@ -174,11 +177,11 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testPauseGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, true ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, true ));
}
@@ -189,7 +192,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testPauseGatewaySender_Group() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -197,30 +200,30 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm3.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm4.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm4.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm5.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm5.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+ vm3.invoke(() -> startSender( "ln" ));
+ vm4.invoke(() -> startSender( "ln" ));
+ vm5.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
pause(10000);
@@ -245,11 +248,11 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testPauseGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, true ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, true ));
}
@@ -260,7 +263,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testPauseGatewaySender_MultipleGroup() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -268,44 +271,44 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm3.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm4.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm4.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm5.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1, SenderGroup2" ));
- vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm5.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm6.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm6.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup2" ));
- vm6.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm6.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm7.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm7.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup3" ));
- vm7.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm7.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm6.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm7.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+ vm3.invoke(() -> startSender( "ln" ));
+ vm4.invoke(() -> startSender( "ln" ));
+ vm5.invoke(() -> startSender( "ln" ));
+ vm6.invoke(() -> startSender( "ln" ));
+ vm7.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
- vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm6.invoke(() -> verifySenderState(
"ln", true, false ));
- vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm7.invoke(() -> verifySenderState(
"ln", true, false ));
pause(10000);
@@ -329,22 +332,22 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testPauseGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, true ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, true ));
- vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm6.invoke(() -> verifySenderState(
"ln", true, true ));
- vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm7.invoke(() -> verifySenderState(
"ln", true, false ));
}
@Test
public void testResumeGatewaySender_ErrorConditions() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -352,13 +355,13 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createCache( punePort ));
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+ final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
String command = CliStrings.RESUME_GATEWAYSENDER + " --"
+ CliStrings.RESUME_GATEWAYSENDER__ID + "=ln --"
@@ -380,7 +383,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testResumeGatewaySender() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -388,38 +391,38 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createCache( punePort ));
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm4.invoke(() -> createCache( punePort ));
+ vm4.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm5.invoke(() -> createCache( punePort ));
+ vm5.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+ vm3.invoke(() -> startSender( "ln" ));
+ vm4.invoke(() -> startSender( "ln" ));
+ vm5.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
- vm3.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
- vm4.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
- vm5.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+ vm3.invoke(() -> pauseSender( "ln" ));
+ vm4.invoke(() -> pauseSender( "ln" ));
+ vm5.invoke(() -> pauseSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, true ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, true ));
pause(10000);
@@ -442,11 +445,11 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testResumeGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
}
@@ -457,7 +460,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testResumeGatewaySender_onMember() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -465,23 +468,23 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createCache( punePort ));
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+ vm3.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm3.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+ vm3.invoke(() -> pauseSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+ final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.RESUME_GATEWAYSENDER + " --"
+ CliStrings.RESUME_GATEWAYSENDER__ID + "=ln --"
@@ -497,7 +500,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testResumeGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
}
@@ -508,7 +511,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testResumeGatewaySender_Group() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -516,41 +519,41 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm3.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm4.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm4.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm5.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm5.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+ vm3.invoke(() -> startSender( "ln" ));
+ vm4.invoke(() -> startSender( "ln" ));
+ vm5.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
- vm3.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
- vm4.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
- vm5.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+ vm3.invoke(() -> pauseSender( "ln" ));
+ vm4.invoke(() -> pauseSender( "ln" ));
+ vm5.invoke(() -> pauseSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, true ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, true ));
pause(10000);
@@ -574,11 +577,11 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testResumeGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
}
@@ -589,7 +592,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testResumeGatewaySender_MultipleGroup() {
- Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -597,61 +600,61 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
- vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm3.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm3.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm4.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1" ));
- vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm4.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm5.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup1, SenderGroup2" ));
- vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm5.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm6.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm6.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup2" ));
- vm6.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm6.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm7.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+ vm7.invoke(() -> createCacheWithGroups(
punePort, "SenderGroup3" ));
- vm7.invoke(() -> WANCommandTestBase.createSender( "ln",
+ vm7.invoke(() -> createSender( "ln",
2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm6.invoke(() -> WANCommandTestBase.startSender( "ln" ));
- vm7.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+ vm3.invoke(() -> startSender( "ln" ));
+ vm4.invoke(() -> startSender( "ln" ));
+ vm5.invoke(() -> startSender( "ln" ));
+ vm6.invoke(() -> startSender( "ln" ));
+ vm7.invoke(() -> startSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
- vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm6.invoke(() -> verifySenderState(
"ln", true, false ));
- vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm7.invoke(() -> verifySenderState(
"ln", true, false ));
- vm3.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
- vm4.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
- vm5.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
- vm6.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
- vm7.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+ vm3.invoke(() -> pauseSender( "ln" ));
+ vm4.invoke(() -> pauseSender( "ln" ));
+ vm5.invoke(() -> pauseSender( "ln" ));
+ vm6.invoke(() -> pauseSender( "ln" ));
+ vm7.invoke(() -> pauseSender( "ln" ));
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, true ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, true ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, true ));
- vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm6.invoke(() -> verifySenderState(
"ln", true, true ));
- vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm7.invoke(() -> verifySenderState(
"ln", true, true ));
pause(10000);
@@ -675,15 +678,15 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
fail("testResumeGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm3.invoke(() -> verifySenderState(
"ln", true, false ));
- vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm4.invoke(() -> verifySenderState(
"ln", true, false ));
- vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm5.invoke(() -> verifySenderState(
"ln", true, false ));
- vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm6.invoke(() -> verifySenderState(
"ln", true, false ));
- vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+ vm7.invoke(() -> verifySenderState(
"ln", true, true ));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/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 7293963..d2e295e 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
@@ -16,16 +16,6 @@
*/
package com.gemstone.gemfire.internal.cache.wan.wancommand;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.management.cli.Result;
@@ -34,42 +24,55 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData;
import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.List;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.pause;
@Category(DistributedTest.class)
public class WanCommandStatusDUnitTest extends WANCommandTestBase{
private static final long serialVersionUID = 1L;
+ public WanCommandStatusDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
@Test
public void testGatewaySenderStatus(){
- Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
- vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
+ vm6.invoke(() -> createAndStartReceiver( nyPort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( lnPort ));
- vm3.invoke(() -> WANCommandTestBase.createSender(
+ vm3.invoke(() -> createCache( lnPort ));
+ vm3.invoke(() -> createSender(
"ln_Serial", 2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.createSender(
+ vm3.invoke(() -> createSender(
"ln_Parallel", 2, true, 100, 400, false, false, null, true));
- vm4.invoke(() -> WANCommandTestBase.createCache( lnPort ));
- vm4.invoke(() -> WANCommandTestBase.createSender(
+ vm4.invoke(() -> createCache( lnPort ));
+ vm4.invoke(() -> createSender(
"ln_Serial", 2, false, 100, 400, false, false, null, true));
- vm4.invoke(() -> WANCommandTestBase.createSender(
+ vm4.invoke(() -> createSender(
"ln_Parallel", 2, true, 100, 400, false, false, null, true));
- vm5.invoke(() -> WANCommandTestBase.createCache( lnPort ));
- vm5.invoke(() -> WANCommandTestBase.createSender(
+ vm5.invoke(() -> createCache( lnPort ));
+ vm5.invoke(() -> createSender(
"ln_Serial", 2, false, 100, 400, false, false, null, true));
- vm5.invoke(() -> WANCommandTestBase.createSender(
+ vm5.invoke(() -> createSender(
"ln_Parallel", 2, true, 100, 400, false, false, null, true));
pause(10000);
@@ -96,14 +99,14 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
fail("testListGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
+ vm3.invoke(() -> startSender( "ln_Serial" ));
+ vm3.invoke(() -> startSender( "ln_Parallel" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
+ vm4.invoke(() -> startSender( "ln_Serial" ));
+ vm4.invoke(() -> startSender( "ln_Parallel" ));
- vm5.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
- vm5.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
+ vm5.invoke(() -> startSender( "ln_Serial" ));
+ vm5.invoke(() -> startSender( "ln_Parallel" ));
pause(10000);
command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -133,32 +136,32 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
@Test
public void testGatewaySenderStatus_OnMember(){
- Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
- vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
+ vm6.invoke(() -> createAndStartReceiver( nyPort ));
- vm3.invoke(() -> WANCommandTestBase.createCache( lnPort ));
- vm3.invoke(() -> WANCommandTestBase.createSender(
+ vm3.invoke(() -> createCache( lnPort ));
+ vm3.invoke(() -> createSender(
"ln_Serial", 2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.createSender(
+ vm3.invoke(() -> createSender(
"ln_Parallel", 2, true, 100, 400, false, false, null, true));
- vm4.invoke(() -> WANCommandTestBase.createCache( lnPort ));
- vm4.invoke(() -> WANCommandTestBase.createSender(
+ vm4.invoke(() -> createCache( lnPort ));
+ vm4.invoke(() -> createSender(
"ln_Serial", 2, false, 100, 400, false, false, null, true));
- vm4.invoke(() -> WANCommandTestBase.createSender(
+ vm4.invoke(() -> createSender(
"ln_Parallel", 2, true, 100, 400, false, false, null, true));
- vm5.invoke(() -> WANCommandTestBase.createCache( lnPort ));
+ vm5.invoke(() -> createCache( lnPort ));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+ final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -181,11 +184,11 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
fail("testListGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
+ vm3.invoke(() -> startSender( "ln_Serial" ));
+ vm3.invoke(() -> startSender( "ln_Parallel" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
+ vm4.invoke(() -> startSender( "ln_Serial" ));
+ vm4.invoke(() -> startSender( "ln_Parallel" ));
pause(10000);
command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -212,7 +215,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
fail("testListGatewaySender failed as did not get CommandResult");
}
- final DistributedMember vm5Member = (DistributedMember) vm5.invoke(() -> WANCommandTestBase.getMember());
+ final DistributedMember vm5Member = (DistributedMember) vm5.invoke(() -> getMember());
command = CliStrings.STATUS_GATEWAYSENDER + " --"
+ CliStrings.STATUS_GATEWAYSENDER__ID + "=ln_Serial --"
@@ -234,38 +237,38 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
@Test
public void testGatewaySenderStatus_OnGroups(){
- Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
- vm7.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
+ vm7.invoke(() -> createAndStartReceiver( nyPort ));
- vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort, "Serial_Sender, Paralle_Sender"));
- vm3.invoke(() -> WANCommandTestBase.createSender(
+ vm3.invoke(() -> createCacheWithGroups( lnPort, "Serial_Sender, Paralle_Sender"));
+ vm3.invoke(() -> createSender(
"ln_Serial", 2, false, 100, 400, false, false, null, true ));
- vm3.invoke(() -> WANCommandTestBase.createSender(
+ vm3.invoke(() -> createSender(
"ln_Parallel", 2, true, 100, 400, false, false, null, true));
- vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort,"Serial_Sender, Paralle_Sender"));
- vm4.invoke(() -> WANCommandTestBase.createSender(
+ vm4.invoke(() -> createCacheWithGroups( lnPort,"Serial_Sender, Paralle_Sender"));
+ vm4.invoke(() -> createSender(
"ln_Serial", 2, false, 100, 400, false, false, null, true));
- vm4.invoke(() -> WANCommandTestBase.createSender(
+ vm4.invoke(() -> createSender(
"ln_Parallel", 2, true, 100, 400, false, false, null, true));
- vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort,"Paralle_Sender"));
- vm5.invoke(() -> WANCommandTestBase.createSender(
+ vm5.invoke(() -> createCacheWithGroups( lnPort,"Paralle_Sender"));
+ vm5.invoke(() -> createSender(
"ln_Serial", 2, false, 100, 400, false, false, null, true));
- vm5.invoke(() -> WANCommandTestBase.createSender(
+ vm5.invoke(() -> createSender(
"ln_Parallel", 2, true, 100, 400, false, false, null, true));
- vm6.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort,"Serial_Sender"));
+ vm6.invoke(() -> createCacheWithGroups( lnPort,"Serial_Sender"));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+ final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -293,11 +296,11 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
fail("testListGatewaySender failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
- vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
+ vm3.invoke(() -> startSender( "ln_Serial" ));
+ vm3.invoke(() -> startSender( "ln_Parallel" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
- vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
+ vm4.invoke(() -> startSender( "ln_Serial" ));
+ vm4.invoke(() -> startSender( "ln_Parallel" ));
pause(10000);
command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -328,20 +331,20 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
@Test
public void testGatewayReceiverStatus(){
- Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
- vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
+ vm6.invoke(() -> createAndStartReceiver( nyPort ));
- vm3.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
- vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
- vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
+ vm3.invoke(() -> createAndStartReceiver( lnPort ));
+ vm4.invoke(() -> createAndStartReceiver( lnPort ));
+ vm5.invoke(() -> createAndStartReceiver( lnPort ));
pause(10000);
String command = CliStrings.STATUS_GATEWAYRECEIVER;
@@ -370,9 +373,9 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
fail("testGatewayReceiverStatus failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.stopReceiver());
- vm4.invoke(() -> WANCommandTestBase.stopReceiver());
- vm5.invoke(() -> WANCommandTestBase.stopReceiver());
+ vm3.invoke(() -> stopReceiver());
+ vm4.invoke(() -> stopReceiver());
+ vm5.invoke(() -> stopReceiver());
pause(10000);
@@ -405,22 +408,22 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
@Test
public void testGatewayReceiverStatus_OnMember(){
- Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
- vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
+ vm6.invoke(() -> createAndStartReceiver( nyPort ));
- vm3.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
- vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
- vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
+ vm3.invoke(() -> createAndStartReceiver( lnPort ));
+ vm4.invoke(() -> createAndStartReceiver( lnPort ));
+ vm5.invoke(() -> createAndStartReceiver( lnPort ));
- final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+ final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.STATUS_GATEWAYRECEIVER+ " --"
@@ -445,9 +448,9 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
fail("testGatewayReceiverStatus failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.stopReceiver());
- vm4.invoke(() -> WANCommandTestBase.stopReceiver());
- vm5.invoke(() -> WANCommandTestBase.stopReceiver());
+ vm3.invoke(() -> stopReceiver());
+ vm4.invoke(() -> stopReceiver());
+ vm5.invoke(() -> stopReceiver());
pause(10000);
@@ -479,21 +482,21 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
@Test
public void testGatewayReceiverStatus_OnGroups(){
- Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 ));
Properties props = getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
createDefaultSetup(props);
- Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
+ Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort ));
- vm7.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
+ vm7.invoke(() -> createAndStartReceiver( nyPort ));
- vm3.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "RG1, RG2" ));
- vm4.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "RG1, RG2" ));
- vm5.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "RG1" ));
- vm6.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "RG2" ));
+ vm3.invoke(() -> createAndStartReceiverWithGroup( lnPort, "RG1, RG2" ));
+ vm4.invoke(() -> createAndStartReceiverWithGroup( lnPort, "RG1, RG2" ));
+ vm5.invoke(() -> createAndStartReceiverWithGroup( lnPort, "RG1" ));
+ vm6.invoke(() -> createAndStartReceiverWithGroup( lnPort, "RG2" ));
pause(10000);
String command = CliStrings.STATUS_GATEWAYRECEIVER + " --"
@@ -518,9 +521,9 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
fail("testGatewayReceiverStatus failed as did not get CommandResult");
}
- vm3.invoke(() -> WANCommandTestBase.stopReceiver());
- vm4.invoke(() -> WANCommandTestBase.stopReceiver());
- vm5.invoke(() -> WANCommandTestBase.stopReceiver());
+ vm3.invoke(() -> stopReceiver());
+ vm4.invoke(() -> stopReceiver());
+ vm5.invoke(() -> stopReceiver());
pause(10000);
command = CliStrings.STATUS_GATEWAYRECEIVER + " --"+ CliStrings.STATUS_GATEWAYRECEIVER__GROUP + "=RG1";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/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 4ff9a73..f67f22a 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
@@ -16,27 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.configuration;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
@@ -80,6 +59,26 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.apache.commons.io.FileUtils;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
@Category(DistributedTest.class)
public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
@@ -107,6 +106,10 @@ 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");