geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [12/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:22 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
index f5aa506..23ec0a1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
@@ -16,15 +16,6 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
-import java.io.File;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import com.gemstone.gemfire.distributed.AbstractLauncher.Status;
 import com.gemstone.gemfire.distributed.LocatorLauncher;
 import com.gemstone.gemfire.distributed.LocatorLauncher.LocatorState;
@@ -38,12 +29,24 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 
 @Category(DistributedTest.class)
 public class ShellCommandsDUnitTest extends CliCommandTestBase {
 
   private static final long serialVersionUID = 1L;
 
+  public ShellCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   @Override
   public final void postSetUp() throws Exception {
     getDefaultShell();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
index c17f7e7..f7c32bc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -16,19 +16,6 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-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.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Properties;
-import javax.management.ObjectName;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionFactory;
@@ -54,12 +41,29 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import javax.management.ObjectName;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
+import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
 
 @Category(DistributedTest.class)
 public class ShowMetricsDUnitTest extends CliCommandTestBase {
 
   private static final long serialVersionUID = 1L;
 
+  public ShowMetricsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   private void createLocalSetUp() {
     Properties localProps = new Properties();
     localProps.setProperty(DistributionConfig.NAME_NAME, "Controller");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
index 6a14a40..89a6a17 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
@@ -16,16 +16,6 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
-import java.io.File;
-import java.io.IOException;
-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.Status;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
@@ -35,6 +25,16 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 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.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertFalse;
+import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 
 /***
  * DUnit test for 'show stack-trace' command
@@ -44,6 +44,10 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
 
   private static final long serialVersionUID = 1L;
 
+  public ShowStackTraceDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   private void createCache(Properties props) {
     getSystem(props);
     getCache();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
index 3b4db25..a9d670d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
@@ -16,16 +16,6 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-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.internal.ClassBuilder;
 import com.gemstone.gemfire.internal.ClassPathLoader;
@@ -36,6 +26,15 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
 
 /**
  * Unit tests for configuring user commands.
@@ -52,6 +51,10 @@ public class UserCommandsDUnitTest extends CliCommandTestBase {
   final File jarFile = new File(this.jarDirectory, "UserCommandsDUnit.jar");
   boolean deleteJarDirectory = false;
 
+  public UserCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   @Override
   public final void postSetUp() throws Exception {
     createUserCommandJarFile();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 6fef000..878d122 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -16,23 +16,6 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.NetworkUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import javax.management.ObjectName;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheException;
@@ -78,6 +61,22 @@ import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import javax.management.ObjectName;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.NetworkUtils.getServerHostName;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
 
 /**
  * Dunit class for testing gemfire Client commands : list client , describe client 
@@ -95,7 +94,11 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase {
   String clientId = "";
   int port0 = 0;
   int port1= 0;
-  
+
+  public ClientCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   public void waitForListClientMbean(){
     
     final VM manager = Host.getHost(0).getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index b35538d..e3d8731 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -16,16 +16,6 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.NetworkUtils.*;
-
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.DataPolicy;
@@ -56,6 +46,15 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 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.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
+import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.NetworkUtils.getServerHostName;
 
 @Category(DistributedTest.class)
 public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
@@ -67,6 +66,10 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
   final String cq3 = "cq3";
   final String clientName = "dc1";
 
+  public DurableClientCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   @Test
   public void testListDurableClientCqs() throws Exception {
     setupSystem();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index 719fd92..1d685ea 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -16,16 +16,6 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import javax.management.remote.JMXConnectorServer;
-
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.DiskStore;
@@ -51,7 +41,18 @@ import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 
-public class WANCommandTestBase extends CliCommandTestBase {
+import javax.management.remote.JMXConnectorServer;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
+import static com.gemstone.gemfire.test.dunit.Assert.fail;
+
+public abstract class WANCommandTestBase extends CliCommandTestBase {
 
   static Cache cache;
   private JMXConnectorServer jmxConnectorServer;
@@ -68,6 +69,10 @@ public class WANCommandTestBase extends CliCommandTestBase {
   static VM vm6;
   static VM vm7;
 
+  public WANCommandTestBase(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   @Override
   public final void postSetUp() throws Exception {
     final Host host = Host.getHost(0);
@@ -82,52 +87,48 @@ public class WANCommandTestBase extends CliCommandTestBase {
     enableManagement();
   }
 
-  public static Integer createFirstLocatorWithDSId(int dsId) {
-    WANCommandTestBase test = new WANCommandTestBase();
+  public Integer createFirstLocatorWithDSId(int dsId) {
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
-    Properties props = test.getDistributedSystemProperties();
+    Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
-    InternalDistributedSystem ds = test.getSystem(props);
+    InternalDistributedSystem ds = getSystem(props);
     cache = CacheFactory.create(ds);
     return port;
   }
 
-  public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
-    WANCommandTestBase test = new WANCommandTestBase();
+  public Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
-    Properties props = test.getDistributedSystemProperties();
+    Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
     props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
-    test.getSystem(props);
+    getSystem(props);
     return port;
   }
 
-  public static void createCache(Integer locPort){
-    WANCommandTestBase test = new WANCommandTestBase();
-    Properties props = test.getDistributedSystemProperties();
+  public void createCache(Integer locPort){
+    Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
-    InternalDistributedSystem ds = test.getSystem(props);
+    InternalDistributedSystem ds = getSystem(props);
     cache = CacheFactory.create(ds);
   }
 
-  public static void createCacheWithGroups(Integer locPort, String groups){
-    WANCommandTestBase test = new WANCommandTestBase();
-    Properties props = test.getDistributedSystemProperties();
+  public void createCacheWithGroups(Integer locPort, String groups){
+    Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
     props.setProperty(DistributionConfig.GROUPS_NAME, groups);
-    InternalDistributedSystem ds = test.getSystem(props);
+    InternalDistributedSystem ds = getSystem(props);
     cache = CacheFactory.create(ds);
   }
 
-  public static void createSender(String dsName, int remoteDsId,
+  public void createSender(String dsName, int remoteDsId,
       boolean isParallel, Integer maxMemory,
       Integer batchSize, boolean isConflation, boolean isPersistent,
       GatewayEventFilter filter, boolean isManulaStart) {
@@ -176,7 +177,7 @@ public class WANCommandTestBase extends CliCommandTestBase {
     }
   }
 
-  public static void startSender(String senderId){
+  public void startSender(String senderId){
     final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect");
     try {
       Set<GatewaySender> senders = cache.getGatewaySenders();
@@ -193,7 +194,7 @@ public class WANCommandTestBase extends CliCommandTestBase {
     }
   }
 
-  public static void pauseSender(String senderId){
+  public void pauseSender(String senderId){
     final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect");
     try {
       Set<GatewaySender> senders = cache.getGatewaySenders();
@@ -210,14 +211,13 @@ public class WANCommandTestBase extends CliCommandTestBase {
     }
   }
 
-  public static int createAndStartReceiver(int locPort) {
-    WANCommandTestBase test = new WANCommandTestBase();
-    Properties props = test.getDistributedSystemProperties();
+  public int createAndStartReceiver(int locPort) {
+    Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
         + "]");
 
-    InternalDistributedSystem ds = test.getSystem(props);
+    InternalDistributedSystem ds = getSystem(props);
     cache = CacheFactory.create(ds);
     GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
@@ -229,19 +229,18 @@ public class WANCommandTestBase extends CliCommandTestBase {
          receiver.start();
     } catch (IOException e) {
       e.printStackTrace();
-      fail("Test " + test.getName() + " failed to start GatewayRecevier");
+      fail("Test " + getName() + " failed to start GatewayRecevier");
     }
     return port;
   }
 
-  public static int createReceiver(int locPort) {
-    WANCommandTestBase test = new WANCommandTestBase();
-    Properties props = test.getDistributedSystemProperties();
+  public int createReceiver(int locPort) {
+    Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
         + "]");
 
-    InternalDistributedSystem ds = test.getSystem(props);
+    InternalDistributedSystem ds = getSystem(props);
     cache = CacheFactory.create(ds);
     GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
@@ -252,15 +251,14 @@ public class WANCommandTestBase extends CliCommandTestBase {
     return port;
   }
 
-  public static int createReceiverWithGroup(int locPort, String groups) {
-    WANCommandTestBase test = new WANCommandTestBase();
-    Properties props =  test.getDistributedSystemProperties();
+  public int createReceiverWithGroup(int locPort, String groups) {
+    Properties props =  getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
         + "]");
     props.setProperty(DistributionConfig.GROUPS_NAME, groups);
 
-    InternalDistributedSystem ds = test.getSystem(props);
+    InternalDistributedSystem ds = getSystem(props);
     cache = CacheFactory.create(ds);
     GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
@@ -271,8 +269,7 @@ public class WANCommandTestBase extends CliCommandTestBase {
     return port;
   }
 
-  public static void startReceiver() {
-    WANCommandTestBase test = new WANCommandTestBase();
+  public void startReceiver() {
     try {
       Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
       for (GatewayReceiver receiver : receivers) {
@@ -280,27 +277,25 @@ public class WANCommandTestBase extends CliCommandTestBase {
       }
     } catch (IOException e) {
       e.printStackTrace();
-      fail("Test " + test.getName() + " failed to start GatewayRecevier");
+      fail("Test " + getName() + " failed to start GatewayRecevier");
     }
   }
 
-  public static void stopReceiver() {
-    WANCommandTestBase test = new WANCommandTestBase();
+  public void stopReceiver() {
     Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
     for (GatewayReceiver receiver : receivers) {
       receiver.stop();
     }
   }
 
-  public static int createAndStartReceiverWithGroup(int locPort, String groups) {
-    WANCommandTestBase test = new WANCommandTestBase();
-    Properties props = test.getDistributedSystemProperties();
+  public int createAndStartReceiverWithGroup(int locPort, String groups) {
+    Properties props = getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
         + "]");
     props.setProperty(DistributionConfig.GROUPS_NAME, groups);
 
-    InternalDistributedSystem ds = test.getSystem(props);
+    InternalDistributedSystem ds = getSystem(props);
     cache = CacheFactory.create(ds);
     GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
@@ -312,17 +307,17 @@ public class WANCommandTestBase extends CliCommandTestBase {
       receiver.start();
     } catch (IOException e) {
       e.printStackTrace();
-      fail("Test " + test.getName() + " failed to start GatewayRecevier on port " + port);
+      fail("Test " + getName() + " failed to start GatewayRecevier on port " + port);
     }
     return port;
   }
 
-  public static DistributedMember getMember(){
+  public DistributedMember getMember(){
     return cache.getDistributedSystem().getDistributedMember();
   }
 
 
-  public static int getLocatorPort(){
+  public int getLocatorPort(){
     return Locator.getLocators().get(0).getPort();
   }
 
@@ -338,7 +333,7 @@ public class WANCommandTestBase extends CliCommandTestBase {
 
   }
 
-  public static void verifySenderState(String senderId, boolean isRunning, boolean isPaused) {
+  public void verifySenderState(String senderId, boolean isRunning, boolean isPaused) {
     final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect");
     try {
       Set<GatewaySender> senders = cache.getGatewaySenders();
@@ -357,7 +352,7 @@ public class WANCommandTestBase extends CliCommandTestBase {
     }
   }
 
-  public static void verifySenderAttributes(String senderId, int remoteDsID,
+  public void verifySenderAttributes(String senderId, int remoteDsID,
       boolean isParallel, boolean manualStart, int socketBufferSize,
       int socketReadTimeout, boolean enableBatchConflation, int batchSize,
       int batchTimeInterval, boolean enablePersistence,
@@ -440,19 +435,17 @@ public class WANCommandTestBase extends CliCommandTestBase {
     }
   }
 
-  public static void verifyReceiverState(boolean isRunning) {
-    WANCommandTestBase test = new WANCommandTestBase();
+  public void verifyReceiverState(boolean isRunning) {
     Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
     for (GatewayReceiver receiver : receivers) {
       assertEquals(isRunning, receiver.isRunning());
     }
   }
 
-  public static void verifyReceiverCreationWithAttributes(boolean isRunning,
+  public void verifyReceiverCreationWithAttributes(boolean isRunning,
       int startPort, int endPort, String bindAddress, int maxTimeBetweenPings,
       int socketBufferSize, List<String> expectedGatewayTransportFilters) {
 
-    WANCommandTestBase test = new WANCommandTestBase();
     Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
     assertEquals("Number of receivers is incorrect", 1, receivers.size());
     for (GatewayReceiver receiver : receivers) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index d9a551b..a7f1e04 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -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 java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import com.gemstone.gemfire.cache.wan.GatewayReceiver;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -36,6 +26,15 @@ 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.ArrayList;
+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;
 
 /**
  * DUnit tests for 'create gateway-receiver' command.
@@ -44,7 +43,11 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase {
 
   private static final long serialVersionUID = 1L;
-  
+
+  public WanCommandCreateGatewayReceiverDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   /**
    * GatewayReceiver with all default attributes
    */
@@ -52,7 +55,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiverWithDefault() {
 
     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");
@@ -60,11 +63,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     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 ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER;
     CommandResult cmdResult = executeCommand(command);
@@ -88,19 +91,19 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START,
+    vm3.invoke(() -> verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START,
             GatewayReceiver.DEFAULT_START_PORT,
             GatewayReceiver.DEFAULT_END_PORT,
             GatewayReceiver.DEFAULT_BIND_ADDRESS,
             GatewayReceiver.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
             GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START,
+    vm4.invoke(() -> verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START,
             GatewayReceiver.DEFAULT_START_PORT,
             GatewayReceiver.DEFAULT_END_PORT,
             GatewayReceiver.DEFAULT_BIND_ADDRESS,
             GatewayReceiver.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
             GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START,
+    vm5.invoke(() -> verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START,
             GatewayReceiver.DEFAULT_START_PORT,
             GatewayReceiver.DEFAULT_END_PORT,
             GatewayReceiver.DEFAULT_BIND_ADDRESS,
@@ -115,7 +118,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiver() {
 
     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");
@@ -123,11 +126,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     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 ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART+ "=true"
@@ -157,11 +160,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm3.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm4.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm5.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
   }
   
@@ -172,7 +175,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiverWithGatewayTransportFilter() {
 
     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");
@@ -180,11 +183,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     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 ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART+ "=false"
@@ -218,11 +221,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
     List<String> transportFilters = new ArrayList<String>();
     transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter1");
     
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( true, 10000,
+    vm3.invoke(() -> verifyReceiverCreationWithAttributes( true, 10000,
             11000, "localhost", 100000, 512000, transportFilters ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( true, 10000,
+    vm4.invoke(() -> verifyReceiverCreationWithAttributes( true, 10000,
             11000, "localhost", 100000, 512000, transportFilters ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( true, 10000,
+    vm5.invoke(() -> verifyReceiverCreationWithAttributes( true, 10000,
             11000, "localhost", 100000, 512000, transportFilters ));
   }
   
@@ -233,7 +236,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiverWithMultipleGatewayTransportFilters() {
 
     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");
@@ -241,11 +244,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     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 ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER + " --"
         + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost" + " --"
@@ -281,11 +284,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
     transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter1");
     transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter2");
     
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
+    vm3.invoke(() -> verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
             11000, "localhost", 100000, 512000, transportFilters ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
+    vm4.invoke(() -> verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
             11000, "localhost", 100000, 512000, transportFilters ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
+    vm5.invoke(() -> verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
             11000, "localhost", 100000, 512000, transportFilters ));
   }
 
@@ -297,7 +300,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiver_Error() {
 
     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");
@@ -305,11 +308,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     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 ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
@@ -346,7 +349,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiver_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");
@@ -354,13 +357,13 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     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 ));
     
-    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> getMember());
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -391,7 +394,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm3.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
   }
 
@@ -402,7 +405,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiver_onMultipleMembers() {
 
     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");
@@ -410,14 +413,14 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     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 ));
     
-    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
-    final DistributedMember vm4Member = (DistributedMember) vm4.invoke(() -> WANCommandTestBase.getMember());
+    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> getMember());
+    final DistributedMember vm4Member = (DistributedMember) vm4.invoke(() -> getMember());
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -448,9 +451,9 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm3.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm4.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
   }
   
@@ -461,7 +464,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiver_onGroup() {
 
     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");
@@ -469,11 +472,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+    Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
-    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
-    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm3.invoke(() -> createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm4.invoke(() -> createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm5.invoke(() -> createCacheWithGroups( punePort, "receiverGroup1" ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -504,11 +507,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm3.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm4.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm5.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
   }
 
@@ -520,7 +523,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiver_onGroup_Scenario2() {
 
     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");
@@ -528,11 +531,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+    Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
-    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
-    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup2" ));
+    vm3.invoke(() -> createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm4.invoke(() -> createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm5.invoke(() -> createCacheWithGroups( punePort, "receiverGroup2" ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -563,9 +566,9 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm3.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm4.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
   }
 
@@ -576,7 +579,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
   public void testCreateGatewayReceiver_onMultipleGroups() {
 
     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");
@@ -584,11 +587,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+    Integer nyPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
-    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
-    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup2" ));
+    vm3.invoke(() -> createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm4.invoke(() -> createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm5.invoke(() -> createCacheWithGroups( punePort, "receiverGroup2" ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -619,11 +622,11 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm3.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
-    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm4.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
-    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+    vm5.invoke(() -> verifyReceiverCreationWithAttributes( false, 10000,
             11000, "localhost", 100000, 512000, null ));
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
index d5c4b75..622abc5 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
@@ -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 java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import com.gemstone.gemfire.cache.wan.GatewaySender;
 import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.distributed.DistributedMember;
@@ -37,12 +27,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.ArrayList;
+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;
 
 @Category(DistributedTest.class)
 public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   
   private static final long serialVersionUID = 1L;
-  
+
+  public WanCommandCreateGatewaySenderDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+    super(useHttpOnConnect, jsonAuthorization);
+  }
+
   private CommandResult executeCommandWithIgnoredExceptions(String command) {
     final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect");
     try {
@@ -60,7 +63,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateGatewaySenderWithDefault() {
 
-    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");
@@ -68,11 +71,11 @@ public class WanCommandCreateGatewaySenderDUnitTest 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 ));
 
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
         + CliStrings.CREATE_GATEWAYSENDER__ID + "=ln" 
@@ -95,11 +98,11 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
       fail("testCreateGatewaySender 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 ));
   }
   
@@ -109,7 +112,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateGatewaySender() {
 
-    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");
@@ -117,11 +120,11 @@ public class WanCommandCreateGatewaySenderDUnitTest 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 ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -158,18 +161,18 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
       fail("testCreateGatewaySender 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 ));
     
-    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm3.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm4.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm5.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null ));
   }
 
@@ -181,7 +184,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateGatewaySender_Error() {
 
-    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");
@@ -189,11 +192,11 @@ public class WanCommandCreateGatewaySenderDUnitTest 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 ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -237,7 +240,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateGatewaySenderWithGatewayEventFilters() {
 
-    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");
@@ -245,11 +248,11 @@ public class WanCommandCreateGatewaySenderDUnitTest 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 ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -288,21 +291,21 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
       fail("testCreateGatewaySender 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 ));
     
     List<String> eventFilters = new ArrayList<String>();
     eventFilters.add("com.gemstone.gemfire.cache30.MyGatewayEventFilter1");
     eventFilters.add("com.gemstone.gemfire.cache30.MyGatewayEventFilter2");
-    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm3.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, eventFilters, null ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm4.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, eventFilters, null ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm5.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, eventFilters, null ));
   }
 
@@ -312,7 +315,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateGatewaySenderWithGatewayTransportFilters() {
 
-    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");
@@ -320,11 +323,11 @@ public class WanCommandCreateGatewaySenderDUnitTest 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 ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -362,20 +365,20 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
       fail("testCreateGatewaySender 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 ));
     
     List<String> transportFilters = new ArrayList<String>();
     transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter1");
-    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm3.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, null, transportFilters ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm4.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, null, transportFilters ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm5.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, null, transportFilters ));
   }
 
@@ -385,7 +388,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateGatewaySender_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");
@@ -393,13 +396,13 @@ public class WanCommandCreateGatewaySenderDUnitTest 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 ));
     
-    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> getMember());
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -437,10 +440,10 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
       fail("testCreateGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+    vm3.invoke(() -> verifySenderState(
         "ln", false, false ));
     
-    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm3.invoke(() -> verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null ));
   }
 
@@ -450,7 +453,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateGatewaySender_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");
@@ -458,11 +461,11 @@ public class WanCommandCreateGatewaySenderDUnitTest 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( punePort, "SenderGroup1" ));
-    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup1" ));
-    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup1" ));
+    vm3.invoke(() -> createCacheWithGroups( punePort, "SenderGroup1" ));
+    vm4.invoke(() -> createCacheWithGroups( punePort, "SenderGroup1" ));
+    vm5.invoke(() -> createCacheWithGroups( punePort, "SenderGroup1" ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -500,11 +503,11 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
       fail("testCreateGatewaySender 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 ));
   }
   
@@ -515,7 +518,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateGatewaySender_Group_Scenario2() {
 
-    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");
@@ -523,11 +526,11 @@ public class WanCommandCreateGatewaySenderDUnitTest 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( punePort, "SenderGroup1" ));
-    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup1" ));
-    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup2" ));
+    vm3.invoke(() -> createCacheWithGroups( punePort, "SenderGroup1" ));
+    vm4.invoke(() -> createCacheWithGroups( punePort, "SenderGroup1" ));
+    vm5.invoke(() -> createCacheWithGroups( punePort, "SenderGroup2" ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -565,9 +568,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
       fail("testCreateGatewaySender 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 ));
   }
   
@@ -577,7 +580,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateParallelGatewaySender() {
 
-    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");
@@ -585,11 +588,11 @@ public class WanCommandCreateGatewaySenderDUnitTest 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 ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -624,18 +627,18 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
       fail("testCreateGatewaySender 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 ));
     
-    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm3.invoke(() -> verifySenderAttributes( "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, GatewaySender.DEFAULT_DISPATCHER_THREADS, null, null, null ));
-    vm4.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm4.invoke(() -> verifySenderAttributes( "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, GatewaySender.DEFAULT_DISPATCHER_THREADS, null, null, null ));
-    vm5.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
+    vm5.invoke(() -> verifySenderAttributes( "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
             true, false, 1000, 100, GatewaySender.DEFAULT_DISPATCHER_THREADS, null, null, null ));
   }
   
@@ -646,7 +649,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
   @Test
   public void testCreateParallelGatewaySender_Error() {
 
-    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");
@@ -655,11 +658,11 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
         + "]");
     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 ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"


Mime
View raw message