geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [29/29] incubator-geode git commit: Manual fixing compile errors from converting dunit to junit 4.
Date Tue, 24 May 2016 00:31:54 GMT
Manual fixing compile errors from converting dunit to junit 4.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fe911cc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fe911cc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fe911cc5

Branch: refs/heads/feature/GEODE-837
Commit: fe911cc5690d8c6d7100e2712d78629fa8a62d7d
Parents: 3de62ae
Author: Kirk Lund <klund@apache.org>
Authored: Mon May 23 17:30:53 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Mon May 23 17:30:53 2016 -0700

----------------------------------------------------------------------
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |  9 +--
 .../PersistentRVVRecoveryDUnitTest.java         | 23 ++++++-
 .../management/CacheManagementDUnitTest.java    | 26 +++-----
 .../management/ClientHealthStatsDUnitTest.java  |  2 +-
 .../management/DistributedSystemDUnitTest.java  | 20 +++++-
 .../gemfire/management/ManagementTestBase.java  |  7 +--
 .../internal/pulse/TestClientIdsDUnitTest.java  |  2 +-
 .../pulse/TestSubscriptionsDUnitTest.java       |  2 +-
 .../gemfire/redis/RedisDistDUnitTest.java       |  2 +-
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java |  2 +-
 .../internal/cache/UpdateVersionDUnitTest.java  |  8 +--
 .../cache/wan/CacheClientNotifierDUnitTest.java | 24 ++++----
 .../gemfire/internal/cache/wan/WANTestBase.java | 65 +++++++++++---------
 .../CommonParallelGatewaySenderDUnitTest.java   | 17 ++---
 .../SenderWithTransportFilterDUnitTest.java     |  2 +-
 ...llelGatewaySenderQueueOverflowDUnitTest.java |  4 +-
 .../cli/commands/CommandOverHttpDUnitTest.java  |  1 -
 .../ConnectCommandWithHttpAndSSLDUnitTest.java  | 11 ----
 18 files changed, 127 insertions(+), 100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
index cef5151..c225c04 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
@@ -16,6 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
+import org.junit.Ignore;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -61,14 +62,14 @@ public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest {
     Invoke.invokeInEveryVM(checkOrphans);
     checkOrphans.run();
   }
-  
+
   @Override
