geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [05/29] incubator-geode git commit: Converting dunits to junit 4 using dunits_to_junit4.sh
Date Tue, 24 May 2016 00:31:30 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index 91f3c1f..5790a8d 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
+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 com.gemstone.gemfire.cache.EntryExistsException;
 import com.gemstone.gemfire.cache.client.ServerOperationException;
 import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
@@ -36,10 +45,11 @@ import java.util.Set;
  * Test the functionality of ParallelGatewaySender with multiple dispatchers.
  *
  */
+@Category(DistributedTest.class)
 public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
   
-  public ConcurrentParallelGatewaySenderDUnitTest(String name) {
-    super(name);
+  public ConcurrentParallelGatewaySenderDUnitTest() {
+    super();
   }
   
   /**
@@ -49,6 +59,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testParallelPropagationConcurrentArtifacts() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -129,6 +140,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
    * Normal happy scenario test case.
    * @throws Exception
    */
+  @Test
   public void testParallelPropagation() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -188,6 +200,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
    * Normal happy scenario test case when bucket division tests boundary cases.
    * @throws Exception
    */
+  @Test
   public void testParallelPropagationWithUnEqualBucketDivison() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -247,6 +260,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
    * We verify that 
    * @throws Exception
    */
+  @Test
   public void testParallelPropagation_withoutRemoteSite() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -308,6 +322,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
   /**
    * Testing for colocated region with orderpolicy Partition
    */
+  @Test
   public void testParallelPropogationColocatedPartitionedRegions() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -370,6 +385,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -480,6 +496,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
    * Normal scenario 
    * @throws Exception
    */
+  @Test
   public void testParallelColocatedPropagation() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -526,6 +543,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
    * Normal scenario 
    * @throws Exception
    */
+  @Test
   public void testParallelColocatedPropagationOrderPolicyPartition() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -566,6 +584,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
         getTestMethodName(), 1000 ));
   }
   
+  @Test
   public void testPartitionedParallelPropagationHA() throws Exception {
     IgnoredException.addIgnoredException(SocketException.class.getName()); // for Connection reset
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@ -627,6 +646,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
         getTestMethodName() + "_PR", 10000 ));
   }
   
+  @Test
   public void testWANPDX_PR_MultipleVM_ConcurrentParallelSender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -658,6 +678,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
         getTestMethodName() + "_PR", 10 ));
   }
   
+  @Test
   public void testWANPDX_PR_MultipleVM_ConcurrentParallelSender_StartedLater() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
index 4edf515..da8a631 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
@@ -16,12 +16,22 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
+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;
+
 @SuppressWarnings("serial")
