geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [11/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
Date Fri, 29 Apr 2016 19:23:21 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/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 5edd3d2..a0d907c 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
@@ -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;
@@ -35,12 +25,25 @@ import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.VM;
 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 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.
@@ -49,18 +52,18 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
   public void testStartGatewayReceiver_ErrorConditions() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createReceiver( punePort ));
+    vm3.invoke(() -> createReceiver( punePort ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
 
     String command = CliStrings.START_GATEWAYRECEIVER + " --"
         + CliStrings.START_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId() + " --"
@@ -82,22 +85,22 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
   public void testStartGatewayReceiver() {
     
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createReceiver( punePort ));
-    vm4.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
-    vm5.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
+    vm3.invoke(() -> createReceiver( punePort ));
+    vm4.invoke(() -> createReceiver( punePort ));
+    vm5.invoke(() -> createReceiver( punePort ));
     
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm3.invoke(() -> verifyReceiverState( false ));
+    vm4.invoke(() -> verifyReceiverState( false ));
+    vm5.invoke(() -> verifyReceiverState( false ));
     
     pause(10000);
     String command = CliStrings.START_GATEWAYRECEIVER;
@@ -115,9 +118,9 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
       fail("testStartGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm3.invoke(() -> verifyReceiverState( true ));
+    vm4.invoke(() -> verifyReceiverState( true ));
+    vm5.invoke(() -> verifyReceiverState( true ));
   }
 
   /**
@@ -128,24 +131,24 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
   public void testStartGatewayReceiver_onMember() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createReceiver( punePort ));
-    vm4.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
-    vm5.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
+    vm3.invoke(() -> createReceiver( punePort ));
+    vm4.invoke(() -> createReceiver( punePort ));
+    vm5.invoke(() -> createReceiver( punePort ));
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm3.invoke(() -> verifyReceiverState( false ));
+    vm4.invoke(() -> verifyReceiverState( false ));
+    vm5.invoke(() -> verifyReceiverState( false ));
     
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
     pause(10000);
     String command = CliStrings.START_GATEWAYRECEIVER + " --"
         + CliStrings.START_GATEWAYRECEIVER__MEMBER+ "=" + vm1Member.getId();
@@ -161,9 +164,9 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
       fail("testStartGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm3.invoke(() -> verifyReceiverState( true ));
+    vm4.invoke(() -> verifyReceiverState( false ));
+    vm5.invoke(() -> verifyReceiverState( false ));
   }
 
   /**
@@ -174,22 +177,22 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
   public void testStartGatewayReceiver_Group() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createReceiverWithGroup( punePort, "RG1" ));
-    vm4.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1" ));
-    vm5.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1" ));
+    vm3.invoke(() -> createReceiverWithGroup( punePort, "RG1" ));
+    vm4.invoke(() -> createReceiverWithGroup( punePort, "RG1" ));
+    vm5.invoke(() -> createReceiverWithGroup( punePort, "RG1" ));
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm3.invoke(() -> verifyReceiverState( false ));
+    vm4.invoke(() -> verifyReceiverState( false ));
+    vm5.invoke(() -> verifyReceiverState( false ));
     
     pause(10000);
     String command = CliStrings.START_GATEWAYRECEIVER + " --"
@@ -211,9 +214,9 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
       fail("testStartGatewayReceiver_Group failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm3.invoke(() -> verifyReceiverState( true ));
+    vm4.invoke(() -> verifyReceiverState( true ));
+    vm5.invoke(() -> verifyReceiverState( true ));
   }
 
   /**
@@ -225,26 +228,26 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
   public void testStartGatewayReceiver_MultipleGroup() {
     
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createReceiverWithGroup( punePort, "RG1" ));
-    vm4.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1" ));
-    vm5.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1, RG2" ));
-    vm6.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1, RG2" ));
-    vm7.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG3" ));
+    vm3.invoke(() -> createReceiverWithGroup( punePort, "RG1" ));
+    vm4.invoke(() -> createReceiverWithGroup( punePort, "RG1" ));
+    vm5.invoke(() -> createReceiverWithGroup( punePort, "RG1, RG2" ));
+    vm6.invoke(() -> createReceiverWithGroup( punePort, "RG1, RG2" ));
+    vm7.invoke(() -> createReceiverWithGroup( punePort, "RG3" ));
     
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm6.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm7.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm3.invoke(() -> verifyReceiverState( false ));
+    vm4.invoke(() -> verifyReceiverState( false ));
+    vm5.invoke(() -> verifyReceiverState( false ));
+    vm6.invoke(() -> verifyReceiverState( false ));
+    vm7.invoke(() -> verifyReceiverState( false ));
 
     pause(10000);
     String command = CliStrings.START_GATEWAYRECEIVER + " --"
@@ -266,11 +269,11 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
       fail("testStartGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm6.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm7.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm3.invoke(() -> verifyReceiverState( true ));
+    vm4.invoke(() -> verifyReceiverState( true));
+    vm5.invoke(() -> verifyReceiverState( true ));
+    vm6.invoke(() -> verifyReceiverState( true ));
+    vm7.invoke(() -> verifyReceiverState( false ));
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/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 d7bb6c3..b4fa91b 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
@@ -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;
@@ -35,12 +25,25 @@ import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.VM;
 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 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.
@@ -49,18 +52,18 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
   public void testStopGatewayReceiver_ErrorConditions() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createReceiver( punePort ));
+    vm3.invoke(() -> createReceiver( punePort ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
 
     String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
         + CliStrings.STOP_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId()
@@ -83,22 +86,22 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
   public void testStopGatewayReceiver() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createAndStartReceiver( punePort ));
-    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
-    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
+    vm3.invoke(() -> createAndStartReceiver( punePort ));
+    vm4.invoke(() -> createAndStartReceiver( punePort ));
+    vm5.invoke(() -> createAndStartReceiver( punePort ));
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm3.invoke(() -> verifyReceiverState( true ));
+    vm4.invoke(() -> verifyReceiverState( true ));
+    vm5.invoke(() -> verifyReceiverState( true ));
 
     pause(10000);
     String command = CliStrings.STOP_GATEWAYRECEIVER;
@@ -118,9 +121,9 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
       fail("testStopGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm3.invoke(() -> verifyReceiverState( false ));
+    vm4.invoke(() -> verifyReceiverState( false ));
+    vm5.invoke(() -> verifyReceiverState( false ));
   }
 
   /**
@@ -131,24 +134,24 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
   public void testStopGatewayReceiver_onMember() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createAndStartReceiver( punePort ));
-    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
-    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
+    vm3.invoke(() -> createAndStartReceiver( punePort ));
+    vm4.invoke(() -> createAndStartReceiver( punePort ));
+    vm5.invoke(() -> createAndStartReceiver( punePort ));
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm3.invoke(() -> verifyReceiverState( true ));
+    vm4.invoke(() -> verifyReceiverState( true ));
+    vm5.invoke(() -> verifyReceiverState( true ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
     pause(10000);
     String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
         + CliStrings.STOP_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId();
@@ -165,9 +168,9 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
       fail("testStopGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm3.invoke(() -> verifyReceiverState( false ));
+    vm4.invoke(() -> verifyReceiverState( true ));
+    vm5.invoke(() -> verifyReceiverState( true ));
   }
 
   /**
@@ -178,22 +181,22 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
   public void testStopGatewayReceiver_Group() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createAndStartReceiverWithGroup( punePort, "RG1" ));
-    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
-    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm3.invoke(() -> createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm4.invoke(() -> createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm5.invoke(() -> createAndStartReceiverWithGroup( punePort, "RG1" ));
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm3.invoke(() -> verifyReceiverState( true ));
+    vm4.invoke(() -> verifyReceiverState( true ));
+    vm5.invoke(() -> verifyReceiverState( true ));
 
     pause(10000);
     String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
@@ -216,9 +219,9 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
       fail("testStopGatewayReceiver_Group failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm3.invoke(() -> verifyReceiverState( false ));
+    vm4.invoke(() -> verifyReceiverState( false ));
+    vm5.invoke(() -> verifyReceiverState( false ));
   }
 
   /**
@@ -230,26 +233,26 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
   public void testStopGatewayReceiver_MultipleGroup() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
+    int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
 
     Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     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.createAndStartReceiverWithGroup( punePort, "RG1" ));
-    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
-    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
-    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1, RG2" ));
-    vm7.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG3" ));
+    vm3.invoke(() -> createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm4.invoke(() -> createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm5.invoke(() -> createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm6.invoke(() -> createAndStartReceiverWithGroup( punePort, "RG1, RG2" ));
+    vm7.invoke(() -> createAndStartReceiverWithGroup( punePort, "RG3" ));
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm6.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
-    vm7.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm3.invoke(() -> verifyReceiverState( true ));
+    vm4.invoke(() -> verifyReceiverState( true ));
+    vm5.invoke(() -> verifyReceiverState( true ));
+    vm6.invoke(() -> verifyReceiverState( true ));
+    vm7.invoke(() -> verifyReceiverState( true ));
 
     pause(10000);
     String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
@@ -272,10 +275,10 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
       fail("testStopGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm6.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
-    vm7.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm3.invoke(() -> verifyReceiverState( false ));
+    vm4.invoke(() -> verifyReceiverState( false ));
+    vm5.invoke(() -> verifyReceiverState( false ));
+    vm6.invoke(() -> verifyReceiverState( false ));
+    vm7.invoke(() -> verifyReceiverState( 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/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 ecc6cec..5d6aea9 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
@@ -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,12 +24,25 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
 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 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.
@@ -47,7 +50,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
   @Test
   public void testStartGatewaySender_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");
@@ -55,13 +58,13 @@ public class WanCommandGatewaySenderStartDUnitTest 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.START_GATEWAYSENDER + " --"
         + CliStrings.START_GATEWAYSENDER__ID + "=ln --"
@@ -92,7 +95,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
   @Test
   public void testStartGatewaySender() {
 
-    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");
@@ -100,23 +103,23 @@ public class WanCommandGatewaySenderStartDUnitTest 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.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm4.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm5.invoke(() -> verifySenderState(
         "ln", false, false ));
 
     pause(10000);
@@ -138,11 +141,11 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
       fail("testStartGatewaySender 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 ));
   }
 
@@ -153,7 +156,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
   @Test
   public void testStartGatewaySender_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");
@@ -161,16 +164,16 @@ public class WanCommandGatewaySenderStartDUnitTest 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.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
     pause(10000);
     String command = CliStrings.START_GATEWAYSENDER + " --"
         + CliStrings.START_GATEWAYSENDER__ID + "=ln --"
@@ -186,7 +189,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
       fail("testStartGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", true, false ));
   }
 
@@ -197,7 +200,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
   @Test
   public void testStartGatewaySender_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");
@@ -205,26 +208,26 @@ public class WanCommandGatewaySenderStartDUnitTest 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.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm4.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm5.invoke(() -> verifySenderState(
         "ln", false, false ));
 
     pause(10000);
@@ -248,11 +251,11 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
       fail("testStartGatewaySender 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 ));
   }
 
@@ -263,7 +266,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
   @Test
   public void testStartGatewaySender_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");
@@ -271,38 +274,38 @@ public class WanCommandGatewaySenderStartDUnitTest 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, "SenderGroup1, 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.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm4.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm5.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm6.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm7.invoke(() -> verifySenderState(
         "ln", false, false ));
 
     pause(10000);
@@ -325,15 +328,15 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
       fail("testStartGatewaySender 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", false, false ));
   }
 
@@ -344,7 +347,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
   @Test
   public void testStartGatewaySender_Group_MissingSenderFromGroup() {
 
-    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,22 +355,22 @@ public class WanCommandGatewaySenderStartDUnitTest 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" ));
-    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.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm5.invoke(() -> verifySenderState(
         "ln", false, false ));
 
     pause(10000);
@@ -392,9 +395,9 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
       fail("testStartGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", true, false ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm5.invoke(() -> verifySenderState(
         "ln", true, false ));
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/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 a90b984..a5787c8 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
@@ -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,12 +24,25 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
 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 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);
@@ -50,7 +53,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
   @Test
   public void testStopGatewaySender_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");
@@ -58,13 +61,13 @@ public class WanCommandGatewaySenderStopDUnitTest 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.STOP_GATEWAYSENDER + " --"
         + CliStrings.STOP_GATEWAYSENDER__ID + "=ln --"
@@ -85,7 +88,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
   @Test
   public void testStopGatewaySender() {
 
-    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");
@@ -93,27 +96,27 @@ public class WanCommandGatewaySenderStopDUnitTest 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);
@@ -136,11 +139,11 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
       fail("testStopGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm4.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm5.invoke(() -> verifySenderState(
         "ln", false, false ));
   }
 
@@ -151,7 +154,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
   @Test
   public void testStopGatewaySender_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");
@@ -159,18 +162,18 @@ public class WanCommandGatewaySenderStopDUnitTest 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.STOP_GATEWAYSENDER + " --"
         + CliStrings.STOP_GATEWAYSENDER__ID + "=ln --"
@@ -186,7 +189,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
       fail("testStopGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
   }
 
@@ -197,7 +200,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
   @Test
   public void testStopGatewaySender_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");
@@ -205,30 +208,30 @@ public class WanCommandGatewaySenderStopDUnitTest 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);
@@ -254,11 +257,11 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
       fail("testStopGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm4.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm5.invoke(() -> verifySenderState(
         "ln", false, false ));
   }
 
@@ -269,7 +272,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
   @Test
   public void testStopGatewaySender_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");
@@ -277,44 +280,44 @@ public class WanCommandGatewaySenderStopDUnitTest 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);
@@ -339,15 +342,15 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
       fail("testStopGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm4.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm5.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm6.invoke(() -> verifySenderState(
         "ln", false, false ));
-    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm7.invoke(() -> verifySenderState(
         "ln", true, false ));
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/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 bcab986..8be2d78 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
@@ -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.internal.DistributionConfig;
 import com.gemstone.gemfire.management.cli.Result;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
@@ -34,16 +24,29 @@ 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 WanCommandListDUnitTest extends WANCommandTestBase {
 
   private static final long serialVersionUID = 1L;
 
+  public WanCommandListDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   @Test
   public void testListGatewayWithNoSenderReceiver() {
 
-    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");
@@ -51,11 +54,11 @@ public class WanCommandListDUnitTest 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 ));
-    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
-    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> createCache( punePort ));
+    vm4.invoke(() -> createCache( punePort ));
+    vm5.invoke(() -> createCache( punePort ));
     
     pause(10000);
     String command = CliStrings.LIST_GATEWAY;
@@ -72,7 +75,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
   @Test
   public void testListGatewaySender() {
 
-    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");
@@ -80,25 +83,25 @@ public class WanCommandListDUnitTest 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 ));
 
-    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
-    vm7.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
+    vm6.invoke(() -> createAndStartReceiver( nyPort ));
+    vm7.invoke(() -> createAndStartReceiver( nyPort ));
 
-    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
-    vm3.invoke(() -> WANCommandTestBase.createSender(
+    vm3.invoke(() -> createCache( punePort ));
+    vm3.invoke(() -> createSender(
         "ln_Serial", 2, false, 100, 400, false, false, null, false ));
-    vm3.invoke(() -> WANCommandTestBase.createSender(
+    vm3.invoke(() -> createSender(
         "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
 
-    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
-    vm4.invoke(() -> WANCommandTestBase.createSender(
+    vm4.invoke(() -> createCache( punePort ));
+    vm4.invoke(() -> createSender(
         "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
-    vm4.invoke(() -> WANCommandTestBase.createSender(
+    vm4.invoke(() -> createSender(
         "ln_Serial", 2, false, 100, 400, false, false, null, false ));
 
-    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
-    vm5.invoke(() -> WANCommandTestBase.createSender(
+    vm5.invoke(() -> createCache( punePort ));
+    vm5.invoke(() -> createSender(
         "ln_Serial", 2, false, 100, 400, false, false, null, false ));
 
     pause(10000);
@@ -125,7 +128,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
   @Test
   public void testListGatewayReceiver() {
 
-    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");
@@ -133,20 +136,20 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
     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 ));
 
-    vm3.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
-    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
+    vm3.invoke(() -> createAndStartReceiver( lnPort ));
+    vm4.invoke(() -> createAndStartReceiver( lnPort ));
 
     vm5
-        .invoke(() -> WANCommandTestBase.createCache( nyPort ));
-    vm5.invoke(() -> WANCommandTestBase.createSender(
+        .invoke(() -> createCache( nyPort ));
+    vm5.invoke(() -> createSender(
         "ln_Serial", 1, false, 100, 400, false, false, null, false ));
     vm6
-        .invoke(() -> WANCommandTestBase.createCache( nyPort ));
-    vm6.invoke(() -> WANCommandTestBase.createSender(
+        .invoke(() -> createCache( nyPort ));
+    vm6.invoke(() -> createSender(
         "ln_Serial", 1, false, 100, 400, false, false, null, false ));
-    vm6.invoke(() -> WANCommandTestBase.createSender(
+    vm6.invoke(() -> createSender(
         "ln_Parallel", 1, true, 100, 400, false, false, null, false ));
 
     pause(10000);
@@ -175,7 +178,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
   @Test
   public void testListGatewaySenderGatewayReceiver() throws GfJsonException {
 
-    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");
@@ -183,28 +186,28 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
     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, false ));
-    vm3.invoke(() -> WANCommandTestBase.createSender(
+    vm3.invoke(() -> createSender(
         "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
 
-    vm4.invoke(() -> WANCommandTestBase.createCache( lnPort ));
-    vm4.invoke(() -> WANCommandTestBase.createSender(
+    vm4.invoke(() -> createCache( lnPort ));
+    vm4.invoke(() -> createSender(
         "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
-    vm4.invoke(() -> WANCommandTestBase.createSender(
+    vm4.invoke(() -> createSender(
         "ln_Serial", 2, false, 100, 400, false, false, null, false ));
 
-    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
+    vm5.invoke(() -> createAndStartReceiver( lnPort ));
 
-    vm7.invoke(() -> WANCommandTestBase.createCache( nyPort ));
-    vm7.invoke(() -> WANCommandTestBase.createSender(
+    vm7.invoke(() -> createCache( nyPort ));
+    vm7.invoke(() -> createSender(
         "ln_Serial", 1, false, 100, 400, false, false, null, false ));
-    vm7.invoke(() -> WANCommandTestBase.createSender(
+    vm7.invoke(() -> createSender(
         "ln_Parallel", 1, true, 100, 400, false, false, null, false ));
 
     pause(10000);
@@ -237,7 +240,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
   @Test
   public void testListGatewaySenderGatewayReceiver_group() {
 
-    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");
@@ -245,31 +248,31 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
     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.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, false ));
-    vm3.invoke(() -> WANCommandTestBase.createSender(
+    vm3.invoke(() -> createSender(
         "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
 
-    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_Parallel", 2, true, 100, 400, false, false, null, false ));
-    vm4.invoke(() -> WANCommandTestBase.createSender(
+    vm4.invoke(() -> createSender(
         "ln_Serial", 2, false, 100, 400, false, false, null, false ));
 
-    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "Paralle_Sender,Receiver_Group" ));
-    vm5.invoke(() -> WANCommandTestBase.createSender(
+    vm5.invoke(() -> createAndStartReceiverWithGroup( lnPort, "Paralle_Sender,Receiver_Group" ));
+    vm5.invoke(() -> createSender(
       "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
     
 
-    vm7.invoke(() -> WANCommandTestBase.createCache( nyPort ));
-    vm7.invoke(() -> WANCommandTestBase.createSender(
+    vm7.invoke(() -> createCache( nyPort ));
+    vm7.invoke(() -> createSender(
         "ln_Serial", 1, false, 100, 400, false, false, null, false ));
-    vm7.invoke(() -> WANCommandTestBase.createSender(
+    vm7.invoke(() -> createSender(
         "ln_Parallel", 1, true, 100, 400, false, false, null, false ));
 
     pause(10000);


Mime
View raw message