geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [08/29] incubator-geode git commit: Converting dunits to junit 4 using dunits_to_junit4.sh
Date Tue, 24 May 2016 00:31:33 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
index 07fa3df..7d341e1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
+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.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -53,14 +62,15 @@ import com.gemstone.gemfire.util.test.TestUtil;
 /**
 *This test tests TransactionTimeOut functionality
 */
-public class TransactionTimeOutDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class TransactionTimeOutDUnitTest extends JUnit4DistributedTestCase {
 
   static DistributedSystem ds;
   static Cache cache = null;
   private static String tblName;
 
-  public TransactionTimeOutDUnitTest(String name) {
-    super(name);
+  public TransactionTimeOutDUnitTest() {
+    super();
   }
 
   public static void init() throws Exception {
@@ -79,7 +89,7 @@ public class TransactionTimeOutDUnitTest extends DistributedTestCase {
 //    props.setProperty("mcast-port", "10321");
     try {
 //      ds = DistributedSystem.connect(props);
-        ds = (new TransactionTimeOutDUnitTest("temp")).getSystem(props);
+        ds = (new TransactionTimeOutDUnitTest()).getSystem(props);
       if (cache == null || cache.isClosed()) cache = CacheFactory.create(ds);
     }
     catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
index f8542b3..750910b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
+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.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -61,11 +70,12 @@ import com.gemstone.gemfire.util.test.TestUtil;
  *  
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class TxnManagerMultiThreadDUnitTest extends JUnit4DistributedTestCase {
 
   /////constructor/////
-  public TxnManagerMultiThreadDUnitTest(String name) {
-    super(name);
+  public TxnManagerMultiThreadDUnitTest() {
+    super();
   }
 
   public static DistributedSystem ds;
@@ -202,7 +212,7 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
     //    props.setProperty("mcast-port", "10339");
     try {
       //        ds = DistributedSystem.connect(props);
-      ds = (new TxnManagerMultiThreadDUnitTest("temp")).getSystem(props);
+      ds = (new TxnManagerMultiThreadDUnitTest()).getSystem(props);
       CacheUtils.ds = ds;
       cache = CacheFactory.create(ds);
       if (className != null && !className.equals("")) {
@@ -514,5 +524,6 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
    *  
    */
 
-   public void testFoo() {}
+  @Test
+  public void testFoo() {}
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
index 38edde0..7c263c2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
+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.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -47,15 +56,16 @@ import com.gemstone.gemfire.util.test.TestUtil;
 /**
 *This test sees if the TransactionTimeOut works properly
 */
-public class TxnTimeOutDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class TxnTimeOutDUnitTest extends JUnit4DistributedTestCase {
 
   static DistributedSystem ds;
   static Cache cache = null;
   private static String tblName;
   private boolean exceptionOccured = false;
 
-  public TxnTimeOutDUnitTest(String name) {
-    super(name);
+  public TxnTimeOutDUnitTest() {
+    super();
   }
 
   public static void init() throws Exception {
@@ -74,7 +84,7 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase {
     props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel());
     try {
 //      ds = DistributedSystem.connect(props);
-      ds = (new TxnTimeOutDUnitTest("temp")).getSystem(props);
+      ds = (new TxnTimeOutDUnitTest()).getSystem(props);
       if (cache == null || cache.isClosed()) cache = CacheFactory.create(ds);
     }
     catch (Exception e) {
@@ -128,6 +138,7 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase {
     vm0.invoke(() -> TxnTimeOutDUnitTest.closeCache());
   }
 
+  @Test
   public void testMultiThreaded() throws NamingException, SQLException,Throwable {
     try{
 	Host host = Host.getHost(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
index 99fadfc..b0fbed1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.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 java.util.Properties;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
@@ -55,15 +64,16 @@ import static org.hamcrest.CoreMatchers.equalTo;
  * 
  */
 @SuppressWarnings("serial")
-public class OutOfOffHeapMemoryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class OutOfOffHeapMemoryDUnitTest extends JUnit4CacheTestCase {
   private static final Logger logger = LogService.getLogger();
   
   protected static final AtomicReference<Cache> cache = new AtomicReference<Cache>();
   protected static final AtomicReference<DistributedSystem> system = new AtomicReference<DistributedSystem>();
   protected static final AtomicBoolean isSmallerVM = new AtomicBoolean();
   
-  public OutOfOffHeapMemoryDUnitTest(String name) {
-    super(name);
+  public OutOfOffHeapMemoryDUnitTest() {
+    super();
   }
 
   @Override
@@ -128,6 +138,7 @@ public class OutOfOffHeapMemoryDUnitTest extends CacheTestCase {
     return props;
   }
   
+  @Test
   public void testSimpleOutOfOffHeapMemoryMemberDisconnects() {
     final DistributedSystem system = getSystem();
     final Cache cache = getCache();
@@ -198,6 +209,7 @@ public class OutOfOffHeapMemoryDUnitTest extends CacheTestCase {
     }
   }
   
+  @Test
   public void testOtherMembersSeeOutOfOffHeapMemoryMemberDisconnects() {
     final int vmCount = Host.getHost(0).getVMCount();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
index 0bbab35..580176e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.process;
 
+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.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -32,10 +41,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  * @since 7.0
  */
 @SuppressWarnings("serial")
-public class LocalProcessLauncherDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class LocalProcessLauncherDUnitTest extends JUnit4DistributedTestCase {
 
-  public LocalProcessLauncherDUnitTest(String name) {
-    super(name);
+  public LocalProcessLauncherDUnitTest() {
+    super();
   }
 
   @Override
@@ -43,6 +53,7 @@ public class LocalProcessLauncherDUnitTest extends DistributedTestCase {
     new File(getClass().getSimpleName()).mkdir();
   }
   
+  @Test
   public void testExistingPidFileThrows() throws Exception {
     final File pidFile = new File(getClass().getSimpleName() 
         + File.separator + "testExistingPidFileThrows.pid");
@@ -71,6 +82,7 @@ public class LocalProcessLauncherDUnitTest extends DistributedTestCase {
     });
   }
   
+  @Test
   public void testForceReplacesExistingPidFile() throws Exception {
     final File pidFile = new File(getClass().getSimpleName() 
         + File.separator + "testForceReplacesExistingPidFile.pid");
@@ -111,6 +123,7 @@ public class LocalProcessLauncherDUnitTest extends DistributedTestCase {
     });
   }
   
+  @Test
   public void testPidFileReadByOtherProcess() throws Exception {
     final File pidFile = new File(getClass().getSimpleName() 
         + File.separator + "testPidFileReadByOtherProcess.pid");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index 2a9c3c7..c9408ad 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.statistics;
 
+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.FileFilter;
 import java.io.IOException;
@@ -82,7 +91,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * @since 7.0
  */
 @SuppressWarnings("serial")
-public class StatisticsDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class StatisticsDUnitTest extends JUnit4CacheTestCase {
 
   private static final String dir = "StatisticsDUnitTest";
 
@@ -120,8 +130,8 @@ public class StatisticsDUnitTest extends CacheTestCase {
     return puts.get();
   }
   
-  public StatisticsDUnitTest(String name) {
-    super(name);
+  public StatisticsDUnitTest() {
+    super();
   }
   
   @Override
@@ -130,6 +140,7 @@ public class StatisticsDUnitTest extends CacheTestCase {
     disconnectAllFromDS(); // because this test enabled stat sampling!
   }
   
+  @Test
   public void testPubAndSubCustomStats() throws Exception {
     final String testName = "testPubAndSubCustomStats";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 741fa2a..c74d850 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,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.HashSet;
@@ -65,6 +74,7 @@ import static org.hamcrest.Matchers.*;
  * 
  * 
  */
+@Category(DistributedTest.class)
 public class CacheManagementDUnitTest extends ManagementTestBase {
 
   private static final long serialVersionUID = 1L;
@@ -91,10 +101,11 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
 
 
 
-  public CacheManagementDUnitTest(String name) {
-    super(name);
+  public CacheManagementDUnitTest() {
+    super();
   }
 
+  @Test
   public void testGemFireConfigData() throws Exception {
      initManagement(false);
    
@@ -117,6 +128,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testMemberMBeanOperations() throws Exception {
     
     initManagement(false);
@@ -157,6 +169,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
    * Invoke remote operations on MemberMBean
    * @throws Exception
    */
+  @Test
   public void testMemberMBeanOpsRemote() throws Exception {
     initManagement(false);
     getManagingNode().invoke(() -> CacheManagementDUnitTest.invokeRemoteOps());
@@ -168,6 +181,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testManager() throws Exception {
     List<VM> managedNodeList = getManagedNodeList();
     VM node1 = managedNodeList.get(0);
@@ -200,6 +214,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testManagerShutdown() throws Exception {
     List<VM> managedNodeList = getManagedNodeList();
     VM node1 = managedNodeList.get(0);
@@ -222,6 +237,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
     checkNonManagerView(managingNode);
   }
   
+  @Test
   public void testServiceCloseManagedNode() throws Exception{
     List<VM> managedNodeList = getManagedNodeList();
     VM node1 = managedNodeList.get(0);
@@ -244,6 +260,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
 
   }
   
+  @Test
   public void testGetMBean() throws Exception{
     List<VM> managedNodeList = getManagedNodeList();
     VM node1 = managedNodeList.get(0);
@@ -263,6 +280,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
 
   }
   
+  @Test
   public void testQueryMBeans() throws Exception{
     List<VM> managedNodeList = getManagedNodeList();
     VM node1 = managedNodeList.get(0);
@@ -721,6 +739,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
   }
   
   
+  @Test
   public void testNotification() throws Exception {
 
     List<VM> managedNodeList = getManagedNodeList();
@@ -745,6 +764,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
 
   }
 
+  @Test
   public void testNotificationManagingNodeFirst() throws Exception {
 
     List<VM> managedNodeList = getManagedNodeList();
@@ -769,6 +789,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
 
   }
   
+  @Test
   public void testRedundancyZone() throws Exception {
 
     List<VM> managedNodeList = getManagedNodeList();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 f1a67ba..0db9b8c 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
@@ -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.Collection;
 import java.util.Iterator;
 import java.util.Properties;
@@ -51,7 +60,8 @@ import junit.framework.AssertionFailedError;
  * 
  * 
  */
-public class ClientHealthStatsDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class ClientHealthStatsDUnitTest extends JUnit4DistributedTestCase {
 
   private static final String k1 = "k1";
 
@@ -81,8 +91,8 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
   
   private static GemFireCacheImpl cache = null;
 
-  public ClientHealthStatsDUnitTest(String name) {
-    super(name);
+  public ClientHealthStatsDUnitTest() {
+    super();
   }
 
   @Override
@@ -117,6 +127,7 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
 
   private static final long serialVersionUID = 1L;
 
+  @Test
   public void testClientHealthStats_SubscriptionEnabled() throws Exception {
 
     helper.createManagementCache(managingNode);
@@ -137,6 +148,7 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
     helper.stopManagingNode(managingNode);
   }
   
+  @Test
   public void testClientHealthStats_SubscriptionDisabled() throws Exception {
 
     helper.createManagementCache(managingNode);
@@ -157,6 +169,7 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
     helper.stopManagingNode(managingNode);
   }
   
+  @Test
   public void testClientHealthStats_DurableClient() throws Exception {
 
     helper.createManagementCache(managingNode);
@@ -181,6 +194,7 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
     helper.stopManagingNode(managingNode);
   }
   
+  @Test
   public void testStatsMatchWithSize() throws Exception {
     // start a server
     int port = (Integer) server.invoke(() -> ClientHealthStatsDUnitTest.createServerCache());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
index 565de1b..5e655fa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.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 javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
@@ -29,10 +38,11 @@ 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 CompositeTypeTestDUnitTest extends ManagementTestBase {
 
-  public CompositeTypeTestDUnitTest(String name) {
-    super(name);
+  public CompositeTypeTestDUnitTest() {
+    super();
     // TODO Auto-generated constructor stub
   }
 
@@ -43,6 +53,7 @@ public class CompositeTypeTestDUnitTest extends ManagementTestBase {
   
   private static ObjectName objectName;
 
+  @Test
   public void testCompositeTypeGetters() throws Exception{
     
     initManagement(false);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java
index 29a3a85..38e5fc0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.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.Map;
 import java.util.Set;
 
@@ -39,6 +48,7 @@ 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 DLockManagementDUnitTest extends ManagementTestBase {
 
   private static final long serialVersionUID = 1L;
@@ -50,8 +60,8 @@ public class DLockManagementDUnitTest extends ManagementTestBase {
   // 60 seconds.
   private static final int MAX_WAIT = 70 * 1000;
 
-  public DLockManagementDUnitTest(String name) {
-    super(name);
+  public DLockManagementDUnitTest() {
+    super();
 
   }
 
@@ -61,6 +71,7 @@ public class DLockManagementDUnitTest extends ManagementTestBase {
    * @throws Exception
    */
   @Category(FlakyTest.class) // GEODE-173: eats exceptions, HeadlessGFSH, time sensitive, waitForCriterions
+  @Test
   public void testDLockMBean() throws Throwable {
     
     initManagement(false);
@@ -93,6 +104,7 @@ public class DLockManagementDUnitTest extends ManagementTestBase {
    * @throws Exception
    */
   @Category(FlakyTest.class) // GEODE-553: waitForCriterion, eats exceptions, HeadlessGFSH
+  @Test
   public void testDLockAggregate() throws Throwable {
     initManagement(false);
     VM[] managedNodes = new VM[getManagedNodeList()

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
index e2acc24..cc69361 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.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.io.File;
 import java.util.Arrays;
 import java.util.List;
@@ -54,6 +63,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  * 
  */
+@Category(DistributedTest.class)
 public class DiskManagementDUnitTest extends ManagementTestBase {
 
   /**
@@ -75,8 +85,8 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
 
   protected static LogWriter logWriter;
 
-  public DiskManagementDUnitTest(String name) throws Exception {
-    super(name);
+  public DiskManagementDUnitTest() throws Exception {
+    super();
   
     diskDir = new File("diskDir-" + getName()).getAbsoluteFile();
     com.gemstone.gemfire.internal.FileUtil.delete(diskDir);
@@ -102,6 +112,7 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
    * @throws Exception
    */
 
+  @Test
   public void testDiskCompact() throws Throwable {
     initManagement(false);
     for (VM vm : getManagedNodeList()) {
@@ -122,6 +133,7 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
    * @throws Exception
    */
 
+  @Test
   public void testDiskCompactRemote() throws Throwable {
 
     initManagement(false);
@@ -139,6 +151,7 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
    * @throws Exception
    */
 
+  @Test
   public void testDiskOps() throws Throwable {
 
     initManagement(false);
@@ -152,6 +165,7 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
 
   }
 
+  @Test
   public void testDiskBackupAllMembers() throws Throwable {
     initManagement(false);
     for (VM vm : getManagedNodeList()) {
@@ -169,6 +183,7 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
    * @throws Throwable
    */
   @SuppressWarnings("serial")
+  @Test
   public void testMissingMembers() throws Throwable {
 
     initManagement(false);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
index fb8ae7d..903a3d7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.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.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
@@ -49,6 +58,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  */
 
+@Category(DistributedTest.class)
 public class LocatorManagementDUnitTest extends ManagementTestBase {
 
   /** Default file name for locator log: <code>"locator.log"</code> */
@@ -61,8 +71,8 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
   private VM locator;
   
 
-  public LocatorManagementDUnitTest(String name) {
-    super(name);
+  public LocatorManagementDUnitTest() {
+    super();
   }
 
   private static final long serialVersionUID = 1L;
@@ -83,6 +93,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testPeerLocation() throws Exception {
     int locPort = AvailablePortHelper.getRandomAvailableTCPPort();
     startLocator(locator, true, locPort);
@@ -105,6 +116,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
 
   }
 
+  @Test
   public void testPeerLocationWithPortZero() throws Exception {
     // Start the locator with port=0
     int locPort = startLocator(locator, true, 0);
@@ -132,6 +144,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testColocatedLocator() throws Exception {
     initManagement(false);
     int locPort = AvailablePortHelper.getRandomAvailableTCPPort();
@@ -140,6 +153,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
 
   }
 
+  @Test
   public void testColocatedLocatorWithPortZero() throws Exception {
     initManagement(false);
     int locPort = startLocator(locator, false, 0);
@@ -147,6 +161,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
 
   }
 
+  @Test
   public void testListManagers() throws Exception {
     initManagement(false);
     int locPort = AvailablePortHelper.getRandomAvailableTCPPort();
@@ -154,12 +169,14 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
     listManagers(locator, locPort, false);
   }
 
+  @Test
   public void testListManagersWithPortZero() throws Exception {
     initManagement(false);
     int locPort = startLocator(locator, false, 0);
     listManagers(locator, locPort, false);
   }
 
+  @Test
   public void testWillingManagers() throws Exception {
     int locPort = AvailablePortHelper.getRandomAvailableTCPPort();
     startLocator(locator, true, locPort);
@@ -179,6 +196,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
     listWillingManagers(locator, locPort, false);
   }
 
+  @Test
   public void testWillingManagersWithPortZero() throws Exception {
     int locPort = startLocator(locator, true, 0);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 d699727..15a51bd 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
@@ -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 com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.DistributedMember;
@@ -31,10 +40,11 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import java.util.*;
 
-public class ManagementTestBase extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class ManagementTestBase extends JUnit4DistributedTestCase {
 
-  public ManagementTestBase(String name) {
-    super(name);
+  public ManagementTestBase() {
+    super();
 
   }
 
@@ -203,7 +213,7 @@ public class ManagementTestBase extends DistributedTestCase {
   public Cache createCache(Properties props) {
     System.setProperty("dunitLogPerTest", "true");
     props.setProperty(DistributionConfig.LOG_FILE_NAME, getTestMethodName() + "-.log");
-    ds = (new ManagementTestBase("temp")).getSystem(props);
+    ds = (new ManagementTestBase()).getSystem(props);
     cache = CacheFactory.create(ds);
     managementService = ManagementService.getManagementService(cache);
     logWriter = ds.getLogWriter();
@@ -227,7 +237,7 @@ public class ManagementTestBase extends DistributedTestCase {
     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("temp")).getSystem(props);
+    ds = (new ManagementTestBase()).getSystem(props);
     cache = CacheFactory.create(ds);
     managementService = ManagementService.getManagementService(cache);
     logWriter = ds.getLogWriter();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
index f6bb6c0..b376c4e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.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.lang.management.ManagementFactory;
 
 import com.gemstone.gemfire.cache.Region;
@@ -34,6 +43,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * This test class checks around 89 attributes of Member MBeans
  *
  */
+@Category(DistributedTest.class)
 public class MemberMBeanAttributesDUnitTest extends ManagementTestBase {
   
 
@@ -53,8 +63,8 @@ public class MemberMBeanAttributesDUnitTest extends ManagementTestBase {
 
 
 
-  public MemberMBeanAttributesDUnitTest(String name) {
-    super(name);
+  public MemberMBeanAttributesDUnitTest() {
+    super();
   }
 
   protected void sample(VM vm1) {
@@ -69,6 +79,7 @@ public class MemberMBeanAttributesDUnitTest extends ManagementTestBase {
  
 
   
+  @Test
   public void testReplRegionAttributes() throws Exception{
     initManagement(false);    
     setupForReplicateRegonAttributes(managedNodeList.get(0), 1);
@@ -79,6 +90,7 @@ public class MemberMBeanAttributesDUnitTest extends ManagementTestBase {
   }
   
   
+  @Test
   public void testPRRegionAttributes() throws Exception{
     initManagement(false);    
     setupForPartitionedRegonAttributes(managedNodeList.get(0), 1);    
@@ -87,11 +99,13 @@ public class MemberMBeanAttributesDUnitTest extends ManagementTestBase {
     
   }
   
+  @Test
   public void testOSAttributes() throws Exception{
     initManagement(false);
     isOSRelatedAttrsOK(managedNodeList.get(0));
   }
   
+  @Test
   public void testConfigAttributes() throws Exception {
     initManagement(false);
     isConfigRelatedAttrsOK(managedNodeList.get(0));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
index fc918ff..e3c5518 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.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.Collections;
 import java.util.List;
@@ -52,7 +61,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * Tests the off-heap additions to the RegionMXBean and MemberMXBean JMX interfaces.
  */
 @SuppressWarnings("serial")
-public class OffHeapManagementDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class OffHeapManagementDUnitTest extends JUnit4CacheTestCase {
   /**
    * Specified assertion operations.
    */
@@ -137,8 +147,8 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
    * Creates a new OffHeapManagementDUnitTest.
    * @param name the test name.
    */
-  public OffHeapManagementDUnitTest(String name) {
-    super(name);
+  public OffHeapManagementDUnitTest() {
+    super();
   }
   
   @Override
@@ -165,6 +175,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
    * Tests off-heap additions to the RegionMXBean and MemberMXBean interfaces.
    * @throws Exception
    */
+  @Test
   public void testOffHeapMBeanAttributesAndStats() throws Exception {
     final VM vm = Host.getHost(0).getVM(0);    
 
@@ -213,6 +224,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
    * Tests the fragmentation statistic for off-heap memory.
    * @throws Exception
    */
+  @Test
   public void testFragmentationStat() throws Exception {
     final VM vm = Host.getHost(0).getVM(0);    
 
@@ -303,6 +315,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
    * Tests the compation time statistic for off-heap memory.
    * @throws Exception
    */
+  @Test
   public void testCompactionTimeStat() throws Exception {
     final VM vm = Host.getHost(0).getVM(0);    
 
@@ -361,6 +374,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
   /**
    *  Asserts that a monitor assigned to the OffHeapObjects attribute is triggered.
    */
+  @Test
   public void testOffHeapObjectsMonitoring()  throws Exception {
     final VM vm = Host.getHost(0).getVM(0);    
 
@@ -398,6 +412,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
   /**
    * Asserts that a monitor assigned to the OffHeapFreeSize attribute is triggered.
    */
+  @Test
   public void testOffHeapFreeSizeMonitoring()  throws Exception {
     final VM vm = Host.getHost(0).getVM(0);    
 
@@ -435,6 +450,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
   /**
    * Asserts that a monitor assigned to the OffHeapAllocatedSize attribute is triggered.
    */
+  @Test
   public void testOffHeapAllocatedSizeMonitoring()  throws Exception {
     final VM vm = Host.getHost(0).getVM(0);    
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
index ad26a05..c11dd0b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.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 static com.gemstone.gemfire.cache.query.Utils.createPortfoliosAndPositions;
 
 import java.io.IOException;
@@ -84,6 +93,7 @@ import org.json.JSONObject;
 // ORDER by orders
 // Test all attributes are covered in an complex type
 
+@Category(DistributedTest.class)
 public class QueryDataDUnitTest extends ManagementTestBase {
 
   private static final long serialVersionUID = 1L;
@@ -137,8 +147,8 @@ public class QueryDataDUnitTest extends ManagementTestBase {
   public static String[] queriesForLimit = new String[] { "select * from /" + repRegionName4 };
 
 
-  public QueryDataDUnitTest(String name) {
-    super(name);
+  public QueryDataDUnitTest() {
+    super();
   }
 
   @Override
@@ -315,6 +325,7 @@ public class QueryDataDUnitTest extends ManagementTestBase {
   }
 
   // disabled for bug 49698, serialization problems introduced by r44615
+  @Test
   public void testQueryOnPartitionedRegion() throws Exception {
 
     final DistributedMember member1 = getMember(managedNode1);
@@ -369,6 +380,7 @@ public class QueryDataDUnitTest extends ManagementTestBase {
     });
   }
 
+  @Test
   public void testQueryOnReplicatedRegion() throws Exception {
 
     
@@ -416,6 +428,7 @@ public class QueryDataDUnitTest extends ManagementTestBase {
     });
   }
   
+  @Test
   public void testMemberWise() throws Exception {
 
     final DistributedMember member1 = getMember(managedNode1);
@@ -454,6 +467,7 @@ public class QueryDataDUnitTest extends ManagementTestBase {
 
   
  
+  @Test
   public void testLimitForQuery() throws Exception {
     
     initCommonRegions();
@@ -529,6 +543,7 @@ public class QueryDataDUnitTest extends ManagementTestBase {
     });
   }
 
+  @Test
   public void testErrors() throws Exception{
     
     final DistributedMember member1 = getMember(managedNode1);
@@ -607,7 +622,8 @@ public class QueryDataDUnitTest extends ManagementTestBase {
     });
   }
   
- public void testNormalRegions() throws Exception{
+  @Test
+  public void testNormalRegions() throws Exception{
     
     final DistributedMember member1 = getMember(managedNode1);
     final DistributedMember member2 = getMember(managedNode2);
@@ -659,6 +675,7 @@ public class QueryDataDUnitTest extends ManagementTestBase {
     });
   }
  
+  @Test
   public void testRegionsLocalDataSet() throws Exception {
 
     final DistributedMember member1 = getMember(managedNode1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
index b613c0e..8ff3629 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.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.Arrays;
 import java.util.List;
@@ -65,6 +74,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  * 
  */
+@Category(DistributedTest.class)
 public class RegionManagementDUnitTest extends ManagementTestBase {
 
   private static final long serialVersionUID = 1L;
@@ -100,8 +110,8 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
   private static Region fixedPrRegion;
 
 
-  public RegionManagementDUnitTest(String name) {
-    super(name);
+  public RegionManagementDUnitTest() {
+    super();
 
   }
 
@@ -116,6 +126,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
    * @throws Exception
    */
 
+  @Test
   public void testDistributedRegion() throws Exception {
 
     initManagement(false);
@@ -157,6 +168,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testPartitionedRegion() throws Exception {
     initManagement(false);
 
@@ -196,6 +208,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
    * 
    * @throws Exception
    */
+  @Test
   public void testFixedPRRegionMBean() throws Exception {
 
     initManagement(false);
@@ -233,6 +246,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
    * while region is created in a member node asynchronously.
    * @throws Exception
    */
+  @Test
   public void testRegionAggregate() throws Exception{
     initManagement(true);
 
@@ -279,6 +293,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
 
   }
   
+  @Test
   public void testNavigationAPIS() throws Exception {
     initManagement(true);
     for(VM vm : managedNodeList){
@@ -306,6 +321,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
 
  
   
+  @Test
   public void testSubRegions() throws Exception{
     initManagement(false);
     for (VM vm : managedNodeList) {
@@ -327,6 +343,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
   
   
   
+  @Test
   public void testSpecialRegions() throws Exception{
     initManagement(false);
     createSpecialRegion(managedNodeList.get(0));
@@ -387,6 +404,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
 
   }
   
+  @Test
   public void testLruStats() throws Exception{
     initManagement(false);
     for (VM vm : managedNodeList) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
index 7558295..33c760d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.management.bean.stats;
 
+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 javax.management.ObjectName;
@@ -35,14 +44,16 @@ import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  */
+@Category(DistributedTest.class)
 public class DistributedSystemStatsDUnitTest extends ManagementTestBase{
   
   private static final long serialVersionUID = 1L;
 
-  public DistributedSystemStatsDUnitTest(String name) {
-    super(name);
+  public DistributedSystemStatsDUnitTest() {
+    super();
   }
 
+  @Test
   public void testDistributedSystemStats() throws Exception {
     initManagement(true);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
index cea95c1..47cb708 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.management.internal.cli;
 
+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 java.util.Set;
 
@@ -50,10 +59,11 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  *
  */
-public class CliUtilDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CliUtilDUnitTest extends JUnit4CacheTestCase {
 
-  public CliUtilDUnitTest(String name) {
-    super(name);    
+  public CliUtilDUnitTest() {
+    super();    
   }
 
   public static final String COMMON_REGION="region1";
@@ -230,6 +240,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
     assertNotNull(service.getMemberMXBean());
   }
   
+  @Test
   public void testFileToBytes(){
     
     //CliUtil.filesToBytes(fileNames)
@@ -237,6 +248,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
   }
   
   @SuppressWarnings("serial")
+  @Test
   public void testCliUtilMethods() {
     setupMembersWithIdsAndGroups();
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 b4a43b4..6e6269e 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
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.management.internal.pulse;
 
+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.cache.AttributesFactory;
@@ -53,7 +62,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  */
 
-public class TestClientIdsDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class TestClientIdsDUnitTest extends JUnit4DistributedTestCase {
 
   private static final String k1 = "k1";
   private static final String k2 = "k2";
@@ -75,8 +85,8 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
 
   private ManagementTestBase helper;
 
-  public TestClientIdsDUnitTest(String name) {
-    super(name);
+  public TestClientIdsDUnitTest() {
+    super();
     this.helper = new ManagementTestBase(name);
   }
 
@@ -101,6 +111,7 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
 
   private static final long serialVersionUID = 1L;
 
+  @Test
   public void testClientIds() throws Exception {
     helper.createManagementCache(managingNode);
     helper.startManagingNode(managingNode);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
index 5420542..1ce8ed1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.management.internal.pulse;
 
+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.Cache;
 import com.gemstone.gemfire.cache.execute.Execution;
 import com.gemstone.gemfire.cache.execute.Function;
@@ -35,12 +44,13 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  * 
  */
+@Category(DistributedTest.class)
 public class TestFunctionsDUnitTest extends ManagementTestBase {
 
   private static final long serialVersionUID = 1L;
 
-  public TestFunctionsDUnitTest(String name) {
-    super(name);
+  public TestFunctionsDUnitTest() {
+    super();
   }
 
   public static Integer getNumOfRunningFunction() {
@@ -74,6 +84,7 @@ public class TestFunctionsDUnitTest extends ManagementTestBase {
     return Integer.valueOf(bean.getNumRunningFunctions());
   }
 
+  @Test
   public void testNumOfRunningFunctions() throws Exception {
     initManagement(false);
     VM client = managedNodeList.get(2);    

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
index 5cba6dd..d9fcea9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.management.internal.pulse;
 
+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.management.DistributedSystemMXBean;
 import com.gemstone.gemfire.management.ManagementService;
 import com.gemstone.gemfire.management.ManagementTestBase;
@@ -29,12 +38,13 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  */
 
+@Category(DistributedTest.class)
 public class TestHeapDUnitTest extends ManagementTestBase {
 
   private static final long serialVersionUID = 1L;
 
-  public TestHeapDUnitTest(String name) {
-    super(name);
+  public TestHeapDUnitTest() {
+    super();
   }
 
   public static long getHeapSizeOfClient() {
@@ -68,6 +78,7 @@ public class TestHeapDUnitTest extends ManagementTestBase {
     return bean.getTotalHeapSize() * 1000;
   }
 
+  @Test
   public void testTotalHeapSize() throws Exception {
     initManagement(false);
     long totalHeapSizeOnAll = 0;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
index 3d6a6b8..38f73cb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.management.internal.pulse;
 
+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.management.DistributedSystemMXBean;
 import com.gemstone.gemfire.management.ManagementService;
 import com.gemstone.gemfire.management.ManagementTestBase;
@@ -28,12 +37,13 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  */
 
+@Category(DistributedTest.class)
 public class TestLocatorsDUnitTest extends ManagementTestBase {
 
   private static final long serialVersionUID = 1L;
 
-  public TestLocatorsDUnitTest(String name) {
-    super(name);
+  public TestLocatorsDUnitTest() {
+    super();
   }
 
   public static int getNumOfLocatorFromMBean() {
@@ -62,6 +72,7 @@ public class TestLocatorsDUnitTest extends ManagementTestBase {
     return bean.getLocatorCount();
   }
 
+  @Test
   public void testLocatorsDUnitTest() throws Exception {
     initManagement(false);
     int locatorCount = ((Number) managingNode.invoke(() -> TestLocatorsDUnitTest.getNumOfLocatorFromMBean())).intValue();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 8567822..c86e767 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
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.management.internal.pulse;
 
+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.cache.AttributesFactory;
@@ -54,7 +63,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  */
 
-public class TestSubscriptionsDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class TestSubscriptionsDUnitTest extends JUnit4DistributedTestCase {
   private static final String k1 = "k1";
   private static final String k2 = "k2";
   private static final String client_k1 = "client-k1";
@@ -68,8 +78,8 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
   private static VM managingNode = null;
   private ManagementTestBase helper;
 
-  public TestSubscriptionsDUnitTest(String name) {
-    super(name);
+  public TestSubscriptionsDUnitTest() {
+    super();
     this.helper = new ManagementTestBase(name);
   }
 
@@ -93,6 +103,7 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
 
   private static final long serialVersionUID = 1L;
 
+  @Test
   public void testNoOfSubscription() throws Exception {
 
     helper.createManagementCache(managingNode);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
index e64c821..a965b02 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.pdx;
 
+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.LinkedList;
 import java.util.List;
@@ -69,12 +78,13 @@ import com.gemstone.gemfire.test.dunit.Wait;
 /**
  *
  */
-public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class ClientsWithVersioningRetryDUnitTest extends JUnit4CacheTestCase {
   // list of expected exceptions to remove in tearDown2()
   static List<IgnoredException> expectedExceptions = new LinkedList<IgnoredException>();
 
-  public ClientsWithVersioningRetryDUnitTest(String name) {
-    super(name);
+  public ClientsWithVersioningRetryDUnitTest() {
+    super();
   }
   
   @Override
@@ -108,6 +118,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
    * the version information.
    * second failure in bug 44951
    */
+  @Test
   public void testRetryPut() {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(0);
@@ -185,6 +196,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
    * the version information.
    * bug #45059
    */
+  @Test
   public void testRetryPutAll() {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(0);
@@ -273,6 +285,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
    * and get the version information.
    * bug #48205
    */
+  @Test
   public void testRetryPutAllInAccessor() {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
index 8c00ab3..d086681 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.pdx;
 
+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 org.junit.experimental.categories.Category;
@@ -31,10 +40,11 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
-public class DistributedSystemIdDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class DistributedSystemIdDUnitTest extends JUnit4DistributedTestCase {
   
-  public DistributedSystemIdDUnitTest(String name) {
-    super(name);
+  public DistributedSystemIdDUnitTest() {
+    super();
   }
 
   @Override
@@ -42,6 +52,7 @@ public class DistributedSystemIdDUnitTest extends DistributedTestCase {
     disconnectAllFromDS(); // GEODE-558 test fails due to infection from another test
   }
 
+  @Test
   public void testMatchingIds() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -58,6 +69,7 @@ public class DistributedSystemIdDUnitTest extends DistributedTestCase {
     
   }
   
+  @Test
   public void testInfectiousId() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -69,6 +81,7 @@ public class DistributedSystemIdDUnitTest extends DistributedTestCase {
     checkId(vm1, 1);
   }
   
+  @Test
   public void testMismatch() {
     IgnoredException.addIgnoredException("Rejected new system node");
     Host host = Host.getHost(0);
@@ -87,6 +100,7 @@ public class DistributedSystemIdDUnitTest extends DistributedTestCase {
     checkId(vm0, 1);
   }
   
+  @Test
   public void testInvalid() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
index d76b5bd..ca7d661 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
@@ -15,6 +15,15 @@
  * limitations under the License.
  */
 package com.gemstone.gemfire.pdx;
+
+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.FileInputStream;
@@ -52,10 +61,11 @@ import org.json.JSONObject;
 /**
  *
  */
-public class JSONPdxClientServerDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class JSONPdxClientServerDUnitTest extends JUnit4CacheTestCase {
 
-  public JSONPdxClientServerDUnitTest(String name) {
-    super(name);
+  public JSONPdxClientServerDUnitTest() {
+    super();
   }
   
   @Override
@@ -66,6 +76,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
     disconnectAllFromDS();
   }
 
+  @Test
   public void testSimplePut() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -95,6 +106,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
   }
   
   //this is for unquote fielnames in json string
+  @Test
   public void testSimplePut2() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -117,6 +129,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
      
   }
   
+  @Test
   public void testPdxInstanceAndJSONConversion() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/pdx/PDXAsyncEventQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PDXAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PDXAsyncEventQueueDUnitTest.java
index a4b81cb..6854361 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PDXAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PDXAsyncEventQueueDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.pdx;
 
+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.List;
 import java.util.Properties;
 
@@ -37,10 +46,11 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
 
-public class PDXAsyncEventQueueDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PDXAsyncEventQueueDUnitTest extends JUnit4CacheTestCase {
 
-  public PDXAsyncEventQueueDUnitTest(String name) {
-    super(name);
+  public PDXAsyncEventQueueDUnitTest() {
+    super();
   }
   
   /**
@@ -48,6 +58,7 @@ public class PDXAsyncEventQueueDUnitTest extends CacheTestCase {
    * type registry.
    */
   
+  @Test
   public void testNonPersistentPDXCreateQueueFirst() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -61,6 +72,7 @@ public class PDXAsyncEventQueueDUnitTest extends CacheTestCase {
    * Test that an async queue doesn't require a persistent PDX
    * type registry.
    */
+  @Test
   public void testNonPersistentPDXCreatePDXFirst() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
index 6c41e86..69603a5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.pdx;
 
+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.util.Properties;
@@ -52,12 +61,14 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  *
  */
-public class PdxClientServerDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PdxClientServerDUnitTest extends JUnit4CacheTestCase {
 
-  public PdxClientServerDUnitTest(String name) {
-    super(name);
+  public PdxClientServerDUnitTest() {
+    super();
   }
 
+  @Test
   public void testSimplePut() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -96,6 +107,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
    * registry if the server is restarted and PDX serialization
    * for a class has changed.  This was reported in Pivotal bug #47338
    */
+  @Test
   public void testNonPersistentServerRestart() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -181,6 +193,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
    * Test of bug 47338 - what happens to the client type
    * registry if the server is restarted.
    */
+  @Test
   public void testNonPersistentServerRestartAutoSerializer() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -268,6 +281,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
    * Test that we through an exception if one of the servers has persistent
    * regions but not a persistent registry.
    */
+  @Test
   public void testServersWithPersistence() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -305,6 +319,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testPutThreadLocalConnections() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -339,6 +354,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
 
   }
   
+  @Test
   public void testSimplePdxInstancePut() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -390,6 +406,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
    * in multiple distributed systems.
    * @throws Exception 
    */
+  @Test
   public void testMultipleServerDSes() throws Exception {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(0);
@@ -457,6 +474,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
     assertEquals(new SimpleClass(57, (byte) 3), r.get(1));
   }
   
+  @Test
   public void testUserSerializesObject() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -498,6 +516,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
    * Test that we still use the client
    * type registry, even if pool is created late.
    */
+  @Test
   public void testLatePoolCreation() {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(0);
@@ -550,6 +569,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
    * tries to create a pool after we were forced to use a peer
    * type registry.
    */
+  @Test
   public void testExceptionWithPoolAfterTypeRegistryCreation() {
     Host host = Host.getHost(0);
     final VM vm0 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
index fde1a27..380dfe0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.pdx;
 
+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 com.gemstone.gemfire.SerializationException;
@@ -54,16 +63,18 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  *
  */
-public class PdxDeserializationDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PdxDeserializationDUnitTest extends JUnit4CacheTestCase {
 
-  public PdxDeserializationDUnitTest(String name) {
-    super(name);
+  public PdxDeserializationDUnitTest() {
+    super();
   }
   
   /**
    * Test that we don't deserialize objects on a remote peer
    * when performing operations. 
    */
+  @Test
   public void testP2P() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -77,6 +88,7 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
    * Test to make sure we don't deserialize
    * objects on a server that is a datastore 
    */
+  @Test
   public void testClientToDataStore() {
     Host host = Host.getHost(0);
     VM vm1 = host.getVM(1);
@@ -89,6 +101,7 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
    * Test to make sure we don't deserialize
    * objects on a server that is an accessor.
    */
+  @Test
   public void testClientToAccessor() {
     Host host = Host.getHost(0);
     VM vm1 = host.getVM(1);
@@ -101,6 +114,7 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
    * Test to make sure we don't deserialize
    * objects on a client that has registered interest.
    */
+  @Test
   public void testAccessorToClient() {
     Host host = Host.getHost(0);
     VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java
index 3621016..ca407b7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.pdx;
 
+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.List;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
@@ -39,12 +48,14 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
 
-public class PdxSerializableDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PdxSerializableDUnitTest extends JUnit4CacheTestCase {
 
-  public PdxSerializableDUnitTest(String name) {
-    super(name);
+  public PdxSerializableDUnitTest() {
+    super();
   }
   
+  @Test
   public void testSimplePut() {
     Host host = Host.getHost(0);
     VM vm1 = host.getVM(0);
@@ -93,6 +104,7 @@ public class PdxSerializableDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testTransactionCallbacksNotInvoked() {
     Host host = Host.getHost(0);
     VM vm1 = host.getVM(0);
@@ -135,6 +147,7 @@ public class PdxSerializableDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testPersistenceDefaultDiskStore() throws Throwable {
     
     SerializableCallable createRegion = new SerializableCallable() {
@@ -154,6 +167,7 @@ public class PdxSerializableDUnitTest extends CacheTestCase {
     persistenceTest(createRegion);
   }
   
+  @Test
   public void testPersistenceExplicitDiskStore() throws Throwable {
     SerializableCallable createRegion = new SerializableCallable() {
       public Object call() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
index 58f2128..48a6511 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.pdx;
 
+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.Collection;
 
 import com.examples.snapshot.MyObjectPdx;
@@ -39,12 +48,14 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 
-public class PdxTypeExportDUnitTest extends CacheTestCase {
-  public PdxTypeExportDUnitTest(String name) {
-    super(name);
+@Category(DistributedTest.class)
+public class PdxTypeExportDUnitTest extends JUnit4CacheTestCase {
+  public PdxTypeExportDUnitTest() {
+    super();
   }
 
   
+  @Test
   public void testPeer() throws Exception {
     Region r = getCache().getRegion("pdxtest");
     r.get(1);
@@ -57,6 +68,7 @@ public class PdxTypeExportDUnitTest extends CacheTestCase {
     assertEquals(MyEnumPdx.const1.name(), enums.iterator().next().getEnum().name());
   }
   
+  @Test
   public void testClient() throws Exception {
     SerializableCallable test = new SerializableCallable() {
       @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 23f202d..479b778 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
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.redis;
 
+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.Random;
 
 import org.junit.experimental.categories.Category;
@@ -34,7 +43,8 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
-public class RedisDistDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class RedisDistDUnitTest extends JUnit4DistributedTestCase {
 
   public static final String TEST_KEY = "key";
   public static int pushes = 200;
@@ -108,6 +118,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
   }
 
   @Category(FlakyTest.class) // GEODE-1092: random ports, failure stack involves TCPTransport ConnectionHandler (are we eating BindExceptions somewhere?), uses Random, async actions
+  @Test
   public void testConcListOps() throws Throwable {
     final Jedis jedis1 = new Jedis(localHost, server1Port, JEDIS_TIMEOUT);
     final Jedis jedis2 = new Jedis(localHost, server2Port, JEDIS_TIMEOUT);
@@ -143,6 +154,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
   }
 
   @Category(FlakyTest.class) // GEODE-717: random ports, BindException in failure stack, async actions
+  @Test
   public void testConcCreateDestroy() throws Throwable {
     IgnoredException.addIgnoredException("RegionDestroyedException");
     IgnoredException.addIgnoredException("IndexInvalidException");
@@ -203,6 +215,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
    * Just make sure there are no unexpected server crashes
    * @throws Throwable 
    */
+  @Test
   public void testConcOps() throws Throwable {
 
     final int ops = 100;


Mime
View raw message