+@Category(DistributedTest.class)
 public class ConcurrentParallelGatewaySenderOffHeapDUnitTest extends
     ConcurrentParallelGatewaySenderDUnitTest {
 
-  public ConcurrentParallelGatewaySenderOffHeapDUnitTest(String name) {
-    super(name);
+  public ConcurrentParallelGatewaySenderOffHeapDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index 9145b58..b54ce5a 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -17,6 +17,15 @@
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
 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 com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
@@ -26,11 +35,12 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
+@Category(DistributedTest.class)
 public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTestBase {
   private static final long serialVersionUID = 1L;
   
-  public ConcurrentParallelGatewaySenderOperation_1_DUnitTest(String name) {
-    super(name);
+  public ConcurrentParallelGatewaySenderOperation_1_DUnitTest() {
+    super();
   }
 
   @Override
@@ -40,6 +50,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
     IgnoredException.addIgnoredException("Unexpected IOException");
   }
   
+  @Test
   public void testParallelGatewaySenderWithoutStarting() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -86,6 +97,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
   /**
    * Defect 44323 (ParallelGatewaySender should not be started on Accessor node)
    */
+  @Test
   public void testParallelGatewaySenderStartOnAccessorNode() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -138,6 +150,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
    * Normal scenario in which the sender is paused in between.
    * @throws Exception
    */
+  @Test
   public void testParallelPropagationSenderPause() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -198,6 +211,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
    * Normal scenario in which a paused sender is resumed.
    * @throws Exception
    */
+  @Test
   public void testParallelPropagationSenderResume() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -275,6 +289,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
    * 
    * @throws Exception
    */
+  @Test
   public void testParallelPropagationSenderResumeNegativeScenario() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -333,6 +348,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
    * Normal scenario in which a sender is stopped.
    * @throws Exception
    */
+  @Test
   public void testParallelPropagationSenderStop() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -391,6 +407,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
   /**
    * Normal scenario in which a sender is stopped and then started again.
    */
+  @Test
   public void testParallelPropagationSenderStartAfterStop() throws Throwable {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -578,6 +595,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
    * @throws Exception
    */
   @Category(FlakyTest.class) // GEODE-1011: random ports, time sensitive, waitForCriterion, 5 minute timeouts, 5 second thread sleeps, async actions
+  @Test
   public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws Throwable {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -668,6 +686,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
    * Normal scenario in which a combinations of start, pause, resume operations
    * is tested
    */
+  @Test
   public void testStartPauseResumeParallelGatewaySender() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index 9e5c0fd..106ab4b 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
+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.concurrent.TimeUnit;
 
 import com.gemstone.gemfire.cache.Region;
@@ -35,12 +44,13 @@ import com.jayway.awaitility.Awaitility;
 /**
  *
  */
+@Category(DistributedTest.class)
 public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTestBase {
 
   private static final long serialVersionUID = 1L;
   
-  public ConcurrentParallelGatewaySenderOperation_2_DUnitTest(String name) {
-    super(name);
+  public ConcurrentParallelGatewaySenderOperation_2_DUnitTest() {
+    super();
   }
 
   @Override
@@ -53,6 +63,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
   
   // to test that when userPR is locally destroyed, shadow Pr is also locally
   // destroyed and on recreation usrePr , shadow Pr is also recreated.
+  @Test
   public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
@@ -92,6 +103,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     }
   }
   
+  @Test
   public void testParallelGatewaySender_SingleNode_UserPR_Destroy_RecreateRegion() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
@@ -134,6 +146,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     }
   }
 
+  @Test
   public void testParallelGatewaySender_SingleNode_UserPR_Close_RecreateRegion() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
@@ -172,6 +185,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     }
   }
 
+  @Test
   public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultenuousPut_RecreateRegion() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
@@ -216,6 +230,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     }
   }
   
+  @Test
   public void testParallelGatewaySender_SingleNode_UserPR_Destroy_NodeDown()
       throws Exception {
     IgnoredException.addIgnoredException("Broken pipe");
@@ -257,6 +272,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
 
   }
   
+  @Test
   public void testParallelGatewaySender_SingleNode_UserPR_Close_SimultenuousPut_RecreateRegion() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
@@ -304,6 +320,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     }
   }
 
+  @Test
   public void testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
@@ -360,6 +377,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     }
   }
   
+  @Test
   public void testParallelGatewaySender_MultipleNode_UserPR_localDestroy_Recreate() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
@@ -400,6 +418,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     }
   }
   
+  @Test
   public void testParallelGatewaySenders_MultiplNode_UserPR_localDestroy_Recreate() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
@@ -448,6 +467,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     }
   }
 
+  @Test
   public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
@@ -486,6 +506,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     }
   }
 
+  @Test
   public void testParallelGatewaySender_ColocatedPartitionedRegions_destroy() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
index 3959aab..f09e19c 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
+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.Set;
 
 import com.gemstone.gemfire.cache.wan.GatewaySender;
@@ -28,12 +37,13 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  *
  */