-  public void DISABLED_testNBRegionInvalidationDuringGetInitialImage() throws Throwable {
+  @Ignore("DISABLED - bug 47951")
+  @Test
+  public void testNBRegionInvalidationDuringGetInitialImage() throws Throwable {
     //DISABLED - bug 47951
   }
 
-
-
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
index 8cd89f1..f7c011d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.persistence;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.File;
@@ -74,12 +83,13 @@ import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
+@Category(DistributedTest.class)
 public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase {
   
   private static final int TEST_REPLICATED_TOMBSTONE_TIMEOUT = 1000;
 
-  public PersistentRVVRecoveryDUnitTest(String name) {
-    super(name);
+  public PersistentRVVRecoveryDUnitTest() {
+    super();
   }
   
   @Override
@@ -87,6 +97,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
     Invoke.invokeInEveryVM(PersistentRecoveryOrderDUnitTest.class, "resetAckWaitThreshold");
   }
   
+  @Test
   public void testNoConcurrencyChecks () {
     Cache cache = getCache();
     RegionFactory rf = new RegionFactory();
@@ -104,6 +115,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
    * Test that we can recover the RVV information with some normal
    * usage.
    */
+  @Test
   public void testRecoveryWithKRF() throws Throwable {
     doTestRecovery(new Runnable() {
       @Override
@@ -116,6 +128,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
   /**
    * Test that we can recover the RVV information if the krf is missing
    */
+  @Test
   public void testRecoveryWithoutKRF() throws Throwable {
     doTestRecovery(new Runnable() {
       @Override
@@ -132,6 +145,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
   /**
    * Test that we correctly recover and expire recovered tombstones, with compaction enabled
    */
+  @Test
   public void testLotsOfTombstones() throws Throwable {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(0);
@@ -337,6 +351,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
    * then it must not get applied. Which is Bug #45921.
    *
    */
+  @Test
   public void testConflictChecksDuringConcurrentDeltaGIIAndOtherOp() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -529,6 +544,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
    * Test that we skip conflict checks with entries that are on
    * disk compared to entries that come in as part of a GII
    */
+  @Test
   public void testSkipConflictChecksForGIIdEntries() throws Throwable {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -578,6 +594,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
    * Test that we skip conflict checks with entries that are on
    * disk compared to entries that come in as part of a concurrent operation
    */
+  @Test
   public void testSkipConflictChecksForConcurrentOps() throws Throwable {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(0);
@@ -651,6 +668,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
    * Test that with concurrent updates to an async disk region,
    * we correctly update the RVV On disk
    */
+  @Test
   public void testUpdateRVVWithAsyncPersistence() throws Throwable {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(1);
@@ -734,6 +752,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
    * Test that when we generate a krf, we write the version tag
    * that matches the entry in the crf.
    */
+  @Test
   public void testWriteCorrectVersionToKrf() throws Throwable {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
index c74d850..2b6ea5c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
@@ -16,15 +16,10 @@
  */
 package com.gemstone.gemfire.management;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static com.jayway.awaitility.Awaitility.*;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,15 +27,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
-
 import javax.management.InstanceNotFoundException;
 import javax.management.JMException;
 import javax.management.Notification;
 import javax.management.NotificationListener;
 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.FixedPartitionAttributes;
 import com.gemstone.gemfire.cache.Region;
@@ -52,17 +48,15 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
 import com.gemstone.gemfire.management.internal.ManagementConstants;
-import com.gemstone.gemfire.management.internal.SystemManagementService;
 import com.gemstone.gemfire.management.internal.NotificationHub.NotificationHubListener;
+import com.gemstone.gemfire.management.internal.SystemManagementService;
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
-
-import static com.jayway.awaitility.Awaitility.*;
-import static org.hamcrest.Matchers.*;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 /**
  * This class checks and verifies various data and operations exposed through
@@ -467,7 +461,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
         .getDistributedSystem()).getConfig();
     MemberMXBean bean = service.getMemberMXBean();
     GemFireProperties data = bean.listGemFireProperties();
-    assertEquals(config, data);
+    assertConfigEquals(config, data);
     Map<DistributedMember, DistributionConfig> configMap = new HashMap<DistributedMember, DistributionConfig>();
     configMap.put(cache.getMyId(), config);
     return configMap;
@@ -487,7 +481,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
       MemberMXBean bean = MBeanUtil.getMemberMbeanProxy(member);
       GemFireProperties data = bean.listGemFireProperties();
       DistributionConfig config = configMap.get(member);
-      assertEquals(config, data);
+      assertConfigEquals(config, data);
 
     }
 
@@ -497,7 +491,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
    * Asserts that distribution config and gemfireProperty composite types hold
    * the same values
    */
-  public static void assertEquals(DistributionConfig config,
+  public static void assertConfigEquals(DistributionConfig config,
       GemFireProperties data) {
 
     assertEquals(data.getMemberName(), config.getName());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
index 0db9b8c..c940869 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
@@ -82,7 +82,7 @@ public class ClientHealthStatsDUnitTest extends JUnit4DistributedTestCase {
 
   private static VM managingNode = null;
 
-  private static ManagementTestBase helper = new ManagementTestBase("ClientHealthStatsDUnitTest_Helper");
+  private static ManagementTestBase helper = new ManagementTestBase(){};
   
   private static int numOfCreates = 0;
   private static int numOfUpdates = 0;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
index bda9470..fca0a68 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.management;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -85,6 +94,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  * 
  */
+@Category(DistributedTest.class)
 public class DistributedSystemDUnitTest extends ManagementTestBase {
 
   private static final Logger logger = LogService.getLogger();
@@ -105,8 +115,8 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
   static final String SEVERE_LEVEL_MESSAGE =  "Severelevel Alert Message";
 
   
-  public DistributedSystemDUnitTest(String name) {
-    super(name);
+  public DistributedSystemDUnitTest() {
+    super();
   }
 
   /**
@@ -114,6 +124,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testDistributedSystemAggregate() throws Exception {
     VM managingNode = getManagingNode();
     createManagementCache(managingNode);
@@ -138,6 +149,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testAlertManagedNodeFirst() throws Exception {
 
     for (VM vm : getManagedNodeList()) {
@@ -224,6 +236,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testShutdownAll() throws Exception {
     final Host host = Host.getHost(0);
     VM managedNode1 = host.getVM(0);
@@ -243,6 +256,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
     closeCache(managingNode);
   }
   
+  @Test
   public void testNavigationAPIS() throws Exception{
     
     final Host host = Host.getHost(0); 
@@ -257,6 +271,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
     checkNavigationAPIs(managingNode);    
   }
   
+  @Test
   public void testNotificationHub() throws Exception {
     this.initManagement(false);
 
@@ -485,6 +500,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testAlert() throws Exception {
     VM managingNode = getManagingNode();
    

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index 210b6a3..0c5c75d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -40,8 +40,7 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import java.util.*;
 
-@Category(DistributedTest.class)
-public class ManagementTestBase extends JUnit4DistributedTestCase {
+public abstract class ManagementTestBase extends JUnit4DistributedTestCase {
 
   private static final int MAX_WAIT = 70 * 1000;
 
@@ -208,7 +207,7 @@ public class ManagementTestBase extends JUnit4DistributedTestCase {
   public Cache createCache(Properties props) {
     System.setProperty("dunitLogPerTest", "true");
     props.setProperty(DistributionConfig.LOG_FILE_NAME, getTestMethodName() + "-.log");
-    ds = (new ManagementTestBase()).getSystem(props);
+    ds = getSystem(props);
     cache = CacheFactory.create(ds);
     managementService = ManagementService.getManagementService(cache);
     logWriter = ds.getLogWriter();
@@ -232,7 +231,7 @@ public class ManagementTestBase extends JUnit4DistributedTestCase {
     props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
     props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
     props.setProperty(DistributionConfig.LOG_FILE_NAME, getTestMethodName() + "-.log");
-    ds = (new ManagementTestBase()).getSystem(props);
+    ds = getSystem(props);
     cache = CacheFactory.create(ds);
     managementService = ManagementService.getManagementService(cache);
     logWriter = ds.getLogWriter();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
index 970bf60..8873c3b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
@@ -87,7 +87,7 @@ public class TestClientIdsDUnitTest extends JUnit4DistributedTestCase {
 
   public TestClientIdsDUnitTest() {
     super();
-    this.helper = new ManagementTestBase();
+    this.helper = new ManagementTestBase(){};
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
index 83769f8..821d4a3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
@@ -80,7 +80,7 @@ public class TestSubscriptionsDUnitTest extends JUnit4DistributedTestCase {
 
   public TestSubscriptionsDUnitTest() {
     super();
-    this.helper = new ManagementTestBase();
+    this.helper = new ManagementTestBase(){};
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
index 479b778..0314da8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
@@ -72,7 +72,7 @@ public class RedisDistDUnitTest extends JUnit4DistributedTestCase {
   }
 
   public RedisDistDUnitTest() throws Throwable {
-    super("RedisDistTest");  
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index 023fbfc..632673b 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
 @Category(DistributedTest.class)
 public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
 
-  protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqResultSetUsingPoolDUnitTest");
+  protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest();
   
   private final String selStr = "SELECT * FROM /root/regionA";
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index c4423ef..df681ef 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -664,7 +664,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
    */
 
   private static void createCache(Integer locPort) {
-    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName());
+    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
@@ -803,7 +803,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
   }
 
   public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
-    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName());
+    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -871,7 +871,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
   }
 
   public static int createReceiver(int locPort) {
-    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName());
+    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
@@ -963,7 +963,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
   }
 
   public static Integer createFirstLocatorWithDSId(int dsId) {
-    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName());
+    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
index 06c9476..1932a7a 100755
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan;
-
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 import java.io.IOException;
 import java.util.List;
@@ -68,7 +68,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
-@Category(DistributedTest.class)
+@Category(DistributedTest.class)
 public class CacheClientNotifierDUnitTest extends WANTestBase {
   private static final int NUM_KEYS = 10;
   
@@ -184,7 +184,7 @@ public class CacheClientNotifierDUnitTest extends WANTestBase {
    * Shutdown them and verify the CacheClientNofifier for each server is correct
    */
   // GEODE-1183: random ports, failure to start threads, eats exceptions, time sensitive
-  @Test
+  @Test
   public void testNormalClient2MultipleCacheServer() throws Exception {
     doMultipleCacheServer(false);
   }
@@ -253,7 +253,7 @@ public class CacheClientNotifierDUnitTest extends WANTestBase {
 
   public static void createClientWithLocator(int port0,String host,
       String regionName, String clientId, boolean isDurable) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 7ef9190..0ec40b0 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -178,6 +178,13 @@ public class WANTestBase extends JUnit4DistributedTestCase{
     super();
   }
 
+  /**
+   * @deprecated Use the no arg constructor, or better yet, don't construct this class
+   */
+  @Deprecated
+  public WANTestBase(final String ignored) {
+  }
+
   @Override
   public final void preSetUp() throws Exception {
     final Host host = Host.getHost(0);
@@ -222,7 +229,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void createLocator(int dsId, int port, Set<String> localLocatorsList, Set<String> remoteLocatorsList){
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
@@ -245,7 +252,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
 
   public static Integer createFirstLocatorWithDSId(int dsId) {
     stopOldLocator();
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -258,7 +265,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
 
   public static Integer createFirstPeerLocator(int dsId) {
     stopOldLocator();
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -271,7 +278,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
 
   public static Integer createSecondLocator(int dsId, int locatorPort) {
     stopOldLocator();
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -284,7 +291,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
 
   public static Integer createSecondPeerLocator(int dsId, int locatorPort) {
     stopOldLocator();
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -297,7 +304,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
 
   public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
     stopOldLocator();
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -310,7 +317,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void bringBackLocatorOnOldPort(int dsId, int remoteLocPort, int oldPort) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -324,7 +331,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
 
   public static Integer createFirstRemotePeerLocator(int dsId, int remoteLocPort) {
     stopOldLocator();
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -339,7 +346,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   public static Integer createSecondRemoteLocator(int dsId, int localPort,
       int remoteLocPort) {
     stopOldLocator();
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -354,7 +361,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   public static Integer createSecondRemotePeerLocator(int dsId, int localPort,
       int remoteLocPort) {
     stopOldLocator();
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -913,7 +920,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void createCacheConserveSockets(Boolean conserveSockets,Integer locPort){
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
@@ -923,7 +930,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   protected static void createCache(boolean management, Integer locPort) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     if (management) {
       props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
@@ -938,7 +945,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   protected static void createCacheWithSSL(Integer locPort) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
 
     boolean gatewaySslenabled = true;
     String  gatewaySslprotocols = "any";
@@ -970,7 +977,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void createCache_PDX(Integer locPort){
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
@@ -987,7 +994,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void createCache(Integer locPort1, Integer locPort2){
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort1
@@ -997,7 +1004,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void createCacheWithoutLocator(Integer mCastPort){
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, ""+mCastPort);
     InternalDistributedSystem ds = test.getSystem(props);
@@ -1450,7 +1457,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void addListenerOnBucketRegion(String regionName, int numBuckets) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     test.addCacheListenerOnBucketRegion(regionName, numBuckets);
   }
 
@@ -1465,7 +1472,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void addListenerOnQueueBucketRegion(String senderId, int numBuckets) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     test.addCacheListenerOnQueueBucketRegion(senderId, numBuckets);
   }
 
@@ -1494,17 +1501,17 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void addQueueListener(String senderId, boolean isParallel){
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     test.addCacheQueueListener(senderId, isParallel);
   }
 
   public static void addSecondQueueListener(String senderId, boolean isParallel){
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     test.addSecondCacheQueueListener(senderId, isParallel);
   }
 
   public static void addListenerOnRegion(String regionName){
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     test.addCacheListenerOnRegion(regionName);
   }
   private void addCacheListenerOnRegion(String regionName){
@@ -2001,7 +2008,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void createReceiverWithBindAddress(int locPort) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
@@ -2032,7 +2039,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
     }
   }
   public static int createReceiverWithSSL(int locPort) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     boolean gatewaySslenabled = true;
     String  gatewaySslprotocols = "any";
     String  gatewaySslciphers = "any";
@@ -2079,7 +2086,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void createReceiverAndServer(int locPort) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
@@ -2113,7 +2120,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static int createServer(int locPort) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
@@ -2135,7 +2142,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
 
   public static void createClientWithLocator(int port0,String host,
       String regionName) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
@@ -2169,7 +2176,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static int createReceiver_PDX(int locPort) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
@@ -3722,7 +3729,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
       cache.getDistributedSystem().disconnect();
       cache = null;
     } else {
-      WANTestBase test = new WANTestBase(getTestMethodName());
+      WANTestBase test = new WANTestBase();
       if (test.isConnectedToDS()) {
         test.getSystem().disconnect();
       }
@@ -3735,7 +3742,7 @@ public class WANTestBase extends JUnit4DistributedTestCase{
   }
 
   public static void shutdownLocator() {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     test.getSystem().disconnect();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
index 654fa9c..6ad485f 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
@@ -16,6 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+import org.junit.Ignore;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -47,10 +48,6 @@ import java.util.Set;
 @Category(DistributedTest.class)
 public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
 
-  public CommonParallelGatewaySenderDUnitTest(String name ){
-    super();
-  }
-  
   @Test
   public void testSameSenderWithNonColocatedRegions() throws Exception {
     IgnoredException.addIgnoredException("cannot have the same parallel");
@@ -85,7 +82,9 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
     4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
      and version prior to 8.0
    */
-  public void DISABLED_testParallelPropagation() throws Exception {
+  @Test
+  @Ignore("TODO")
+  public void testParallelPropagation() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
@@ -165,7 +164,9 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
     4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
      and version prior to 8.0
    */
-  public void DISABLED_testParallelPropagationPersistenceEnabled() throws Exception {
+  @Test
+  @Ignore("TODO")
+  public void testParallelPropagationPersistenceEnabled() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
@@ -250,7 +251,9 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
     4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
      and version prior to 8.0
    */
-  public void DISABLED_testPRWithGatewaySenderPersistenceEnabled_Restart() {
+  @Test
+  @Ignore("TODO")
+  public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
     //create locator on local site
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     //create locator on remote site

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index 8a7bb67..006c19d 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -111,7 +111,7 @@ public class SenderWithTransportFilterDUnitTest extends WANTestBase {
   }
   
   public static int createReceiverWithTransportFilters(int locPort) {
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index a3598fd..a77c879 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -389,7 +389,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
     
     Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort ));
     
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]");
@@ -452,7 +452,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
     
     Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort ));
     
-    WANTestBase test = new WANTestBase(getTestMethodName());
+    WANTestBase test = new WANTestBase();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDUnitTest.java
index 4dcea85..20fef80 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDUnitTest.java
@@ -61,7 +61,6 @@ import org.junit.runners.Suite;
   ShowStackTraceDUnitTest.class,
   UserCommandsDUnitTest.class
 })
-@Category(DistributedTest.class)
 public class CommandOverHttpDUnitTest {
   @ClassRule
   public static ProvideSystemProperty provideSystemProperty = new ProvideSystemProperty(CliCommandTestBase.USE_HTTP_SYSTEM_PROPERTY, "true");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe911cc5/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
index 88896cf..3f1669b 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
@@ -50,7 +50,6 @@ import org.junit.experimental.categories.Category;
  * @since  8.1
  */
 @Category({ DistributedTest.class, SecurityTest.class })
-@Category(DistributedTest.class)
 public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
 
   private static final ThreadLocal<Properties> sslInfoHolder = new ThreadLocal<>();
@@ -75,7 +74,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
   }
 
   @Test
-  @Test
   public void testMutualAuthentication() throws Exception {
     Properties serverProps = new Properties();
     serverProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -99,7 +97,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
   }
 
   @Test
-  @Test
   public void testSimpleSSL() throws Exception {
     Properties serverProps = new Properties();
     serverProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -116,7 +113,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
   }
 
   @Test
-  @Test
   public void testSSLWithoutKeyStoreType() throws Exception {
     Properties localProps = new Properties();
     localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -132,7 +128,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
   }
 
   @Test
-  @Test
   public void testSSLWithSSLProtocol() throws Exception {
     Properties localProps = new Properties();
     localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -149,7 +144,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
   }
 
   @Test
-  @Test
   public void testSSLWithTLSProtocol() throws Exception {
     Properties localProps = new Properties();
     localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -166,7 +160,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
   }
 
   @Test
-  @Test
   public void testSSLWithTLSv11Protocol() throws Exception {
     Properties localProps = new Properties();
     localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -183,7 +176,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
   }
 
   @Test
-  @Test
   public void testSSLWithTLSv12Protocol() throws Exception {
     Properties localProps = new Properties();
     localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -200,7 +192,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
   }
 
   @Test
-  @Test
   public void testWithMultipleProtocol() throws Exception {
     Properties localProps = new Properties();
     localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -218,7 +209,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
 
   @Ignore("disabled for unknown reason")
   @Test
-  @Test
   public void testSSLWithCipherSuite() throws Exception {
     Properties localProps = new Properties();
     localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -249,7 +239,6 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
 
   @Ignore("disabled for unknown reason")
   @Test
-  @Test
   public void testSSLWithMultipleCipherSuite() throws Exception {
     System.setProperty("javax.net.debug", "ssl,handshake,failure");
     


Mime
View raw message