geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [20/29] incubator-geode git commit: Converting dunits to junit 4 using dunits_to_junit4.sh
Date Tue, 24 May 2016 00:31:45 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
index af25980..9037b4a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.distributed.internal.DistributionConfig;
@@ -32,11 +41,12 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  * 
  * @since 9.0
  */
+@Category(DistributedTest.class)
 public class OffHeapLRUEvictionControllerDUnitTest extends
     LRUEvictionControllerDUnitTest {
 
-  public OffHeapLRUEvictionControllerDUnitTest(String name) {
-    super(name);
+  public OffHeapLRUEvictionControllerDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java
index 3a202c6..8fb4487 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java
@@ -15,6 +15,15 @@
  * limitations under the License.
  */
 package com.gemstone.gemfire.cache30;
+
+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.HashSet;
@@ -54,7 +63,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  *
  */
-public class PRBucketSynchronizationDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PRBucketSynchronizationDUnitTest extends JUnit4CacheTestCase {
   static enum TestType {
     IN_MEMORY,
     OVERFLOW,
@@ -63,18 +73,21 @@ public class PRBucketSynchronizationDUnitTest extends CacheTestCase {
   
   public static LocalRegion TestRegion;
 
-  public PRBucketSynchronizationDUnitTest(String name) {
-    super(name);
+  public PRBucketSynchronizationDUnitTest() {
+    super();
   }
 
+  @Test
   public void testThatBucketSyncOnPrimaryLoss() {
     doBucketsSyncOnPrimaryLoss(TestType.IN_MEMORY);
   }
   
+  @Test
   public void testThatBucketsSyncOnPrimaryLossWithPersistence() {
     doBucketsSyncOnPrimaryLoss(TestType.PERSISTENT);
   }
   
+  @Test
   public void testThatBucketsSyncOnPrimaryLossWithOverflow() {
     doBucketsSyncOnPrimaryLoss(TestType.OVERFLOW);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
index f433c24..43ccfea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.AttributesFactory;
 import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.compression.Compressor;
@@ -26,11 +35,12 @@ import com.gemstone.gemfire.compression.SnappyCompressor;
  * 
  * @since 8.0
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionCompressionDUnitTest extends
     PartitionedRegionDUnitTest {
   
-  public PartitionedRegionCompressionDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionCompressionDUnitTest() {
+    super();
   }
 
   @SuppressWarnings({ "rawtypes", "unchecked" })

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
index e46a223..959beb9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.Serializable;
 import java.util.Collection;
 import java.util.Iterator;
@@ -57,12 +66,13 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  *
  * @since 5.1
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
   
   static int oldLogLevel;
 
-  public PartitionedRegionDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionDUnitTest() {
+    super();
   }
   
   /*
@@ -95,16 +105,19 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
    */
   protected boolean supportsLocalDestroyAndLocalInvalidate() { return false; }
   
+  @Test
   public void testCacheLoaderModifyingArgument() throws InterruptedException {
     // TODO, implement a specific PR related test that properly reflects primary allocation
     // and event deliver based on that allocation
   }
 
+  @Test
   public void testLocalAndRemoteCacheWriters() throws InterruptedException {
     // TODO, implement a specific PR related test that properly reflects primary allocation
     // and event deliver based on that allocation
   }
 
+  @Test
   public void testLocalCacheLoader() {
     // TODO, implement a specific PR related test that properly reflects primary allocation
     // and event deliver based on that allocation
@@ -174,6 +187,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testRegionInvalidationWithAdjunctMessages() throws Exception {
     final String name = getUniqueName();
     VM vm1 = Host.getHost(0).getVM(1);
@@ -216,6 +230,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
    *
    * @see Region#createSubregion
    */
+  @Test
   public void testIncompatibleSubregions()
     throws CacheException, InterruptedException {
 
@@ -313,6 +328,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
    * test with multiple vms and a decent spread of keys
    */
   @Category(FlakyTest.class) // GEODE-555: retry loops, use of Random
+  @Test
   public void testExtendedKeysValues() {
     final String regionName = getUniqueName();
     final int numEntries = 20000;
@@ -375,9 +391,11 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
   }
   
   // these tests make no sense for partitioned regions
+  @Test
   public void testDefinedEntryUpdated() {
     unimplemented();
   }
+  @Test
   public void testRemoteCacheListener() {
     unimplemented();
   }
@@ -418,24 +436,30 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
   
 
   // user attributes aren't supported in partitioned regions at this time (5.1)
+  @Test
   public void testEntryUserAttribute() {
     unimplemented();
   }
 
   
   // these tests require misc Region operations not currently supported by PRs
+  @Test
   public void testInvalidateRegion() {
     unimplemented();
   }
+  @Test
   public void testLocalDestroyRegion() {
     unimplemented();
   }
+  @Test
   public void testLocalInvalidateRegion() {
     unimplemented();
   }
+  @Test
   public void testSnapshot() {
     unimplemented();
   }
+  @Test
   public void testRootSnapshot() {
     unimplemented();
   }
@@ -490,6 +514,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
     }
   }
   
+  @Test
   public void testBadHash() {
     final String regionName = getUniqueName();
     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/cache30/PartitionedRegionMembershipListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionMembershipListenerDUnitTest.java
index 8876fd7..311d3fb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionMembershipListenerDUnitTest.java
@@ -20,6 +20,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.Arrays;
 import java.util.List;
 
@@ -36,14 +45,15 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * @since 6.0
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionMembershipListenerDUnitTest extends
     RegionMembershipListenerDUnitTest {
   
   private transient MyRML myPRListener;
   private transient Region prr; // root region
 
-  public PartitionedRegionMembershipListenerDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionMembershipListenerDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
index 897e9b9..b227c58 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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;
@@ -30,10 +39,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  * 
  * @since 9.0
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionOffHeapDUnitTest extends PartitionedRegionDUnitTest {
 
-  public PartitionedRegionOffHeapDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionOffHeapDUnitTest() {
+    super();
   }
   
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java
index 7b0488a..a93c50b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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;
 
@@ -50,15 +59,16 @@ import com.gemstone.gemfire.test.dunit.VM;
  *
  * @since 5.0
  */
-public class ProxyDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class ProxyDUnitTest extends JUnit4CacheTestCase {
 
   private transient Region r;
   private transient DistributedMember otherId;
   protected transient int clInvokeCount;
   protected transient CacheEvent clLastEvent;
   
-  public ProxyDUnitTest(String name) {
-    super(name);
+  public ProxyDUnitTest() {
+    super();
   }
 
   private VM getOtherVm() {
@@ -532,13 +542,16 @@ public class ProxyDUnitTest extends CacheTestCase {
     assertTrue(r.isDestroyed());
   }
   
+  @Test
   public void testDistributedOpsPROXY() throws CacheException {
     distributedOps(DataPolicy.EMPTY, InterestPolicy.CACHE_CONTENT);
   }
 
+  @Test
   public void testRemoteOriginOpsPROXY() throws CacheException {
     remoteOriginOps(DataPolicy.EMPTY, InterestPolicy.CACHE_CONTENT);
   }
+  @Test
   public void testRemoteOriginOpsPROXY_ALL() throws CacheException {
     remoteOriginOps(DataPolicy.EMPTY, InterestPolicy.ALL);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java
index a2019bf..e23e87e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java
@@ -22,6 +22,15 @@
 */
 package com.gemstone.gemfire.cache30;
 
+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;
 import java.util.Properties;
@@ -50,11 +59,12 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**
  *
  */
-public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class PutAllCallBkRemoteVMDUnitTest extends JUnit4DistributedTestCase {
     
     /** Creates a new instance of PutAllCallBkRemoteVMDUnitTest */
-    public PutAllCallBkRemoteVMDUnitTest(String name) {
-        super(name);
+    public PutAllCallBkRemoteVMDUnitTest() {
+        super();
     }
     
     static volatile Cache cache;
@@ -96,7 +106,7 @@ public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase {
     
     public static synchronized void createCacheForVM0(){
         try{
-            ds = (new PutAllCallBkRemoteVMDUnitTest("temp")).getSystem(props);
+            ds = (new PutAllCallBkRemoteVMDUnitTest()).getSystem(props);
             cache = CacheFactory.create(ds);
             AttributesFactory factory  = new AttributesFactory();
             factory.setDataPolicy(DataPolicy.REPLICATE);
@@ -116,7 +126,7 @@ public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase {
             CacheListener aListener = new AfterCreateCallback();
             CacheWriter aWriter = new BeforeCreateCallback();
             
-            ds = (new PutAllCallBkRemoteVMDUnitTest("temp")).getSystem(props);
+            ds = (new PutAllCallBkRemoteVMDUnitTest()).getSystem(props);
             cache = CacheFactory.create(ds);
             AttributesFactory factory  = new AttributesFactory();
             factory.setDataPolicy(DataPolicy.REPLICATE);
@@ -148,7 +158,8 @@ public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase {
     
     //test methods
     
-    public void testputAllRemoteVM(){
+  @Test
+  public void testputAllRemoteVM(){
         
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
@@ -214,7 +225,8 @@ public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase {
         
     }
     
-    public void testPutAllAfterUpdateCallbacks(){
+  @Test
+  public void testPutAllAfterUpdateCallbacks(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(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/cache30/PutAllCallBkSingleVMDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
index faeb8b3..596afde 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
@@ -22,6 +22,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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;
 import java.util.Properties;
@@ -45,11 +54,12 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.VM;
 
-public class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{
+@Category(DistributedTest.class)
+public class PutAllCallBkSingleVMDUnitTest extends JUnit4DistributedTestCase{
     
     /** Creates a new instance of PutAllCallBkSingleVMDUnitTest */
-    public PutAllCallBkSingleVMDUnitTest(String name) {
-        super(name);
+    public PutAllCallBkSingleVMDUnitTest() {
+        super();
     }
     
     static volatile Cache cache;
@@ -89,7 +99,7 @@ public class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{
         try{
             CacheListener aListener = new AfterCreateCallback();
             CacheWriter aWriter = new BeforeCreateCallback();            
-            ds = (new PutAllCallBkSingleVMDUnitTest("temp")).getSystem(props);
+            ds = (new PutAllCallBkSingleVMDUnitTest()).getSystem(props);
             cache = CacheFactory.create(ds);
             AttributesFactory factory  = new AttributesFactory();
             factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -118,7 +128,8 @@ public class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{
     }
 
     //test methods
-    public void testputAllSingleVM(){
+  @Test
+  public void testputAllSingleVM(){
         
         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/cache30/PutAllMultiVmDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java
index cee7263..46b5c47 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java
@@ -22,6 +22,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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;
 import java.util.Properties;
@@ -47,11 +56,12 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  *
  */
-public class PutAllMultiVmDUnitTest extends DistributedTestCase{
+@Category(DistributedTest.class)
+public class PutAllMultiVmDUnitTest extends JUnit4DistributedTestCase{
     
     /** Creates a new instance of PutAllMultiVmDUnitTest */
-    public PutAllMultiVmDUnitTest(String name) {
-        super(name);
+    public PutAllMultiVmDUnitTest() {
+        super();
     }
     
     static Cache cache;
@@ -84,7 +94,7 @@ public class PutAllMultiVmDUnitTest extends DistributedTestCase{
     
     public static void createCache(){
         try{
-            ds = (new PutAllMultiVmDUnitTest("temp")).getSystem(props);
+            ds = (new PutAllMultiVmDUnitTest()).getSystem(props);
             cache = CacheFactory.create(ds);
             AttributesFactory factory  = new AttributesFactory();
             factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -122,7 +132,8 @@ public class PutAllMultiVmDUnitTest extends DistributedTestCase{
     
     //tests methods
     
-    public void testSimplePutAll(){
+  @Test
+  public void testSimplePutAll(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);
@@ -226,7 +237,8 @@ public class PutAllMultiVmDUnitTest extends DistributedTestCase{
         
     }//end of testSimplePutAll
     
-    public void testPutAllExceptions(){
+  @Test
+  public void testPutAllExceptions(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);
@@ -326,7 +338,8 @@ public class PutAllMultiVmDUnitTest extends DistributedTestCase{
         
     }//end of testPutAllExceptions
     
-    public void testPutAllExceptionHandling(){
+  @Test
+  public void testPutAllExceptionHandling(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(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/cache30/QueueMsgDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
index 76c1b03..9cdca4f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.Map;
 import java.util.Properties;
@@ -46,10 +55,11 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  *
  * @since 5.0
  */
+@Category(DistributedTest.class)
 public class QueueMsgDUnitTest extends ReliabilityTestCase {
 
-  public QueueMsgDUnitTest(String name) {
-    super(name);
+  public QueueMsgDUnitTest() {
+    super();
   }
 
   /**
@@ -305,6 +315,7 @@ public class QueueMsgDUnitTest extends ReliabilityTestCase {
                                   expectedExceptions + "</ExpectedException>");
     }
   }
+  @Test
   public void testEmpty() {
     // just to dunit happy
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java
index fe39484..37e0bda 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java
@@ -15,6 +15,15 @@
  * limitations under the License.
  */
 package com.gemstone.gemfire.cache30;
+
+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;
@@ -58,7 +67,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  *
  */
-public class RRSynchronizationDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class RRSynchronizationDUnitTest extends JUnit4CacheTestCase {
   static enum TestType {
     IN_MEMORY,
     OVERFLOW,
@@ -67,18 +77,21 @@ public class RRSynchronizationDUnitTest extends CacheTestCase {
   
   public static LocalRegion TestRegion;
 
-  public RRSynchronizationDUnitTest(String name) {
-    super(name);
+  public RRSynchronizationDUnitTest() {
+    super();
   }
 
+  @Test
   public void testThatRegionsSyncOnPeerLoss() {
     doRegionsSyncOnPeerLoss(TestType.IN_MEMORY);
   }
   
+  @Test
   public void testThatRegionsSyncOnPeerLossWithPersistence() {
     doRegionsSyncOnPeerLoss(TestType.PERSISTENT);
   }
   
+  @Test
   public void testThatRegionsSyncOnPeerLossWithOverflow() {
     doRegionsSyncOnPeerLoss(TestType.OVERFLOW);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index 948e75a..ad3f8d1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.CancelException;
 import com.gemstone.gemfire.SystemFailure;
 import com.gemstone.gemfire.cache.*;
@@ -49,7 +58,8 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 @SuppressWarnings("serial")
-public class ReconnectDUnitTest extends CacheTestCase
+@Category(DistributedTest.class)
+public class ReconnectDUnitTest extends JUnit4CacheTestCase
 {
   static int locatorPort;
   static Locator locator;
@@ -61,8 +71,8 @@ public class ReconnectDUnitTest extends CacheTestCase
   static Properties dsProperties;
   static String fileSeparator = File.separator;
 
-  public ReconnectDUnitTest(String name) {
-    super(name);
+  public ReconnectDUnitTest() {
+    super();
   }
   
   @Override
@@ -168,6 +178,7 @@ public class ReconnectDUnitTest extends CacheTestCase
   }
 
 
+  @Test
   public void testReconnectWithQuorum() throws Exception {
     // quorum check fails, then succeeds
     IgnoredException.addIgnoredException("killing member's ds");
@@ -229,6 +240,7 @@ public class ReconnectDUnitTest extends CacheTestCase
 
   }
   
+  @Test
   public void testReconnectOnForcedDisconnect() throws Exception  {
     doTestReconnectOnForcedDisconnect(false);
   }
@@ -236,6 +248,7 @@ public class ReconnectDUnitTest extends CacheTestCase
   /** bug #51335 - customer is also trying to recreate the cache */
   // this test is disabled due to a high failure rate during CI test runs.
   // see bug #52160
+  @Test
   public void testReconnectCollidesWithApplication() throws Exception  {
     doTestReconnectOnForcedDisconnect(true);
   }
@@ -456,6 +469,7 @@ public class ReconnectDUnitTest extends CacheTestCase
   
 
   @Category(FlakyTest.class) // GEODE-1407
+  @Test
   public void testReconnectALocator() throws Exception {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -610,6 +624,7 @@ public class ReconnectDUnitTest extends CacheTestCase
    * see if the reconnect is triggered for the configured number of times
    */
   
+  @Test
   public void testReconnectWithRoleLoss() throws TimeoutException,
       RegionExistsException  {
 
@@ -1026,6 +1041,7 @@ public class ReconnectDUnitTest extends CacheTestCase
    * listener to crash the reconnecting distributed system during cache
    * creation and asserts that it then reconnects and rebuilds the cache.
    */
+  @Test
   public void testReconnectFailsInCacheCreation() throws Exception {
 
     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/cache30/ReconnectedCacheServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
index 46ff2b7..6f2c7fa 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
@@ -15,6 +15,15 @@
  * limitations under the License.
  */
 package com.gemstone.gemfire.cache30;
+
+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.server.CacheServer;
@@ -25,10 +34,11 @@ import com.gemstone.gemfire.internal.cache.CacheServerLauncher;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 
 
-public class ReconnectedCacheServerDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class ReconnectedCacheServerDUnitTest extends JUnit4CacheTestCase {
 
-  public ReconnectedCacheServerDUnitTest(String name) {
-    super(name);
+  public ReconnectedCacheServerDUnitTest() {
+    super();
   }
 
   private static final long serialVersionUID = 1L;
@@ -56,6 +66,7 @@ public class ReconnectedCacheServerDUnitTest extends CacheTestCase {
     }
   }
 
+  @Test
   public void testCacheServerConfigRetained() {
     // make sure the environment isn't polluted
     assertFalse(Boolean.getBoolean("gemfire.autoReconnect-useCacheXMLFile"));
@@ -72,6 +83,7 @@ public class ReconnectedCacheServerDUnitTest extends CacheTestCase {
     assertNotNull(gc.getCacheConfig().getCacheServerCreation());
   }
 
+  @Test
   public void testDefaultCacheServerNotCreatedOnReconnect() {
     
     assertFalse(Boolean.getBoolean("gemfire.autoReconnect-useCacheXMLFile"));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java
index fe70582..6992d10 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.*;
 import com.gemstone.gemfire.cache.Region.Entry;
 
@@ -37,8 +46,8 @@ import java.util.Properties;
 public abstract class RegionAttributesTestCase
   extends RegionTestCase {
 
-  public RegionAttributesTestCase(String name) {
-    super(name);
+  public RegionAttributesTestCase() {
+    super();
   }
 
   protected static class TestExpiry implements CustomExpiry, Declarable {
@@ -76,6 +85,7 @@ public abstract class RegionAttributesTestCase
    * region's attributes.  Also tests the return values of the mutator
    * methods.
    */
+  @Test
   public void testAttributesMutator() throws CacheException {
     String name = this.getUniqueName();
     AttributesFactory fac = new AttributesFactory(getRegionAttributes());
@@ -160,6 +170,7 @@ public abstract class RegionAttributesTestCase
    * Tests sending <code>null</code> or bogus values to an {@link
    * AttributesMutator}.
    */
+  @Test
   public void testAttributesMutatorBogus() throws CacheException {
     String name = this.getUniqueName();
     Region region = createRegion(name);
@@ -233,6 +244,7 @@ public abstract class RegionAttributesTestCase
   }
 
   /** Test to make sure region attributes take */
+  @Test
   public void testRegionAttributes() throws CacheException {
     // @todo for now just test concurrencyLevel, add tests for the rest
     AttributesFactory factory = new AttributesFactory();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java
index 4187aaf..3031314 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.AttributesFactory;
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.ExpirationAction;
@@ -38,10 +47,11 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  *
  * @since 3.0
  */
-public class RegionExpirationDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class RegionExpirationDUnitTest extends JUnit4CacheTestCase {
 
-  public RegionExpirationDUnitTest(String name) {
-    super(name);
+  public RegionExpirationDUnitTest() {
+    super();
   }
 
 //  /**
@@ -58,6 +68,7 @@ public class RegionExpirationDUnitTest extends CacheTestCase {
    * Test internal methods that encode & decode time
    */
   /* The encode and decode time methods are now private in MetaMap
+  @Test
   public void testTimeEncoding() throws CacheException {
     Region r = createRegion(getUniqueName(), getRegionAttributes());
     long start = ((InternalDistributedSystem)getCache().getDistributedSystem()).getStartTime();
@@ -74,30 +85,35 @@ public class RegionExpirationDUnitTest extends CacheTestCase {
   }
    */
 
+  @Test
   public void testRegionTTLLocalDestroy()
   throws CacheException, InterruptedException
   {
     _testRegionTTL(getUniqueName(), ExpirationAction.LOCAL_DESTROY);
   }
 
+  @Test
   public void testRegionTTLDestroy()
   throws CacheException, InterruptedException
   {
     _testRegionTTL(getUniqueName(), ExpirationAction.DESTROY);
   }
 
+  @Test
   public void testRegionTTLLocalInvalidate()
   throws CacheException, InterruptedException
   {
     _testRegionTTL(getUniqueName(), ExpirationAction.LOCAL_INVALIDATE);
   }
 
+  @Test
   public void testRegionTTLInvalidate()
   throws CacheException, InterruptedException
   {
     _testRegionTTL(getUniqueName(), ExpirationAction.INVALIDATE);
   }
 
+  @Test
   public void testRegionTTLAfterMutating()
   throws InterruptedException, CacheException
   {
@@ -129,6 +145,7 @@ public class RegionExpirationDUnitTest extends CacheTestCase {
     Wait.waitForCriterion(wc, 30 * 1000, 1000, true);
   }
 
+  @Test
   public void testWhenBothTtlAndIdleAreSet() 
   throws InterruptedException, CacheException
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
index 2f6b7a5..2b25cd9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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;
@@ -48,7 +57,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  *
  * @since 5.0
  */
-public class RegionMembershipListenerDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class RegionMembershipListenerDUnitTest extends JUnit4CacheTestCase {
 
   private transient MyRML myListener;
   private transient MyRML mySRListener;
@@ -56,8 +66,8 @@ public class RegionMembershipListenerDUnitTest extends CacheTestCase {
   private transient Region sr; // subregion
   protected transient DistributedMember otherId;
   
-  public RegionMembershipListenerDUnitTest(String name) {
-    super(name);
+  public RegionMembershipListenerDUnitTest() {
+    super();
   }
   
   @Override
@@ -163,6 +173,7 @@ public class RegionMembershipListenerDUnitTest extends CacheTestCase {
   /**
    * tests {@link RegionMembershipListener#initialMembers}
    */
+  @Test
   public void testInitialMembers() throws CacheException {
     final String rName = getUniqueName();
     initOtherId();
@@ -204,6 +215,7 @@ public class RegionMembershipListenerDUnitTest extends CacheTestCase {
   /**
    * tests {@link RegionMembershipListener#afterRemoteRegionCreate}
    */
+  @Test
   public void testCreate() throws CacheException {
     final String rName = getUniqueName();
     initOtherId();
@@ -237,6 +249,7 @@ public class RegionMembershipListenerDUnitTest extends CacheTestCase {
   /**
    * tests {@link RegionMembershipListener#afterRemoteRegionDeparture}
    */
+  @Test
   public void testDeparture() throws CacheException {
     final String rName = getUniqueName();
     initOtherId();
@@ -281,6 +294,7 @@ public class RegionMembershipListenerDUnitTest extends CacheTestCase {
   /**
    * tests {@link RegionMembershipListener#afterRemoteRegionCrash}
    */
+  @Test
   public void testCrash() throws CacheException {
     final String rName = getUniqueName();
     initOtherId();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java
index 6bbee08..983b3ac 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.*;
 
 /**
@@ -24,10 +33,11 @@ import com.gemstone.gemfire.cache.*;
  *
  * @since 5.0
  */
+@Category(DistributedTest.class)
 public class RegionReliabilityDistAckDUnitTest extends RegionReliabilityTestCase {
 
-  public RegionReliabilityDistAckDUnitTest(String name) {
-    super(name);
+  public RegionReliabilityDistAckDUnitTest() {
+    super();
   }
   
   protected Scope getRegionScope() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java
index 31f0897..e124d51 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.*;
 
 /**
@@ -24,10 +33,11 @@ import com.gemstone.gemfire.cache.*;
  *
  * @since 5.0
  */
+@Category(DistributedTest.class)
 public class RegionReliabilityDistNoAckDUnitTest extends RegionReliabilityTestCase {
 
-  public RegionReliabilityDistNoAckDUnitTest(String name) {
-    super(name);
+  public RegionReliabilityDistNoAckDUnitTest() {
+    super();
   }
   
   protected Scope getRegionScope() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java
index 4e3be2e..7e4f229 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.*;
 
 /**
@@ -24,10 +33,11 @@ import com.gemstone.gemfire.cache.*;
  *
  * @since 5.0
  */
+@Category(DistributedTest.class)
 public class RegionReliabilityGlobalDUnitTest extends RegionReliabilityTestCase {
 
-  public RegionReliabilityGlobalDUnitTest(String name) {
-    super(name);
+  public RegionReliabilityGlobalDUnitTest() {
+    super();
   }
   
   protected Scope getRegionScope() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
index dfb2470..5d7c413 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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;
 
@@ -41,18 +50,20 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  *
  * @since 5.0
  */
+@Category(DistributedTest.class)
 public class RegionReliabilityListenerDUnitTest extends ReliabilityTestCase {
 
   protected static transient Set rolesGain = null;
   protected static transient Set rolesLoss = null;
   
-  public RegionReliabilityListenerDUnitTest(String name) {
-    super(name);
+  public RegionReliabilityListenerDUnitTest() {
+    super();
   }
   
   /**
    * Tests the notification of afterRoleGain and afterRoleLoss
    */
+  @Test
   public void testRoleGainAndLoss() throws Exception {
     final String name = this.getUniqueName();
     final int vm0 = 0;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index 30bf72c..b29d3d1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.ByteArrayOutputStream;
 import java.util.HashMap;
@@ -82,8 +91,8 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  */
 public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
 
-  public RegionReliabilityTestCase(String name) {
-    super(name);
+  public RegionReliabilityTestCase() {
+    super();
   }
 
   @Override
@@ -454,6 +463,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   /**
    * Tests affect of NO_ACCESS on region operations.
    */
+  @Test
   public void testNoAccess() throws Exception {
     final String name = this.getUniqueName();
     
@@ -540,6 +550,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   /**
    * Tests affect of NO_ACCESS on local entry expiration actions.
    */
+  @Test
   public void testNoAccessWithLocalEntryExpiration() throws Exception {
     final String name = this.getUniqueName();
     
@@ -621,6 +632,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   /**
    * Tests affect of NO_ACCESS on local region expiration actions.
    */
+  @Test
   public void testNoAccessWithLocalRegionExpiration() throws Exception {
     final String name = this.getUniqueName();
     
@@ -679,6 +691,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   /**
    * Tests affect of LIMITED_ACCESS on region operations.
    */
+  @Test
   public void testLimitedAccess() throws Exception {
     final String name = this.getUniqueName();
     
@@ -762,6 +775,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   /**
    * Tests affect of LIMITED_ACCESS on local entry expiration actions.
    */
+  @Test
   public void testLimitedAccessWithLocalEntryExpiration() throws Exception {
     final String name = this.getUniqueName();
     
@@ -850,6 +864,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   /**
    * Tests affect of LIMITED_ACCESS on local region expiration actions.
    */
+  @Test
   public void testLimitedAccessWithLocalRegionExpiration() throws Exception {
     final String name = this.getUniqueName();
     
@@ -893,6 +908,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   /**
    * Tests affect of FULL_ACCESS on region operations.
    */
+  @Test
   public void testFullAccess() throws Exception {
     final String name = this.getUniqueName();
     
@@ -957,6 +973,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
    * Tests affect of FULL_ACCESS on local entry expiration actions.
    */
   @Category(FlakyTest.class) // GEODE-447: time sensitive, expiration, waitForMemberTimeout is unimplemented
+  @Test
   public void testFullAccessWithLocalEntryExpiration() throws Exception {
     final String name = this.getUniqueName();
     
@@ -1030,6 +1047,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   /**
    * Tests affect of FULL_ACCESS on local region expiration actions.
    */
+  @Test
   public void testFullAccessWithLocalRegionExpiration() throws Exception {
     final String name = this.getUniqueName();
     
@@ -1071,6 +1089,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   
   protected static Boolean[] detectedDeparture_testCommitDistributionException = 
     { Boolean.FALSE };
+  @Test
   public void testCommitDistributionException() throws Exception {
     if (getRegionScope().isGlobal()) return; // skip test under Global
     if (getRegionScope().isDistributedNoAck()) return; // skip test under DistributedNoAck
@@ -1194,6 +1213,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   
   protected static Boolean[] detectedDeparture_testRegionDistributionException = 
     { Boolean.FALSE };
+  @Test
   public void testRegionDistributionException() throws Exception {
     if (getRegionScope().isDistributedNoAck()) return; // skip test under DistributedNoAck
     
@@ -1361,6 +1381,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
     }
   }
 
+  @Test
   public void testReinitialization() throws Exception {
     final String name = this.getUniqueName();
     final String roleA = name+"-A";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
index 45cb8a5..d7e4c3d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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;
 import java.io.FileOutputStream;
@@ -80,7 +89,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  *
  * @since 3.0
  */
-public abstract class RegionTestCase extends CacheTestCase {
+public abstract class RegionTestCase extends JUnit4CacheTestCase {
   
   /** A <code>CacheListener</code> used by a test */
   static TestCacheListener listener;
@@ -106,8 +115,8 @@ public abstract class RegionTestCase extends CacheTestCase {
     subrgnWriter = null;
   }
   
-  public RegionTestCase(String name) {
-    super(name);
+  public RegionTestCase() {
+    super();
   }
   
   @Override
@@ -170,6 +179,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * @see Region#containsKey
    * @see Region#containsValueForKey
    */
+  @Test
   public void testContainsKey() throws CacheException {
     String name = this.getUniqueName();
     Region region = createRegion(name);
@@ -204,6 +214,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * @see Region#getEntry
    * @see Region#create
    */
+  @Test
   public void testBadRegionAccess() throws CacheException {
     String name = this.getUniqueName();
     Region region = createRegion(name);
@@ -238,6 +249,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests that {@link Region#put} on a previously non-existent region
    * entry creates it.
    */
+  @Test
   public void testPutNonExistentEntry() throws CacheException {
     String name = this.getUniqueName();
     Region region = createRegion(name);
@@ -284,6 +296,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests that sending <code>null</code> to various APIs throws the
    * appropriate exception.
    */
+  @Test
   public void testNulls() throws CacheException {
     if (!supportsSubregions()) {
       return;
@@ -388,6 +401,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Region's {@link Region#getStatistics statistics}, so the region
    * must have been created with statistics enabled.
    */
+  @Test
   public void testCreateSubregions() throws CacheException {
     if (!supportsSubregions()) {
       return;
@@ -441,6 +455,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests {@link Region#destroy destroying} an entry and attempting
    * to access it afterwards.
    */
+  @Test
   public void testDestroyEntry() throws CacheException {
     String name = this.getUniqueName();
     Object key = name;
@@ -529,6 +544,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    *
    * @see Region#destroyRegion
    */
+  @Test
   public void testDestroyRegion() throws CacheException {
     if (!supportsSubregions()) {
       return;
@@ -828,6 +844,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#entries} method without recursion
    */
+  @Test
   public void testEntries() throws CacheException {
     String name = this.getUniqueName();
     Region region = createRegion(name);
@@ -908,6 +925,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#entries} method with recursion
    */
+  @Test
   public void testEntriesRecursive() throws CacheException {
     if (!supportsSubregions()) {
       return;
@@ -972,6 +990,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#getCache} method (for what it's worth)
    */
+  @Test
   public void testGetCache() throws CacheException {
     String name = this.getUniqueName();
     Region region = createRegion(name);
@@ -981,6 +1000,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#getName} method
    */
+  @Test
   public void testGetName() throws CacheException {
     String name = this.getUniqueName();
     Region region = createRegion(name);
@@ -992,6 +1012,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#getFullPath} method
    */
+  @Test
   public void testGetPathFromRoot() throws CacheException {
     if (!supportsSubregions()) {
       return;
@@ -1011,6 +1032,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#getParentRegion} method
    */
+  @Test
   public void testGetParentRegion() throws CacheException {
     if (!supportsSubregions()) {
       return;
@@ -1033,6 +1055,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    *
    * @see Region#setUserAttribute
    */
+  @Test
   public void testRegionUserAttribute() throws CacheException {
     String name = this.getUniqueName();
     Object value = "USER_ATTRIBUTE";
@@ -1047,6 +1070,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests a region entry's user attribute
    */
+  @Test
   public void testEntryUserAttribute() throws CacheException {
     String name = this.getUniqueName();
     String key = "KEY";
@@ -1067,6 +1091,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests invalidating a region entry
    */
+  @Test
   public void testInvalidateEntry() throws CacheException {
     String name = this.getUniqueName();
     Object key = "KEY";
@@ -1094,6 +1119,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests invalidating an entire region
    */
+  @Test
   public void testInvalidateRegion() throws CacheException {
     String name = this.getUniqueName();
     
@@ -1131,6 +1157,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#keys} method.
    */
+  @Test
   public void testKeys() throws CacheException {
     String name = this.getUniqueName();
     
@@ -1186,6 +1213,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * attempting to access it afterwards.  (Not too useful with a
    * <code>LOCAL</code> region.)
    */
+  @Test
   public void testLocalDestroyEntry() throws CacheException {
     if (!supportsLocalDestroyAndLocalInvalidate()) {
       return;
@@ -1278,6 +1306,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    *
    * @see Region#localDestroyRegion
    */
+  @Test
   public void testLocalDestroyRegion() throws CacheException {
     String name = this.getUniqueName();
     Object key = "KEY";
@@ -1574,6 +1603,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests closing a region, and checks different behavior when this is a disk
    * region with persistBackup.
    */
+  @Test
   public void testCloseRegion() throws CacheException {
     // @todo added a remote region to make sure close just does a localDestroy
     
@@ -1663,6 +1693,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests locally invalidating a region entry
    */
+  @Test
   public void testLocalInvalidateEntry() throws CacheException {
     if (!supportsLocalDestroyAndLocalInvalidate()) {
       return;
@@ -1692,6 +1723,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests locally invalidating an entire region
    */
+  @Test
   public void testLocalInvalidateRegion() throws CacheException {
     String name = this.getUniqueName();
     
@@ -1729,6 +1761,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#subregions} method without recursion
    */
+  @Test
   public void testSubregions() throws CacheException {
     if (!supportsSubregions()) {
       return;
@@ -1788,6 +1821,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#subregions} method with recursion
    */
+  @Test
   public void testSubregionsRecursive() throws CacheException {
     if (!supportsSubregions()) {
       return;
@@ -1856,6 +1890,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Tests the {@link Region#values} method without recursion
    */
+  @Test
   public void testValues() throws CacheException {
     String name = this.getUniqueName();
     System.err.println("testValues region name is " +  name);
@@ -2116,6 +2151,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests that an entry in a region expires with an
    * invalidation after a given time to live.
    */
+  @Test
   public void testEntryTtlInvalidate()
   throws CacheException {
     
@@ -2162,6 +2198,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Verify that special entries expire but other entries in the region don't
    */
+  @Test
   public void testCustomEntryTtl1() {
 
     final String name = this.getUniqueName();
@@ -2218,6 +2255,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Verify that special entries don't expire but other entries in the region do
    */
+  @Test
   public void testCustomEntryTtl2() {
 
     final String name = this.getUniqueName();
@@ -2299,6 +2337,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Expire an entry with a custom expiration.  Set a new custom expiration, create the
    * same entry again, make sure it observes the <em>new</em> expiration
    */
+  @Test
   public void testCustomEntryTtl3() {
 
     final String name = this.getUniqueName();
@@ -2418,6 +2457,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Then mutate the region expiration configuration and confirm
    * that the entry's expiration time is rescheduled.
    */
+  @Test
   public void testEntryTtl3() {
     final String name = this.getUniqueName();
     // test no longer waits for this expiration to happen
@@ -2601,6 +2641,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests that an entry whose value is loaded into a region
    * expires with an invalidation after a given time to live.
    */
+  @Test
   public void testEntryFromLoadTtlInvalidate()
   throws CacheException, InterruptedException {
 
@@ -2650,6 +2691,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests that an entry in a region expires with a destroy
    * after a given time to live.
    */
+  @Test
   public void testEntryTtlDestroy()
   throws CacheException, InterruptedException {
 
@@ -2693,6 +2735,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests that a region expires with an invalidation after a
    * given time to live.
    */
+  @Test
   public void testRegionTtlInvalidate()
   throws CacheException, InterruptedException {
 
@@ -2747,6 +2790,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests that a region expires with a destruction after a
    * given time to live.
    */
+  @Test
   public void testRegionTtlDestroy()
   throws CacheException, InterruptedException {
 
@@ -2792,6 +2836,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests that an entry in a local region that remains idle for a
    * given amount of time is invalidated.
    */
+  @Test
   public void testEntryIdleInvalidate()
   throws CacheException, InterruptedException {
 
@@ -2891,6 +2936,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Verify that special entries expire but other entries in the region don't
    */
+  @Test
   public void testCustomEntryIdleTimeout1() {
 
     final String name = this.getUniqueName();
@@ -2969,6 +3015,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Verify that special entries don't expire but other entries in the region do
    */
+  @Test
   public void testCustomEntryIdleTimeout2() {
 
     final String name = this.getUniqueName();
@@ -3052,6 +3099,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Then mutate the region expiration configuration and confirm
    * that the entry's expiration time is rescheduled.
    */
+  @Test
   public void testCustomEntryIdleTimeout3() {
     final String name = this.getUniqueName();
     // test no longer waits for this expiration to happen
@@ -3139,6 +3187,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Then mutate the region expiration configuration and confirm
    * that the entry's expiration time is rescheduled.
    */
+  @Test
   public void testEntryIdleTimeout3() {
     final String name = this.getUniqueName();
     // test no longer waits for this expiration to happen
@@ -3370,6 +3419,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Verify that expiry is calculatod only once on an entry
    */
+  @Test
   public void testCustomIdleOnce() {
 
     final String name = this.getUniqueName();
@@ -3445,6 +3495,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   /**
    * Verify that a get or put resets the idle time on an entry
    */
+  @Test
   public void testCustomEntryIdleReset() {
 
     final String name = this.getUniqueName();
@@ -3508,6 +3559,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * given amount of time is destroyed.
    */
   @Category(FlakyTest.class) // GEODE-706: time sensitive, expiration, waitForDestroy, EXPIRY_MS_PROPERTY, short timeout
+  @Test
   public void testEntryIdleDestroy() throws Exception {
 
     final String name = this.getUniqueName();
@@ -3569,6 +3621,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Verify that accessing an entry resets its idle time
    * @throws Exception
    */
+  @Test
   public void testEntryIdleReset() throws Exception {
 
     final String name = this.getUniqueName();
@@ -3624,6 +3677,7 @@ public abstract class RegionTestCase extends CacheTestCase {
     }
   }
   
+  @Test
   public void testEntryExpirationAfterMutate()
   throws CacheException, InterruptedException {
 
@@ -3681,6 +3735,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Verify that accessing an entry does not delay expiration due
    * to TTL
    */
+  @Test
   public void testEntryIdleTtl() {
 
     final String name = this.getUniqueName();
@@ -3720,6 +3775,7 @@ public abstract class RegionTestCase extends CacheTestCase {
     }
   }
   
+  @Test
   public void testRegionExpirationAfterMutate()
   throws CacheException, InterruptedException {
 
@@ -3780,6 +3836,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * time is invalidated.  Also tests that accessing an entry of a
    * region or a subregion counts as an access.
    */
+  @Test
   public void testRegionIdleInvalidate()
   throws InterruptedException, CacheException {
 
@@ -3888,6 +3945,7 @@ public abstract class RegionTestCase extends CacheTestCase {
    * Tests that a region expires with a destruction after a
    * given idle time.
    */
+  @Test
   public void testRegionIdleDestroy()
   throws CacheException, InterruptedException {
 
@@ -3933,6 +3991,7 @@ public abstract class RegionTestCase extends CacheTestCase {
   public static Region preSnapshotRegion = null;
   private final static int MAX_KEYS = 10;
 
+  @Test
   public void testSnapshot() throws IOException, CacheException, ClassNotFoundException {
     final String name = this.getUniqueName();
     
@@ -3997,6 +4056,7 @@ public abstract class RegionTestCase extends CacheTestCase {
     }
   }
 
+  @Test
   public void testRootSnapshot() throws IOException, CacheException, ClassNotFoundException {
     final String name = this.getUniqueName();
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java
index e170a0a..4a25447 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.*;
 import com.gemstone.gemfire.distributed.*;
 import java.util.*;
@@ -25,10 +34,10 @@ import java.util.*;
  *
  * @since 5.0
  */
-public abstract class ReliabilityTestCase extends CacheTestCase {
+public abstract class ReliabilityTestCase extends JUnit4CacheTestCase {
 
-  public ReliabilityTestCase(String name) {
-    super(name);
+  public ReliabilityTestCase() {
+    super();
   }
 
   /** Asserts that the specified roles are missing */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java
index c1b5e48..05c91d2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java
@@ -22,6 +22,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.Arrays;
 import java.util.Collections;
 import java.util.Properties;
@@ -45,11 +54,12 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  *
  */
-public class RemoveAllMultiVmDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class RemoveAllMultiVmDUnitTest extends JUnit4DistributedTestCase {
     
     /** Creates a new instance of RemoveAllMultiVmDUnitTest */
-    public RemoveAllMultiVmDUnitTest(String name) {
-        super(name);
+    public RemoveAllMultiVmDUnitTest() {
+        super();
     }
     
     static Cache cache;
@@ -82,7 +92,7 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase {
     
     public static void createCache(){
         try{
-            ds = (new RemoveAllMultiVmDUnitTest("temp")).getSystem(props);
+            ds = (new RemoveAllMultiVmDUnitTest()).getSystem(props);
             cache = CacheFactory.create(ds);
             AttributesFactory factory  = new AttributesFactory();
             factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -120,7 +130,8 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase {
     
     //tests methods
     
-    public void testLocalRemoveAll(){
+  @Test
+  public void testLocalRemoveAll(){
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(0);
     
@@ -151,7 +162,8 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase {
       } );
     }
     
-    public void testLocalTxRemoveAll(){
+  @Test
+  public void testLocalTxRemoveAll(){
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(0);
     
@@ -187,7 +199,8 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase {
     } );
     }
 
-    public void testDistributedRemoveAll(){
+  @Test
+  public void testDistributedRemoveAll(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);
@@ -236,7 +249,8 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase {
           }
         } );
     }
-    public void testDistributedTxRemoveAll(){
+  @Test
+  public void testDistributedTxRemoveAll(){
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(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/cache30/RequiredRolesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
index 8700c7f..56e93ce 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.HashSet;
 import java.util.Iterator;
 import java.util.Properties;
@@ -46,6 +55,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  *
  * @since 5.0
  */
+@Category(DistributedTest.class)
 public class RequiredRolesDUnitTest extends ReliabilityTestCase {
 
   protected transient volatile boolean startTestWaitForRequiredRoles = false;
@@ -53,13 +63,14 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
   protected transient volatile boolean failTestWaitForRequiredRoles = false;
   protected transient Set rolesTestWaitForRequiredRoles = new HashSet();
   
-  public RequiredRolesDUnitTest(String name) {
-    super(name);
+  public RequiredRolesDUnitTest() {
+    super();
   }
   
   /**
    * Tests that RequiredRoles detects missing roles.
    */
+  @Test
   public void testRequiredRolesInLoss() throws Exception {
     String name = this.getUniqueName();
     
@@ -119,6 +130,7 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
   /**
    * Tests RequiredRoles.waitForRequiredRoles().
    */
+  @Test
   public void testWaitForRequiredRoles() throws Exception {
     final String name = this.getUniqueName();
     final int vm0 = 0;
@@ -297,6 +309,7 @@ public class RequiredRolesDUnitTest extends ReliabilityTestCase {
   /**
    * Tests RequiredRoles.isRoleInRegionMembership().
    */
+  @Test
   public void testIsRoleInRegionMembership() throws Exception {
     final String name = this.getUniqueName();
     final int vm0 = 0;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
index d8530b9..2da1ed7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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;
@@ -34,10 +43,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  *
  * @since 5.0
  */
-public class RolePerformanceDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class RolePerformanceDUnitTest extends JUnit4CacheTestCase {
 
-  public RolePerformanceDUnitTest(String name) {
-    super(name);
+  public RolePerformanceDUnitTest() {
+    super();
   }
 
   /**
@@ -46,6 +56,7 @@ public class RolePerformanceDUnitTest extends CacheTestCase {
    * <p>
    * Up to 10 attempts will be made before failing.
    */
+  @Test
   public void testRolePerformance() {
     int maxAttempts = 10;
     for (int i = 1; i <= maxAttempts; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
index d564fca..157ae3e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -47,7 +56,8 @@ import com.gemstone.gemfire.test.dunit.VM;
  * This class tests various search load and write scenarios for distributed regions
  */
 @SuppressWarnings({"deprecation", "unchecked", "rawtypes", "serial"})
-public class SearchAndLoadDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class SearchAndLoadDUnitTest extends JUnit4CacheTestCase {
 
   static boolean loaderInvoked;
   static boolean  remoteLoaderInvoked;
@@ -72,8 +82,8 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
   static final CountDownLatch readyForExceptionLatch = new CountDownLatch(1);
   static final CountDownLatch loaderInvokedLatch = new CountDownLatch(1);
 
-  public SearchAndLoadDUnitTest(String name) {
-    super(name);
+  public SearchAndLoadDUnitTest() {
+    super();
   }
 
   @Override
@@ -110,6 +120,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
     return factory.create();
   }
 
+  @Test
   public void testNetSearch()
   throws CacheException, InterruptedException {
 
@@ -209,6 +220,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
    * return a value.  Both threads then validate that they received the expected
    * result.
    */
+  @Test
   public void testConcurrentLoad() throws Throwable {
 
     Host host = Host.getHost(0);
@@ -352,6 +364,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
   }
   
   
+  @Test
   public void testNetLoadNoLoaders() throws CacheException, InterruptedException {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -392,6 +405,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
 
   }
 
+  @Test
   public void testNetLoad()
   throws CacheException, InterruptedException {
     Invoke.invokeInEveryVM(DistributedTestCase.class,
@@ -487,6 +501,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
    * Confirm that a netLoad that returns null will NOT allow other netLoad methods
    * to be called.
    */
+  @Test
   public void testEmptyNetLoad()
   throws CacheException, InterruptedException {
     Invoke.invokeInEveryVM(DistributedTestCase.class,
@@ -607,6 +622,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
     return new Integer(remoteLoaderInvokedCount);
   }
   
+  @Test
   public void testLocalLoad()
   throws CacheException, InterruptedException {
 
@@ -691,6 +707,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
   }
 
 
+  @Test
   public void testNetWrite()
   throws CacheException, InterruptedException {
 
@@ -783,6 +800,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
   }
 
   
+  @Test
   public void testOneHopNetWrite() throws CacheException, InterruptedException {
 
     Host host = Host.getHost(0);
@@ -892,6 +910,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
 
 
   /** same as the previous test but the cache writer is in a third, non-replicated, vm */
+  @Test
   public void testOneHopNetWriteRemoteWriter() throws CacheException, InterruptedException {
 
     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/cache30/SlowRecDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
index 2441256..79e6eb0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache30;
 
+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.Serializable;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -55,10 +64,11 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  */
 @Category(DistributedTest.class)
 @Ignore("Test was disabled by renaming to DisabledTest")
-public class SlowRecDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class SlowRecDUnitTest extends JUnit4CacheTestCase {
 
-  public SlowRecDUnitTest(String name) {
-    super(name);
+  public SlowRecDUnitTest() {
+    super();
   }
 
   // this test has special config of its distributed system so
@@ -255,6 +265,7 @@ public class SlowRecDUnitTest extends CacheTestCase {
    * Make sure that noack puts to a receiver
    * will eventually queue and then catch up.
    */
+  @Test
   public void testNoAck() throws CacheException {
     final AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_NO_ACK);
@@ -330,6 +341,7 @@ public class SlowRecDUnitTest extends CacheTestCase {
    * Make sure that noack puts to a receiver
    * will eventually queue and then catch up with conflation
    */
+  @Test
   public void testNoAckConflation() throws CacheException {
     final AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_NO_ACK);
@@ -397,6 +409,7 @@ public class SlowRecDUnitTest extends CacheTestCase {
    * make sure ack does not hang
    * make sure two ack updates do not conflate but are both queued
    */
+  @Test
   public void testAckConflation() throws CacheException {
     final AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_NO_ACK);
@@ -639,6 +652,7 @@ public class SlowRecDUnitTest extends CacheTestCase {
   /**
    * Make sure that exceeding the queue size limit causes a disconnect.
    */
+  @Test
   public void testSizeDisconnect() throws CacheException {
     final String expected = 
       "com.gemstone.gemfire.internal.tcp.ConnectionException: Forced disconnect sent to" +
@@ -1129,6 +1143,7 @@ public class SlowRecDUnitTest extends CacheTestCase {
   /**
    * Make sure a disconnect causes queue memory to be released.
    */
+  @Test
   public void testDisconnectCleanup() throws Throwable {
     try {
       doTestDisconnectCleanup();


Mime
View raw message