+@Category(DistributedTest.class)
 public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends SerialGatewaySenderOperationsDUnitTest {
 
   private static final long serialVersionUID = 1L;
 
-  public ConcurrentSerialGatewaySenderOperationsDUnitTest(String name) {
-    super(name);
+  public ConcurrentSerialGatewaySenderOperationsDUnitTest() {
+    super();
   }
 
   protected void createSenderVM5() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
index 172a4f2..3a0caef 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
@@ -16,12 +16,22 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
+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;
+
 @SuppressWarnings("serial")
+@Category(DistributedTest.class)
 public class ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest extends
     ConcurrentSerialGatewaySenderOperationsDUnitTest {
 
-  public ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest(String name) {
-    super(name);
+  public ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
index 315e9ca..09b4008 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
+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 com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.EntryExistsException;
 import com.gemstone.gemfire.cache.client.ServerOperationException;
@@ -32,13 +41,14 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
  * the we create concurrent serial GatewaySender with concurrency of 4
  *
  */
+@Category(DistributedTest.class)
 public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
 
   /**
    * @param name
    */
-  public ConcurrentWANPropogation_1_DUnitTest(String name) {
-    super(name);
+  public ConcurrentWANPropogation_1_DUnitTest() {
+    super();
   }
 
   private static final long serialVersionUID = 1L;
@@ -47,6 +57,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
    * All the test cases are similar to SerialWANPropogationDUnitTest
    * @throws Exception
    */
+  @Test
   public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -95,6 +106,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
         getTestMethodName() + "_RR", 1000 ));
   }
   
+  @Test
   public void testReplicatedSerialPropagation() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -135,6 +147,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
   }
   
   
+  @Test
   public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throws Exception {
     IgnoredException.addIgnoredException("Broken pipe");
     IgnoredException.addIgnoredException("Connection reset");
@@ -224,6 +237,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -304,6 +318,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -373,6 +388,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -450,6 +466,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
 
   }
 
+  @Test
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
       throws Exception {
     final String senderId = "ln";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
index cef9cbf..38ca675 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
@@ -17,6 +17,15 @@
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
 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 com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
@@ -29,15 +38,17 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  * All the test cases are similar to SerialWANPropogationDUnitTest except that
  * the we create concurrent serial GatewaySender with concurrency of 4
  */
+@Category(DistributedTest.class)
 public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
 
-  public ConcurrentWANPropogation_2_DUnitTest(String name) {
-    super(name);
+  public ConcurrentWANPropogation_2_DUnitTest() {
+    super();
   }
 
   private static final long serialVersionUID = 1L;
 
   @Category(FlakyTest.class) // GEODE-1121: random ports, async behavior, time sensitive, waitForCriterion, possibly memory intensive
+  @Test
   public void testSerialReplicatedWanWithOverflow() {
 
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@ -120,6 +131,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
 
   }
 
+  @Test
   public void testReplicatedSerialPropagationToTwoWanSites() throws Exception {
 
     Integer lnPort = createFirstLocatorWithDSId(1);
@@ -170,6 +182,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
         getTestMethodName() + "_RR", 1000 ));
   }
 
+  @Test
   public void testReplicatedSerialPropagationHA() throws Exception {
     IgnoredException.addIgnoredException("Broken pipe");
     IgnoredException.addIgnoredException("Connection reset");
@@ -217,6 +230,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
         getTestMethodName() + "_RR", 10000 ));
   }
 
+  @Test
   public void testReplicatedSerialPropagationWithConflation() throws Exception {
 
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@ -257,6 +271,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
         getTestMethodName() + "_RR", 1000 ));
   }
 
+  @Test
   public void testReplicatedSerialPropagationWithParallelThreads()
       throws Exception {
 
@@ -298,6 +313,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
         getTestMethodName() + "_RR", 1000 ));
   }
 
+  @Test
   public void testSerialPropogationWithFilter() throws Exception {
 
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
@@ -337,6 +353,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
         getTestMethodName(), 800 ));
   }
 
+  @Test
   public void testReplicatedSerialPropagationWithFilter() throws Exception {
 
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@ -377,6 +394,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
         getTestMethodName(), 800 ));
   }
   
+  @Test
   public void testNormalRegionSerialPropagation() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 63e7266..21b78c3 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -16,17 +16,27 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.disttx;
 
+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 com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 
+@Category(DistributedTest.class)
 public class DistTXWANDUnitTest extends WANTestBase {
 
   private static final long serialVersionUID = 1L;
 
-  public DistTXWANDUnitTest(String name) {
-    super(name);
+  public DistTXWANDUnitTest() {
+    super();
   }
 
   @Override
@@ -84,6 +94,7 @@ public class DistTXWANDUnitTest extends WANTestBase {
         getTestMethodName() + "_PR", 50 ));
   }
 
+  @Test
   public void testPartitionedSerialPropagation_SenderNotSameAsCoordinator() throws Exception {
 
     
@@ -124,6 +135,7 @@ public class DistTXWANDUnitTest extends WANTestBase {
   }
 
   
+  @Test
   public void testPartitionedRegionParallelPropagation() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -178,6 +190,7 @@ public class DistTXWANDUnitTest extends WANTestBase {
         getTestMethodName() + "_PR", 5 ));
   }
 
+  @Test
   public void testDummy() {
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 5731b45..654fa9c 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,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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 com.gemstone.gemfire.cache.wan.GatewaySender;
 import com.gemstone.gemfire.internal.cache.BucketRegion;
 import com.gemstone.gemfire.internal.cache.PartitionedRegion;
@@ -35,12 +44,14 @@ import java.util.Set;
 /**
  *
  */
+@Category(DistributedTest.class)
 public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
 
   public CommonParallelGatewaySenderDUnitTest(String name ){
-    super(name);
+    super();
   }
   
+  @Test
   public void testSameSenderWithNonColocatedRegions() throws Exception {
     IgnoredException.addIgnoredException("cannot have the same parallel");
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
index df7f08f..2fb77ff 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
@@ -16,12 +16,22 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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;
+
 @SuppressWarnings("serial")
+@Category(DistributedTest.class)
 public class CommonParallelGatewaySenderOffHeapDUnitTest extends
     CommonParallelGatewaySenderDUnitTest {
 
-  public CommonParallelGatewaySenderOffHeapDUnitTest(String name) {
-    super(name);
+  public CommonParallelGatewaySenderOffHeapDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
index 2c62a7c..b396e85 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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.HashMap;
 import java.util.Map;
 
@@ -43,12 +52,14 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * Version tag information which is relevant between multiple distributed
  * systems consistency check is basically dsid and timestamp.
  */
+@Category(DistributedTest.class)
 public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase {
 
-  public NewWANConcurrencyCheckForDestroyDUnitTest(String name) {
-    super(name);
+  public NewWANConcurrencyCheckForDestroyDUnitTest() {
+    super();
   }
 
+  @Test
   public void testVersionTagTimestampForDestroy() {
     
     
@@ -137,6 +148,7 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase {
    * version for RegionEntry with key "testKey". If timestamp on both site is
    * same that means events were transferred in correct sequence.
    */
+  @Test
   public void testPutAllEventSequenceOnSerialGatewaySenderWithRR() {
     
     // create two distributed systems with each having a cache containing
@@ -242,7 +254,8 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase {
 /**
  * This is similar to above test but for PartitionedRegion.
  */
-public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() {
+  @Test
+  public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() {
     
     // create two distributed systems with each having a cache containing
     // a Replicated Region with one entry and concurrency checks enabled.
@@ -348,6 +361,7 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() {
    * Tests if conflict checks are happening based on DSID and timestamp even if
    * version tag is generated in local distributed system.
    */
+  @Test
   public void testConflicChecksBasedOnDsidAndTimeStamp() {
 
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
index f0303b9..7b425ed 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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.Properties;
 
 import com.gemstone.gemfire.internal.logging.LogService;
@@ -36,14 +45,15 @@ import com.gemstone.gemfire.security.templates.UserPasswordAuthInit;
 
 import org.apache.logging.log4j.Logger;
 
+@Category(DistributedTest.class)
 public class NewWanAuthenticationDUnitTest extends WANTestBase {
 
   private static final long serialVersionUID = 1L;
 
   public static final Logger logger = LogService.getLogger();
 
-  public NewWanAuthenticationDUnitTest(String name) {
-    super(name);
+  public NewWanAuthenticationDUnitTest() {
+    super();
   }
 
   /**
@@ -51,6 +61,7 @@ public class NewWanAuthenticationDUnitTest extends WANTestBase {
    * related to authentication has been changed in new WAN, this test case is
    * added on request from QA for defect 44650.
    */
+  @Test
   public void testWanAuthValidCredentials() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     logger.info("Created locator on local site");
@@ -115,6 +126,7 @@ public class NewWanAuthenticationDUnitTest extends WANTestBase {
    * nothing related to authentication has been changed in new WAN, this test
    * case is added on request from QA for defect 44650.
    */
+  @Test
   public void testWanAuthInvalidCredentials() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     logger.info("Created locator on local site");
@@ -250,6 +262,7 @@ public class NewWanAuthenticationDUnitTest extends WANTestBase {
     isDifferentServerInGetCredentialCall = false;
   }
 
+  @Test
   public void testWanAuthValidCredentialsWithServer() {
     disconnectAllFromDS();
     {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index d665f60..5eb6933 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -16,16 +16,26 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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 com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.Wait;
 
+@Category(DistributedTest.class)
 public class PDXNewWanDUnitTest extends WANTestBase{
 
   private static final long serialVersionUID = 1L;
   
-  public PDXNewWanDUnitTest(String name) {
-    super(name);
+  public PDXNewWanDUnitTest() {
+    super();
   }
 
   /**
@@ -38,6 +48,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
    *   6> Put is done with value which is PDXSerializable
    *   7> Validate whether other sites member receive this put operation.    
    */
+  @Test
   public void testWANPDX_RR_SerialSender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -77,6 +88,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
    *   9> Make sure that site 1 get the the PDX types along with entries
    *   and can deserialize entries.     
    */
+  @Test
   public void testWANPDX_RemoveRomoteData() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -133,6 +145,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
    *   9> Make some conflicting PDX registries in site 1 before the reconnect
    *   10> Make sure we flag a warning about the conflicting updates.     
    */
+  @Test
   public void testWANPDX_ConflictingData() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -212,6 +225,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
    *   6> Put is done with value which is PDXSerializable
    *   7> Validate whether other sites member receive this put operation.    
    */
+  @Test
   public void testWANPDX_RR_SerialSender3Sites() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -286,6 +300,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
       getTestMethodName() + "_RR", 2 ));
   }
   
+  @Test
   public void testWANPDX_RR_SerialSender_StartedLater() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -327,6 +342,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
    *   7> Validate whether other sites member receive this put operation.    
    */
   
+  @Test
   public void testWANPDX_PR_SerialSender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -354,6 +370,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
         getTestMethodName() + "_PR", 1 ));
   }
   
+  @Test
   public void testWANPDX_PR_SerialSender_StartedLater() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -394,6 +411,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
    *   7> Validate whether other sites member receive this put operation.    
    */
   
+  @Test
   public void testWANPDX_PR_MultipleVM_SerialSender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -422,6 +440,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
         getTestMethodName() + "_PR", 10 ));
   }
   
+  @Test
   public void testWANPDX_PR_MultipleVM_SerialSender_StartedLater() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -465,6 +484,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
    *   7> Validate whether other sites member receive this put operation.    
    */
   
+  @Test
   public void testWANPDX_PR_ParallelSender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -492,6 +512,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
         getTestMethodName() + "_PR", 1));
   }
   
+  @Test
   public void testWANPDX_PR_ParallelSender_47826() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -518,6 +539,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
         getTestMethodName() + "_PR", 1 ));
   }
   
+  @Test
   public void testWANPDX_PR_ParallelSender_StartedLater() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -548,6 +570,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
   }
   
   
+  @Test
   public void testWANPDX_PR_MultipleVM_ParallelSender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -579,6 +602,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
         getTestMethodName() + "_PR", 10 ));
   }
   
+  @Test
   public void testWANPDX_PR_MultipleVM_ParallelSender_StartedLater() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -614,6 +638,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
   }
   
   
+  @Test
   public void testWANPDX_RR_SerialSenderWithFilter() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -644,6 +669,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
   }
   
   
+  @Test
   public void testWANPDX_PR_MultipleVM_ParallelSenderWithFilter() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
index 4469570..c617ff1 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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 com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
@@ -23,15 +32,17 @@ import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 
+@Category(DistributedTest.class)
 public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBase {
   
-  public ReplicatedRegion_ParallelWANPersistenceDUnitTest(String name) {
-    super(name);
+  public ReplicatedRegion_ParallelWANPersistenceDUnitTest() {
+    super();
     // TODO Auto-generated constructor stub
   }
 
   final String expectedExceptions = null;
 
+  @Test
   public void testNothing() {
     
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
index 543d622..5b0802c 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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 com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.Region;
@@ -28,10 +37,11 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.Wait;
 
+@Category(DistributedTest.class)
 public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBase{
 
-  public ReplicatedRegion_ParallelWANPropogationDUnitTest(String name) {
-    super(name);
+  public ReplicatedRegion_ParallelWANPropogationDUnitTest() {
+    super();
     // TODO Auto-generated constructor stub
   }
 
@@ -43,6 +53,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
    */
   private static final long serialVersionUID = 1L;
 
+  @Test
   public void test_DR_PGS_1Nodes_Put_Receiver() throws Exception {
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 1f4d72c..8a7bb67 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
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,14 +49,16 @@ import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.test.dunit.VM;
 
+@Category(DistributedTest.class)
 public class SenderWithTransportFilterDUnitTest extends WANTestBase {
 
   private static final long serialVersionUID = 1L;
 
-  public SenderWithTransportFilterDUnitTest(String name) {
-    super(name);
+  public SenderWithTransportFilterDUnitTest() {
+    super();
   }
 
+  @Test
   public void testSerialSenderWithTansportFilter() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -73,6 +84,7 @@ public class SenderWithTransportFilterDUnitTest extends WANTestBase {
         getTestMethodName() + "_RR", 100 ));
   }
 
+  @Test
   public void testParallelSenderWithTansportFilter() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
index 4ee378f..302a2c9 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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.Set;
 
 import com.gemstone.gemfire.admin.AdminDistributedSystemFactory;
@@ -36,13 +45,14 @@ 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 ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase {
   private static final long MAX_WAIT = 70000;
 
   private static final int NUM_KEYS = 1000;
 
-  public ShutdownAllPersistentGatewaySenderDUnitTest(String name) {
-    super(name);
+  public ShutdownAllPersistentGatewaySenderDUnitTest() {
+    super();
   }
   
   @Override
@@ -52,6 +62,7 @@ public class ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase {
 
   private static final long serialVersionUID = 1L;
 
+  @Test
   public void testGatewaySender() throws Exception {
     IgnoredException.addIgnoredException("Cache is shutting down");
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index bd0c118..2b22093 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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.Properties;
 
@@ -39,12 +48,13 @@ import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 
+@Category(DistributedTest.class)
 public class WANLocatorServerDUnitTest extends WANTestBase {
 
   static PoolImpl proxy;
 
-  public WANLocatorServerDUnitTest(String name) {
-    super(name);
+  public WANLocatorServerDUnitTest() {
+    super();
   }
 
   @Override
@@ -52,6 +62,7 @@ public class WANLocatorServerDUnitTest extends WANTestBase {
     final Host host = Host.getHost(0);
   }
 
+  @Test
   public void test_3Locators_2Servers() {
 
     int port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
index 80e38fd..a175fad 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -17,6 +17,15 @@
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
 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 com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
@@ -25,13 +34,15 @@ import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
+@Category(DistributedTest.class)
 public class WANSSLDUnitTest extends WANTestBase{
 
-  public WANSSLDUnitTest(String name) {
-    super(name);
+  public WANSSLDUnitTest() {
+    super();
   }
 
   @Category(FlakyTest.class) // GEODE-1207: random ports, eats exceptions, time sensitive, waitForCriterion
+  @Test
   public void testSenderSSLReceiverSSL(){
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -58,6 +69,7 @@ public class WANSSLDUnitTest extends WANTestBase{
         getTestMethodName() + "_RR", 1000 ));
   }
   
+  @Test
   public void testSenderNoSSLReceiverSSL() {
     IgnoredException.addIgnoredException("Unexpected IOException");
     IgnoredException.addIgnoredException("SSL Error");
@@ -93,6 +105,7 @@ public class WANSSLDUnitTest extends WANTestBase{
     }
   }
   
+  @Test
   public void testSenderSSLReceiverNoSSL(){
     IgnoredException.addIgnoredException("Acceptor received unknown");
     IgnoredException.addIgnoredException("failed accepting client");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index b808403..851dc49 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,11 +42,12 @@ import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 
+@Category(DistributedTest.class)
 public class WanAutoDiscoveryDUnitTest extends WANTestBase {
 
   
-  public WanAutoDiscoveryDUnitTest(String name) {
-    super(name);
+  public WanAutoDiscoveryDUnitTest() {
+    super();
   }
 
   @Override
@@ -49,6 +59,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
    * Test to validate that sender can not be started without locator started.
    * else GemFireConfigException will be thrown.
    */
+  @Test
   public void test_GatewaySender_Started_Before_Locator() {
     try {
       int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
@@ -92,6 +103,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
    * locators on Ny site recognizes each other
    * @throws Exception 
    */
+  @Test
   public void test_NY_Recognises_ALL_LN_Locators() throws Exception {
     ArrayList<Integer> locatorPorts = new ArrayList<Integer>();
     Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
@@ -122,6 +134,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
    * Test to validate that TK site's locator is recognized by LN and NY. Test to
    * validate that HK site's locator is recognized by LN , NY, TK.
    */
+  @Test
   public void test_NY_Recognises_TK_AND_HK_Through_LN_Locator() {
 
     Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
@@ -153,6 +166,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
     vm3.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
   }
 
+  @Test
   public void test_TK_Recognises_LN_AND_NY() {
 
     Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
@@ -179,6 +193,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
     vm2.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
   }
   
+  @Test
   public void test_NY_Recognises_TK_AND_HK_Simeltenously() {
     Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
 
@@ -232,6 +247,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
   }
   
   
+  @Test
   public void test_LN_Sender_recogises_ALL_NY_Locators() {
     
     Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@ -273,6 +289,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
   }
   
   
+  @Test
   public void test_RingTopology() {
 
     final Set<String> site1LocatorsPort = new HashSet<String>();
@@ -412,6 +429,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
   }
   
   
+  @Test
   public void test_LN_Peer_Locators_Exchange_Information() {
     ArrayList<Integer> locatorPorts = new ArrayList<Integer>();
     Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
@@ -427,6 +445,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
     vm1.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
   }
   
+  @Test
   public void test_LN_NY_TK_5_PeerLocators_1_ServerLocator() {
     Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
     
@@ -466,6 +485,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
         
   }
 
+  @Test
   public void testNoThreadLeftBehind() {
     // Get active thread count before test
     int activeThreadCountBefore = Thread.activeCount();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
index 0fd9807..c97e461 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
+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.Map;
 
@@ -37,10 +46,11 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
+@Category(DistributedTest.class)
 public class WanValidationsDUnitTest extends WANTestBase {
 
-  public WanValidationsDUnitTest(String name) {
-    super(name);
+  public WanValidationsDUnitTest() {
+    super();
   }
 
   /**
@@ -54,6 +64,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
    * to the member on which serialGatewaySender is available.
    */
   
+  @Test
   public void testSameSerialGatewaySenderIdAcrossSameDistributedRegion()
       throws Exception {
     IgnoredException.addIgnoredException("another cache has the same region defined");
@@ -129,6 +140,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
    * Test to make sure that serial sender Ids configured in partitioned regions
    * should be same across all PR members
    */
+  @Test
   public void testSameSerialGatewaySenderIdAcrossSamePartitionedRegion()
       throws Exception {
     IgnoredException.addIgnoredException("another cache has the same region defined");
@@ -160,6 +172,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
   }
   
   
+  @Test
   public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() {
     IgnoredException.addIgnoredException("another cache has the same region defined");
     try {
@@ -188,6 +201,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
    * Test to make sure that parallel sender Ids configured in partitioned
    * regions should be same across all PR members
    */
+  @Test
   public void testSameParallelGatewaySenderIdAcrossSamePartitionedRegion()
       throws Exception {
     IgnoredException.addIgnoredException("another cache has the same region defined");
@@ -250,6 +264,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
 
+  @Test
   public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion()
       throws Exception {
     IgnoredException.addIgnoredException("another cache has the same region defined");
@@ -285,6 +300,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
    * @throws Exception
    */
   
+  @Test
   public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion2()
       throws Exception {
     try {
@@ -312,6 +328,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
    * @throws Exception
    */
   
+  @Test
   public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion3()
       throws Exception {
     try {
@@ -340,6 +357,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
    * @throws Exception
    */
   
+  @Test
   public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion4()
       throws Exception {
     try {
@@ -371,6 +389,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
   /**
    * SerialGatewaySender and ParallelGatewaySender with same name is allowed
    */
+  @Test
   public void testSerialGatewaySenderAndParallelGatewaySenderWithSameName() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -392,6 +411,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
   }
   
   //remote ds ids should be same
+  @Test
   public void testSameRemoteDSAcrossSameSender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -417,6 +437,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
   }
   
   // sender with same name should be either serial or parallel but not both.
+  @Test
   public void testSerialSenderOnBothCache() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -441,6 +462,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
   }
   
   // sender with same name should be either serial or parallel but not both.
+  @Test
   public void testParallelSenderOnBothCache(){
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
 
@@ -466,6 +488,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
   }
   
   // isBatchConflation should be same across the same sender
+  @Test
   public void testBatchConflation() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -491,6 +514,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
   }
   
   //isPersistentEnabled should be same across the same sender
+  @Test
   public void testisPersistentEnabled() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -512,6 +536,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
   
+  @Test
   public void testAlertThreshold() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -533,6 +558,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
   
+  @Test
   public void testManualStart() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -554,6 +580,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
   
+  @Test
   public void testGatewayEventFilters() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -581,6 +608,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
   
+  @Test
   public void testGatewayEventFilters2() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -609,6 +637,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
   
+  @Test
   public void testGatewayTransportFilters() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -638,6 +667,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
 
+  @Test
   public void testGatewayTransportFiltersOrder() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -693,6 +723,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
 //    }
 //  }
   
+  @Test
   public void testIsDiskSynchronous() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -722,6 +753,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
    * A single VM hosts a bridge server as well as a Receiver.
    * Expected: Cache.getCacheServer should return only the Bridge server and not the Receiver
    */
+  @Test
   public void test_GetCacheServersDoesNotReturnReceivers() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -742,6 +774,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
    * One VM hosts a Bridge server while the other hosts a Receiver.
    * Expected: Cache.getCacheServers should only return the bridge server and not the Receiver.
    */
+  @Test
   public void test_GetCacheServersDoesNotReturnReceivers_Scenario2() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     createCacheInVMs(lnPort, vm4);
@@ -818,6 +851,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
 
+  @Test
   public void testBug50434_RR_Serial() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -858,6 +892,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
   
+  @Test
   public void testBug50434_RR_SerialAsyncEventQueue() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -900,6 +935,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
         getTestMethodName() + "_RR", null, isOffHeap() );
   }
   
+  @Test
   public void testBug50434_RR_Serial_Pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -941,6 +977,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
         getTestMethodName() + "_RR", 10));
   }
   
+  @Test
   public void testBug50434_RR_SerialAsyncEventQueue_Pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -978,6 +1015,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
         "ln", 0 ));// secondary
   }
   
+  @Test
   public void testBug50434_PR_Serial() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -1031,6 +1069,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
   
+  @Test
   public void testBug50434_PR_SerialAsyncEventQueue() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -1071,6 +1110,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
   
+  @Test
   public void testBug50434_PR_Serial_Pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -1123,6 +1163,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
         getTestMethodName() + "_PR", 10));
   }
   
+  @Test
   public void testBug50434_PR_SerialAsyncEventQueue_Pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -1164,6 +1205,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
         "ln", 0 ));// secondary
   }
   
+  @Test
   public void testBug50434_PR_Parallel() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -1211,6 +1253,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     }
   }
   
+  @Test
   public void testBug50434_PR_ParallelAsyncEventQueue() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -1252,6 +1295,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
   }
 
   @Category(FlakyTest.class) // GEODE-1019: random ports, time sensitive, waitForCriterion, suspect string: loss of quorum
+  @Test
   public void testBug50434_PR_Parallel_pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@ -1299,6 +1343,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
         getTestMethodName() + "_PR", 10));
   }
   
+  @Test
   public void testBug50434_PR_ParallelAsyncEventQueue_Pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -1343,6 +1388,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
     assertEquals(vm4size + vm5size + vm6size + vm7size, 256);
   }
   
+  @Test
   public void testBug51367_WrongBindAddressOnGatewayReceiver() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
@@ -1350,6 +1396,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
   }
   
   
+  @Test
   public void testBug50247_NonPersistentSenderWithPersistentRegion()
       throws Exception {
     IgnoredException.addIgnoredException("could not get remote locator information");
@@ -1396,6 +1443,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
    * Region: Replicated WAN: Serial Number of WAN sites: 2 Region persistence
    * enabled: false Async channel persistence enabled: false
    */
+  @Test
   public void testReplicatedSerialAsyncEventQueueWith2WANSites() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
index c429183..1b8d2e7 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -16,13 +16,23 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
+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 com.gemstone.gemfire.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest;
 
+@Category(DistributedTest.class)
 public class ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest
     extends ConcurrentParallelGatewaySenderOperation_2_DUnitTest {
 
-  public ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest(String name) {
-    super(name);
+  public ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
index eab9e05..37631a8 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -16,13 +16,23 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
+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 com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderOperation_2_DUnitTest;
 
+@Category(DistributedTest.class)
 public class ParallelGatewaySenderOperation_2_OffHeapDUnitTest
     extends ParallelGatewaySenderOperation_2_DUnitTest{
 
-  public ParallelGatewaySenderOperation_2_OffHeapDUnitTest(String name) {
-    super(name);
+  public ParallelGatewaySenderOperation_2_OffHeapDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
index 7143ca0..b735a18 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
@@ -16,14 +16,24 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
+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 com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderOperationsDUnitTest;
 
 @SuppressWarnings("serial")
+@Category(DistributedTest.class)
 public class ParallelGatewaySenderOperationsOffHeapDUnitTest extends
     ParallelGatewaySenderOperationsDUnitTest {
 
-  public ParallelGatewaySenderOperationsOffHeapDUnitTest(String name) {
-    super(name);
+  public ParallelGatewaySenderOperationsOffHeapDUnitTest() {
+    super();
   }
 
   @Override



Mime
View raw message