geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [16/29] incubator-geode git commit: Converting dunits to junit 4 using dunits_to_junit4.sh
Date Tue, 24 May 2016 00:31:41 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java
index a23baf6..45e784a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Properties;
@@ -50,10 +59,11 @@ import com.gemstone.gemfire.test.dunit.VM;
  * functionality. This test is performed for different region scopes - D_ACK and
  * D_NO_ACK for PartitionedRegion.
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCase {
 
-	public PartitionedRegionAPIDUnitTest(String name) {
-		super(name);
+	public PartitionedRegionAPIDUnitTest() {
+		super();
 	}
 
 	Properties props = new Properties();
@@ -1259,7 +1269,8 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
 	 * This is a PartitionedRegion test for scope = D_ACK. 4 VMs are used to
 	 * create the PR with and without(Only Accessor) the DataStore.
 	 */
-	public void testPartitionedRegionOperationsScopeDistAck() throws Exception {
+  @Test
+  public void testPartitionedRegionOperationsScopeDistAck() throws Exception {
 	  Host host = Host.getHost(0);
 	  // create the VM(0 - 4)
 	  vm0 = host.getVM(0);
@@ -1296,6 +1307,7 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
    * for scope = D_ACK. 4 VMs are used to
    * create the PR with and without(Only Accessor) the DataStore.
    */
+  @Test
   public void testPartitionedRegionConcurrentOperations() throws Exception {
     Host host = Host.getHost(0);
     // create the VM(0 - 4)
@@ -1320,6 +1332,7 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
    * 
    * @throws Exception
    */
+  @Test
   public void testPartitionedRegionsOperationsScopeDistEarlyAck()
   		throws Exception {
   	final String rName = getUniqueName();
@@ -1384,6 +1397,7 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
    * 
    * @throws Exception
    */
+  @Test
   public void testBug36685() throws Exception {
     final String rName = getUniqueName();
     Host host = Host.getHost(0);
@@ -1429,7 +1443,8 @@ public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCas
 		});
 	}
 
-	public void testCacherLoaderHelper() throws Exception
+  @Test
+  public void testCacherLoaderHelper() throws Exception
 	{
 	  final String rName = 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/internal/cache/PartitionedRegionAsSubRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAsSubRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAsSubRegionDUnitTest.java
index d8f7c21..fa47bf2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAsSubRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAsSubRegionDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Cache;
 import com.gemstone.gemfire.cache.CacheException;
@@ -34,13 +43,14 @@ import com.gemstone.gemfire.test.dunit.VM;
  * 
  *  
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionAsSubRegionDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
 
   //////constructor //////////
-  public PartitionedRegionAsSubRegionDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionAsSubRegionDUnitTest() {
+    super();
   }//end of constructor
 
   public static final String PR_PREFIX = "PR";
@@ -222,6 +232,7 @@ public class PartitionedRegionAsSubRegionDUnitTest extends
    * 
    * @throws Exception
    */
+  @Test
   public void testSubRegionDestroyRegion() throws Exception
   {
 
@@ -254,6 +265,7 @@ public class PartitionedRegionAsSubRegionDUnitTest extends
    * 
    * @throws Exception
    */
+  @Test
   public void testSubRegionLocalDestroyRegion() throws Exception
   {
 
@@ -283,6 +295,7 @@ public class PartitionedRegionAsSubRegionDUnitTest extends
    * 
    * @throws Exception
    */
+  @Test
   public void testSubRegionClose() throws Exception
   {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
index 749e451..b6e70d9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Iterator;
@@ -54,6 +63,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * This class tests bucket Creation and distribution for the multiple Partition
  * regions.
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionBucketCreationDistributionDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
@@ -77,8 +87,8 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
   VM vm[] = new VM[4];
 
   /** constructor */
-  public PartitionedRegionBucketCreationDistributionDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionBucketCreationDistributionDUnitTest() {
+    super();
   }
 
   /**
@@ -99,6 +109,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
    * (c) In case of the partition regions with redundancy > 0 no two bucket
    * regions with same bucketId should not be present on the same node.</br>
    */
+  @Test
   public void testBucketCreationInMultiplePartitionRegion() throws Throwable
   {
     Host host = Host.getHost(0);
@@ -148,6 +159,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
    * 3. Validates bucket distribution over all the nodes for multiple partition
    * regions.</br>
    */
+  @Test
   public void testBucketCreationInPRPutFromOneNode() throws Throwable
   {
     Host host = Host.getHost(0);
@@ -204,6 +216,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
    * 3. Validates bucket distribution over all the nodes for multiple partition
    * regions.</br>
    */
+  @Test
   public void testBucketCreationInMultiplePartitionRegionFromAllNodes()
       throws Throwable
   {
@@ -264,6 +277,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
    * to enIndexForRegion.</br><br>
    * 5. Validate bucket creation on new node.</br>
    */
+  @Test
   public void testBucketDistributionAfterNodeAdditionInPR() throws Throwable
   {
     Host host = Host.getHost(0);
@@ -339,6 +353,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
    * for the keys in the range 0 to 100 4.test number of buckets created. It
    * should be = 11
    */
+  @Test
   public void testTotalNumBucketProperty() throws Throwable
   {
     Host host = Host.getHost(0);
@@ -421,6 +436,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
    * different reasons, in this case VMs may refuse because they are above
    * their maximum.
    */
+  @Test
   public void testCompleteBucketAllocation() throws Exception {
     final String regionName = getUniqueName();
     final int maxBuckets = 23;
@@ -468,6 +484,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
    * enforce-unique-host = true
    * redundancy-zone = "zone"
    */
+  @Test
   public void testEnforceUniqueHostForLonerDistributedSystem() {
 	  Cache myCache = createLonerCacheWithEnforceUniqueHost();
     try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
index 17085c7..be8eef6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.Set;
 
 import com.gemstone.gemfire.LogWriter;
@@ -43,13 +52,14 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  *  
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionCacheCloseDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
 
   //////constructor //////////
-  public PartitionedRegionCacheCloseDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionCacheCloseDUnitTest() {
+    super();
   }//end of constructor
 
   final static int MAX_REGIONS = 1;
@@ -57,6 +67,7 @@ public class PartitionedRegionCacheCloseDUnitTest extends
   final int totalNumBuckets = 5;
   
   //////////test methods ////////////////
+  @Test
   public void testCacheClose() throws Exception, Throwable
   {
     final String rName = getUniqueName();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
index 8503b43..d0e996a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.CacheException;
@@ -29,16 +38,18 @@ import com.gemstone.gemfire.util.test.TestUtil;
 /**
  * This class tests regions created by xml files
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionCacheXMLExampleDUnitTest extends
 		PartitionedRegionDUnitTestCase {
 
 	protected static Cache cache;
 
-	public PartitionedRegionCacheXMLExampleDUnitTest(String name) {
-		super(name);
+	public PartitionedRegionCacheXMLExampleDUnitTest() {
+		super();
 	}
 
-	public void testExampleWithBothRootRegion() {
+  @Test
+  public void testExampleWithBothRootRegion() {
 		Host host = Host.getHost(0);
 		VM vm0 = host.getVM(0);
 		VM vm1 = host.getVM(1);
@@ -92,7 +103,8 @@ public class PartitionedRegionCacheXMLExampleDUnitTest extends
 		vm1.invoke(validateRegion);		
 	}
 
-	public void testExampleWithSubRegion() {
+  @Test
+  public void testExampleWithSubRegion() {
 		Host host = Host.getHost(0);
 		VM vm2 = host.getVM(2);
 		VM vm3 = host.getVM(3);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
index e8ce840..6c89ab7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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;
@@ -46,15 +55,16 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  * vm scenario. This will verify the functionality under distributed scenario.
  */
 @SuppressWarnings("serial")
+@Category(DistributedTest.class)
 public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTestCase {
   /**
    * constructor
    * 
    * @param name
    */
-  public PartitionedRegionCreationDUnitTest(String name) {
+  public PartitionedRegionCreationDUnitTest() {
 
-    super(name);
+    super();
   }
 
   static Properties props = new Properties();
@@ -66,6 +76,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
    * This tests creates partition regions with scope = DISTRIBUTED_ACK and then
    * validating thoes partition regions
    */
+  @Test
   public void testSequentialCreation() throws Exception
   {
     LogWriterUtils.getLogWriter().info("*****CREATION TEST ACK STARTED*****");
@@ -102,6 +113,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
    */
   // TODO: fix the hang that concurent creation often runs into -- mthomas
   // 2/8/06
+  @Test
   public void testConcurrentCreation() throws Throwable
   {
     LogWriterUtils.getLogWriter().info("*****CREATION TEST NO_ACK STARTED*****");
@@ -148,6 +160,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
    * 
    * @throws Exception
    */
+  @Test
   public void testConcurrentCreation_2() throws Exception {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -275,6 +288,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
    * Test Partitioned Region names that contain spaces
    * @throws Exception
    */
+  @Test
   public void testPartitionedRegionNameWithSpaces() throws Exception 
   {
     final String rName = getUniqueName() + " with some spaces";
@@ -305,6 +319,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
    * Test whether partition region creation is preveented when
    * an instance is created that has the incorrect redundancy
    */
+  @Test
   public void testPartitionedRegionRedundancyConflict() throws Exception
   {
     Host host = Host.getHost(0);
@@ -420,6 +435,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
    * @throws Exception
    */
   @Category(FlakyTest.class) // GEODE-1104: time sensitive, async actions
+  @Test
   public void testPartitionRegionInitialization() throws Throwable
   {
     final String name = getUniqueName();
@@ -475,6 +491,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
    * 
    * @throws Exception
    */
+  @Test
   public void testPartitionRegionRegistration() throws Throwable
   {
     final String name = getUniqueName();
@@ -534,6 +551,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
    * 
    * @throws Exception
    */
+  @Test
   public void testPartitionRegionPersistenceConflicts() throws Throwable
   {
     IgnoredException.addIgnoredException("IllegalStateException");
@@ -903,6 +921,7 @@ public class PartitionedRegionCreationDUnitTest extends PartitionedRegionDUnitTe
    * 
    * @throws Exception
    */
+  @Test
   public void testTotalNumberOfBuckets() 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/internal/cache/PartitionedRegionDUnitTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
index d964e5d..e51cf20 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.CacheException;
 import com.gemstone.gemfire.cache.EvictionAction;
@@ -39,7 +48,8 @@ import com.gemstone.gemfire.test.dunit.standalone.DUnitLauncher;
  * This class is extended by some PartitionedRegion related DUnit test cases 
  *
  */
-public class PartitionedRegionDUnitTestCase extends CacheTestCase
+@Category(DistributedTest.class)
+public class PartitionedRegionDUnitTestCase extends JUnit4CacheTestCase
 {
   static int oldLogLevel;
   public void setVMInfoLogLevel() {
@@ -84,8 +94,8 @@ public class PartitionedRegionDUnitTestCase extends CacheTestCase
     return ret;
   }
 
-  public PartitionedRegionDUnitTestCase(String name) {
-    super(name);
+  public PartitionedRegionDUnitTestCase() {
+    super();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
index 6a2512f..bdadd8a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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;
 
@@ -38,10 +47,11 @@ import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
 @SuppressWarnings("synthetic-access")
-public class PartitionedRegionDelayedRecoveryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PartitionedRegionDelayedRecoveryDUnitTest extends JUnit4CacheTestCase {
   
-  public PartitionedRegionDelayedRecoveryDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionDelayedRecoveryDUnitTest() {
+    super();
   }
   
   @Override
@@ -54,6 +64,7 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends CacheTestCase {
     InternalResourceManager.setResourceObserver(null);
   }
 
+  @Test
   public void testNoRecovery() throws Exception {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -127,6 +138,7 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends CacheTestCase {
   }
 
   @Category(FlakyTest.class) // GEODE-860: time sensitive, thread unsafe test hook, CountDownLatch, 1 minute timeout, waitForBucketRecovery loops eating InterruptedException
+  @Test
   public void testDelay() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -193,6 +205,7 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends CacheTestCase {
   }
 
   @Category(FlakyTest.class) // GEODE-757: time sensitive, fails because event occurs 2 millis too soon, waitForBucketRecovery wait loop eats InterruptedException, thread unsafe test hook
+  @Test
   public void testStartupDelay() {
     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/internal/cache/PartitionedRegionDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDestroyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDestroyDUnitTest.java
index abfb7d2..d0b5832 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDestroyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDestroyDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Iterator;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
@@ -43,14 +52,15 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * 
  *  
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionDestroyDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
 
   //////constructor //////////
-  public PartitionedRegionDestroyDUnitTest(String name) {
+  public PartitionedRegionDestroyDUnitTest() {
 
-    super(name);
+    super();
   }//end of constructor
 
   public static final String PR_PREFIX = "PR";
@@ -61,6 +71,7 @@ public class PartitionedRegionDestroyDUnitTest extends
   
   VM vm0, vm1,vm2,vm3;
   
+  @Test
   public void testDestroyRegion() throws Exception, Throwable
   {
     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/cache/PartitionedRegionEntryCountDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEntryCountDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEntryCountDUnitTest.java
index 0f0583f..466de43 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEntryCountDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEntryCountDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.EvictionAction;
@@ -34,13 +43,15 @@ import com.gemstone.gemfire.test.dunit.VM;
  * 
  * 
  */
-public class PartitionedRegionEntryCountDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PartitionedRegionEntryCountDUnitTest extends JUnit4CacheTestCase {
   private static final long serialVersionUID = 19808034671087558L;
 
   public PartitionedRegionEntryCountDUnitTest(final String name) {
-    super(name);
+    super();
   }
 
+  @Test
   public void testTotalEntryCountAfterLocalDestroyEviction() {
     final Host host = Host.getHost(0);
     final VM vm1 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java
index ce10abb..63942f8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Iterator;
 import java.util.Map;
@@ -54,11 +63,13 @@ import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
-public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PartitionedRegionEvictionDUnitTest extends JUnit4CacheTestCase {
   public PartitionedRegionEvictionDUnitTest(final String name) {
-    super(name);
+    super();
   }
 
+  @Test
   public void testHeapLRUWithOverflowToDisk() {
     final Host host = Host.getHost(0);
     final VM vm2 = host.getVM(2);
@@ -205,6 +216,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
     System.clearProperty("gemfire.memoryEventTolerance");
   }
   
+  @Test
   public void testHeapLRUWithLocalDestroy() {
     final Host host = Host.getHost(0);
     final VM vm2 = host.getVM(2);
@@ -324,6 +336,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
     assertEquals((3 * bucketsToCreate * (redundantCopies + 1)), totalEvicted);
   }
 
+  @Test
   public void testMemoryLRUWithOverflowToDisk() {
     final Host host = Host.getHost(0);
     final VM vm2 = host.getVM(2);
@@ -432,6 +445,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testMemoryLRUWithLocalDestroy() {
     final Host host = Host.getHost(0);
     final VM vm2 = host.getVM(2);
@@ -510,6 +524,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
     assertTrue(2 *extraEntries<= totalEvicted);
   }
 
+  @Test
   public void testEntryLRUWithOverflowToDisk() {
     final Host host = Host.getHost(0);
     final VM vm2 = host.getVM(2);
@@ -602,6 +617,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
      public boolean verify(long expectedEvictions) { return false; }
   };
   
+  @Test
   public void testEntryLRUWithLocalDestroy() {
     final Host host = Host.getHost(0);
     final VM vm2 = host.getVM(2);
@@ -738,6 +754,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
   }
 
   // Test to validate the Eviction Attribute : LRU Check
+  @Test
   public void testEvictionValidationForLRUEntry() {
     final Host host = Host.getHost(0);
     final VM testAccessor = host.getVM(1);
@@ -882,6 +899,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
   }
 
   // Test to validate the Eviction Attribute : LRU Action
+  @Test
   public void testEvictionValidationForLRUAction() {
     final Host host = Host.getHost(0);
     final VM testDatastore = host.getVM(2);
@@ -972,6 +990,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
   }
 
   // Test to validate the Eviction Attribute : LRU Maximum
+  @Test
   public void testEvictionValidationForLRUMaximum() {
     final Host host = Host.getHost(0);
     final VM testDatastore = host.getVM(2);
@@ -1019,6 +1038,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
   }
 
   // Test to validate the Eviction Attribute for LRUHeap
+  @Test
   public void testEvictionValidationForLRUHeap() {
     final Host host = Host.getHost(0);
     final VM testDatastore = host.getVM(2);
@@ -1141,6 +1161,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
   }
 
   // Test to validate an accessor can set the initial attributes
+  @Test
   public void testEvictionValidationWhenInitializedByAccessor() {
     final Host host = Host.getHost(0);
     final VM testDatastore = host.getVM(2);
@@ -1192,6 +1213,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
   }
 
   // Test to validate the Eviction Attribute : HeapLRU Interval
+  @Test
   public void testEvictionValidationForLRUMemory() {
     final Host host = Host.getHost(0);
     final VM firstDatastore = host.getVM(1);
@@ -1435,6 +1457,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
   }
 
 
+  @Test
   public void testEvictionValidationForLRUEntry_AccessorFirst() {
     final Host host = Host.getHost(0);
     final VM firstAccessor = host.getVM(0);
@@ -1510,6 +1533,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
     testDatastore.invoke(createSecondDataStore);
   }
   
+  @Test
   public void testEvictionValidationForLRUEntry_DatastoreFirst() {
     final Host host = Host.getHost(0);
     final VM firstAccessor = host.getVM(0);
@@ -1585,6 +1609,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
     testAccessor.invoke(createSecondAccessor);
   }
   
+  @Test
   public void testEvictionValidationForLRUEntry_TwoAccessors() {
     final Host host = Host.getHost(0);
     final VM firstAccessor = host.getVM(0);
@@ -1663,6 +1688,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
    * Test that gets do  not need to acquire a lock on the region
    * entry when LRU is enabled. This is bug 42265
    */
+  @Test
   public void testEntryLRUDeadlock() {
     final 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/internal/cache/PartitionedRegionHADUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
index 1676177..3621a4a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Properties;
@@ -48,13 +57,14 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  *  
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
 {
 
   //////constructor //////////
-  public PartitionedRegionHADUnitTest(String name) {
+  public PartitionedRegionHADUnitTest() {
 
-    super(name);
+    super();
   }//end of constructor
 
   public static final String PR_PREFIX = "PR";
@@ -72,6 +82,7 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
    * of sequential cache.close() events.
    * @throws Exception
    */
+  @Test
   public void testBucketFailOverDuringCacheClose() throws Exception {
     
     final String regionName = getUniqueName();
@@ -184,6 +195,7 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
   }
 
   //////////test methods ////////////////
+  @Test
   public void testGrabBackupBuckets() throws Throwable
   {
 
@@ -390,6 +402,7 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
    * @see PartitionedRegionSingleNodeOperationsJUnitTest#test018BucketScope()
    * @throws Exception
    */
+  @Test
   public void testBucketsScope() throws Exception
   {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
index f024ebb..ad88b90 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -51,6 +60,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * cleanup for multiple failed nodes.</br>
  *
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionHAFailureAndRecoveryDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
@@ -63,9 +73,9 @@ public class PartitionedRegionHAFailureAndRecoveryDUnitTest extends
    *
    * @param name
    */
-  public PartitionedRegionHAFailureAndRecoveryDUnitTest(String name) {
+  public PartitionedRegionHAFailureAndRecoveryDUnitTest() {
 
-    super(name);
+    super();
   }
 
   /**
@@ -78,6 +88,7 @@ public class PartitionedRegionHAFailureAndRecoveryDUnitTest extends
    * (5) Validate Failed node's bucket2Node Region metadata. </br>
    */
 
+  @Test
   public void testMetaDataCleanupOnSinglePRNodeFail() throws Throwable
   {
     // create the VM's
@@ -187,6 +198,7 @@ public class PartitionedRegionHAFailureAndRecoveryDUnitTest extends
    * (4) Validate all Failed node's config metadata </br> <br>
    * (5) Validate all Failed node's bucket2Node Region metadata. </br>
    */
+  @Test
   public void testMetaDataCleanupOnMultiplePRNodeFail() throws Throwable
   {
     // create the VM's
@@ -412,6 +424,7 @@ public class PartitionedRegionHAFailureAndRecoveryDUnitTest extends
    * Test for peer recovery of buckets when a member is removed from the distributed system 
    * @throws Throwable
    */
+  @Test
   public void testRecoveryOfSingleMemberFailure() throws Throwable
   {
     final String uniqName = getUniqueName();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionInvalidateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionInvalidateDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionInvalidateDUnitTest.java
index 6cd4f6a..36b2ab3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionInvalidateDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionInvalidateDUnitTest.java
@@ -19,6 +19,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.CacheWriterException;
 import com.gemstone.gemfire.cache.EntryEvent;
@@ -36,11 +45,12 @@ import com.gemstone.gemfire.test.dunit.VM;
  * This tests invalidateRegion functionality on partitioned regions
  *
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionInvalidateDUnitTest extends
     CacheTestCase {
 
-  public PartitionedRegionInvalidateDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionInvalidateDUnitTest() {
+    super();
   }
 
   void createRegion(String name, boolean accessor, int redundantCopies) {
@@ -51,6 +61,7 @@ public class PartitionedRegionInvalidateDUnitTest extends
     getCache().createRegion(name, af.create());
   }
     
+  @Test
   public void testSingleVMInvalidate() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
@@ -85,6 +96,7 @@ public class PartitionedRegionInvalidateDUnitTest extends
     });
   }
   
+  @Test
   public void testMultiVMInvalidate() {
     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/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
index d6693de..1ca9ed7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
@@ -17,6 +17,15 @@
 
 package com.gemstone.gemfire.internal.cache;
 
+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.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -43,6 +52,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * creation of bucket.
  * 
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionLocalMaxMemoryDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
@@ -59,8 +69,8 @@ public class PartitionedRegionLocalMaxMemoryDUnitTest extends
   /** to store references of 4 vms */
   VM vm[] = new VM[4];
 
-  public PartitionedRegionLocalMaxMemoryDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionLocalMaxMemoryDUnitTest() {
+    super();
   }
 
   /**
@@ -73,6 +83,7 @@ public class PartitionedRegionLocalMaxMemoryDUnitTest extends
    * <br>4.Test should throw PartitionedRegionStorageException
    * when it tries to create new bucket</br>
    */
+  @Test
   public void testLocalMaxMemoryInPartitionedRegion()
   {
     Host host = Host.getHost(0);
@@ -107,6 +118,7 @@ public class PartitionedRegionLocalMaxMemoryDUnitTest extends
    * This test makes sure that we don't enforce the localMaxMemory setting
    * when eviction is enabled.
    */
+  @Test
   public void testLocalMaxMemoryInPartitionedRegionWithEviction()
   {
     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/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
index 55e52cb..724be51 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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;
@@ -31,10 +40,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  * @since 9.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
+@Category(DistributedTest.class)
 public class PartitionedRegionLocalMaxMemoryOffHeapDUnitTest extends PartitionedRegionLocalMaxMemoryDUnitTest {
 
-  public PartitionedRegionLocalMaxMemoryOffHeapDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionLocalMaxMemoryOffHeapDUnitTest() {
+    super();
   }
   
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java
index aca9ff1..6ed7dcf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.CacheException;
 import com.gemstone.gemfire.cache.Region;
@@ -32,6 +41,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * 
  *  
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionMultipleDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
@@ -61,8 +71,8 @@ public class PartitionedRegionMultipleDUnitTest extends
   int localMaxMemory = 200;
 
   /** constructor */
-  public PartitionedRegionMultipleDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionMultipleDUnitTest() {
+    super();
   }
 
   /**
@@ -75,6 +85,7 @@ public class PartitionedRegionMultipleDUnitTest extends
    * 4. Performs get() operations on all partitioned region and check the
    * returned values.</br>
    */
+  @Test
   public void testPartitionedRegionPutAndGet() throws Throwable
   {
     Host host = Host.getHost(0);
@@ -129,6 +140,7 @@ public class PartitionedRegionMultipleDUnitTest extends
    * 4. Performs get() operations for destroyed keys on all partitioned region
    * and checks the returned values is not null .</br>
    */
+  @Test
   public void testPartitionedRegionDestroyKeys() throws Throwable
   {
 
@@ -195,6 +207,7 @@ public class PartitionedRegionMultipleDUnitTest extends
    * partitioned region from all the VM's</br><br>
    * 4. Chekcs containsKey and ContainsValueForKey APIs</br>
    */
+  @Test
   public void testPartitionedRegionDestroyAndContainsAPI() throws Throwable
   {
     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/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
index 48f88e8..5a57da1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Region;
@@ -26,11 +35,12 @@ import com.gemstone.gemfire.internal.cache.lru.HeapEvictor;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
+@Category(DistributedTest.class)
 public class PartitionedRegionOffHeapEvictionDUnitTest extends
     PartitionedRegionEvictionDUnitTest {
   
-  public PartitionedRegionOffHeapEvictionDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionOffHeapEvictionDUnitTest() {
+    super();
   }  
   
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java
index b24e660..a4b21a9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Iterator;
 import java.util.List;
@@ -35,6 +44,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  *         This class tests PRID generation in multiple partiton
  *         regions on 4 VMs
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionPRIDDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
@@ -51,8 +61,8 @@ public class PartitionedRegionPRIDDUnitTest extends
   /** to store references of 4 vms */
   VM vm[] = new VM[4];
 
-  public PartitionedRegionPRIDDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionPRIDDUnitTest() {
+    super();
   }
   
   /**
@@ -61,6 +71,7 @@ public class PartitionedRegionPRIDDUnitTest extends
    * generation
    * 
    */
+  @Test
   public void testPRIDGenerationInMultiplePartitionRegion() 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/internal/cache/PartitionedRegionQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryDUnitTest.java
index 4c284da..1160d4b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.sql.Date;
 import java.util.Arrays;
@@ -69,18 +78,20 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  *
  */
-public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PartitionedRegionQueryDUnitTest extends JUnit4CacheTestCase {
   
   /**
    * @param name
    */
-  public PartitionedRegionQueryDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionQueryDUnitTest() {
+    super();
     // TODO Auto-generated constructor stub
   }
   
   private static final AtomicReference<RebalanceResults> rebalanceResults = new AtomicReference<RebalanceResults>();
 
+  @Test
   public void testReevaluationDueToUpdateInProgress() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -148,6 +159,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
    * 3. While the query is executing, several buckets are
    * moved.
    */
+  @Test
   public void testRebalanceDuringQueryEvaluation() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -206,6 +218,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
    * 2. Buckets are moved
    * 3. Check to make sure we don't have lingering bucket indexes with bucket regions already destroyed
    */
+  @Test
   public void testRebalanceWithIndex() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -256,6 +269,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
   /**
    * tests trace for pr queries when <trace> is used and query verbose is set to true on local and remote servers
    */
+  @Test
   public void testPartitionRegionDebugMessageQueryTraceOnBothServers() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -329,6 +343,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
    * tests trace for pr queries when <trace> is used and query verbose is set to true on local but false on remote servers
    * All flags should be true still as the <trace> is OR'd with query verbose flag
    */
+  @Test
   public void testPartitionRegionDebugMessageQueryTraceOnLocalServerOnly() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -400,6 +415,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
    * tests trace for pr queries when <trace> is NOT used and query verbose is set to true on local but false on remote
    * The remote should not send a pr query trace info back because trace was not requested
    */
+  @Test
   public void testPartitionRegionDebugMessageQueryTraceOffLocalServerVerboseOn() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -472,6 +488,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
    * We don't output the string or do anything on the local side, but we still pull off the object due to the remote server
    * generating and sending it over
    */
+  @Test
   public void testPartitionRegionDebugMessageQueryTraceOffRemoteServerOnly() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -544,6 +561,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
    * tests trace for pr queries when <trace> is used and query verbose is set to false on local and remote servers
    * trace is OR'd so the entire trace process should be invoked
    */
+  @Test
   public void testPartitionRegionDebugMessageQueryTraceOnRemoteServerOnly() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -617,6 +635,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
    * The local node still receives the pr trace info from the remote node due to query verbose being on
    * however nothing is used on the local side
    */
+  @Test
   public void testPartitionRegionDebugMessageQueryTraceOffRemoteServerOn() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -689,6 +708,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
    * tests trace for pr queries when <trace> is NOT used and query verbose is set to false on local and remote servers
    * None of our hooks should have triggered
    */
+  @Test
   public void testPartitionRegionDebugMessageQueryTraceOffQueryVerboseOff() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -760,6 +780,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
    * tests trace for pr queries when <trace> is used and query verbose is set to false on local and remote servers
    * All hooks should have triggered due to trace being used
    */
+  @Test
   public void testPartitionRegionDebugMessageQueryTraceOnQueryVerboseOff() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -827,6 +848,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
   }
   
 
+  @Test
   public void testOrderByOnPRWithReservedKeywords() throws Exception {
     final Host host = Host.getHost(0);
     final VM server1 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
index a2dafbf..ede2ee6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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;
@@ -33,7 +42,8 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 
-public class PartitionedRegionRedundancyZoneDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PartitionedRegionRedundancyZoneDUnitTest extends JUnit4CacheTestCase {
 
   @Override
   public final void postTearDownCacheTestCase() throws Exception {
@@ -44,14 +54,15 @@ public class PartitionedRegionRedundancyZoneDUnitTest extends CacheTestCase {
     disconnectAllFromDS();
   }
   
-  public PartitionedRegionRedundancyZoneDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionRedundancyZoneDUnitTest() {
+    super();
   }
 
   /**
    * Test that we don't try to put buckets in the same
    * zone when we don't have enough zones.
    */
+  @Test
   public void testNotEnoughZones() throws Throwable {
     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/internal/cache/PartitionedRegionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index 65cc7eb..ca4b97c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.DataInput;
 import java.io.DataOutput;
 import java.io.File;
@@ -81,7 +90,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
-public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
 
   private static final long serialVersionUID = 1L;
 
@@ -109,8 +119,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
 
   private static Locator locator = null;
 
-  public PartitionedRegionSingleHopDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionSingleHopDUnitTest() {
+    super();
   }
 
   @Override
@@ -256,6 +266,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
   }
 
   // 2 peers 2 servers 1 accessor.No client.Should work without any exceptions.
+  @Test
   public void test_NoClient() {
     member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 ));
     member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 ));
@@ -298,6 +309,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
   // 2 AccessorServers, 2 Peers
   // 1 Client connected to 2 AccessorServers. Hence metadata should not be
   // fetched.
+  @Test
   public void test_ClientConnectedToAccessors() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createAccessorServer());
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createAccessorServer());
@@ -319,6 +331,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
 
   // 1 server 2 accesorservers 2 peers.i client connected to the server
   // Since only 1 server hence Metadata should not be fetched.
+  @Test
   public void test_ClientConnectedTo1Server() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 ));
 
@@ -342,6 +355,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
   // Put data, get data and make the metadata stable.
   // Now verify that metadata has all 8 buckets info.
   // Now update and ensure the fetch service is never called.
+  @Test
   public void test_MetadataContents() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 ));
@@ -367,6 +381,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
   // once,
   // fetchservice has to be triggered.
   // Now put again from c2.There should be no hop at all.
+  @Test
   public void test_MetadataServiceCallAccuracy() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 ));
@@ -401,6 +416,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
     Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> cms.isRefreshMetadataTestOnly() == false);
   }
 
+  @Test
   public void test_MetadataServiceCallAccuracy_FromDestroyOp() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
@@ -424,6 +440,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
     Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> cms.isRefreshMetadataTestOnly() == true);
   }
 
+  @Test
   public void test_MetadataServiceCallAccuracy_FromGetOp() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
@@ -458,6 +475,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
 
   }
 
+  @Test
   public void test_SingleHopWithHA() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 8 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 8 ));
@@ -488,6 +506,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
     }
   }
 
+  @Test
   public void test_SingleHopWithHAWithLocator() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -525,6 +544,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
   }
 
 
+  @Test
   public void test_NoMetadataServiceCall_ForGetOp() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
@@ -556,7 +576,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
   }
 
 
- public void test_NoMetadataServiceCall() {
+  @Test
+  public void test_NoMetadataServiceCall() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 ));
 
@@ -605,6 +626,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
 
   }
 
+  @Test
   public void test_NoMetadataServiceCall_ForDestroyOp() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
@@ -628,6 +650,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
   }
 
   @Category(FlakyTest.class) // GEODE-853: random ports, pause sleeps, time sensitive, 5 second thread sleeps
+  @Test
   public void testServerLocationRemovalThroughPing() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 ));
@@ -659,6 +682,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
     verifyDeadServer(regionMetaData, region, port0, port1);
   }
 
+  @Test
   public void testMetadataFetchOnlyThroughFunctions() {
     //Workaround for 52004
     IgnoredException.addIgnoredException("InternalFunctionInvocationTargetException");
@@ -700,6 +724,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
 //    assertIndexDetailsEquals(4/*numBuckets*/, prMetaData.getBucketServerLocationsMap_TEST_ONLY().size());
   }
 
+  @Test
   public void testMetadataFetchOnlyThroughputAll() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 ));
@@ -893,6 +918,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
 
   }
 
+  @Test
   public void testMetadataIsSameOnAllServersAndClientsHA() {
     Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 2, 4 ));
     Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 2, 4 ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
index 2680d04..9d4d0e3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
@@ -19,6 +19,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
@@ -64,7 +73,8 @@ import java.util.StringTokenizer;
 /**
  *
  */
-public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTestCase{
+@Category(DistributedTest.class)
+public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4CacheTestCase{
 
   private static final long serialVersionUID = 1L;
 
@@ -109,8 +119,8 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
 
   protected static Locator locator = null;
   
-  public PartitionedRegionSingleHopWithServerGroupDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionSingleHopWithServerGroupDUnitTest() {
+    super();
   }
   
   @Override
@@ -173,6 +183,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
 
+  @Test
   public void test_SingleHopWith2ServerGroup() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -203,6 +214,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
 
+  @Test
   public void test_SingleHopWith2ServerGroup2() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -233,6 +245,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
   
+  @Test
   public void test_SingleHopWith2ServerGroup2WithoutSystemProperty() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -258,6 +271,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
 
+  @Test
   public void test_SingleHopWithServerGroupAccessor() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -287,6 +301,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
   
+  @Test
   public void test_SingleHopWithServerGroupOneServerInTwoGroups() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -321,6 +336,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     
   }
   
+  @Test
   public void test_SingleHopWithServerGroupWithOneDefaultServer() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -350,6 +366,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
   
+  @Test
   public void test_SingleHopWithServerGroupClientServerGroupNull() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -378,6 +395,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
   
+  @Test
   public void test_SingleHopWithServerGroupTwoClientServerGroup() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -415,6 +433,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
   
+  @Test
   public void test_SingleHopWithServerGroupTwoClientServerGroup2() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -449,6 +468,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
   
+  @Test
   public void test_SingleHopWithServerGroupTwoClientOneWithOneWithoutServerGroup() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -480,6 +500,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
   
+  @Test
   public void test_SingleHopWithServerGroup2ClientInOneVMServerGroup() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());
@@ -514,6 +535,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
     }
   }
 
+  @Test
   public void test_SingleHopWithServerGroupColocatedRegionsInDifferentGroup() {
     int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     final String host0 = NetworkUtils.getServerHostName(member3.getHost());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java
index c4e4780..cb56a21 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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 com.gemstone.gemfire.cache.AttributesFactory;
@@ -48,12 +57,13 @@ import com.gemstone.gemfire.test.dunit.VM;
  * 
  *  
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionSizeDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
 
-  public PartitionedRegionSizeDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionSizeDUnitTest() {
+    super();
   }
 
   public static final String PR_PREFIX = "PR";
@@ -380,12 +390,14 @@ public class PartitionedRegionSizeDUnitTest extends
    * 
    * @throws Exception
    */
+  @Test
   public void testSize() throws Throwable
   {
     sizeOpsForDistAckSync();
     sizeOpsForDistAckASync();
   }
   
+  @Test
   public void testBug39868() throws Exception {
     Host host = Host.getHost(0);
 
@@ -438,6 +450,7 @@ public class PartitionedRegionSizeDUnitTest extends
     });
   }
   
+  @Test
   public void testByteSize() throws Exception {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -465,6 +478,7 @@ public class PartitionedRegionSizeDUnitTest extends
     };
   }
   
+  @Test
   public void testByteSizeWithEviction() 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/internal/cache/PartitionedRegionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatsDUnitTest.java
index 79a52a9..ceff1a8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatsDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.CancellationException;
 
 import com.gemstone.gemfire.Statistics;
@@ -40,13 +49,14 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**
  *  
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionStatsDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
 
   //////constructor //////////
-  public PartitionedRegionStatsDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionStatsDUnitTest() {
+    super();
   }//end of constructor
 
   public static final String PR_PREFIX = "PR";
@@ -72,6 +82,7 @@ public class PartitionedRegionStatsDUnitTest extends
   final int totalNumBuckets = 5;
   static final int REDUNDANT_COPIES = 1; 
   //////////test methods ////////////////
+  @Test
   public void testClose() throws Exception
   {
 
@@ -335,6 +346,7 @@ public class PartitionedRegionStatsDUnitTest extends
      */
   }
   
+  @Test
   public void testDataStoreEntryCountWithRebalance() throws InterruptedException {
     //Ok, first problem, GC'd tombstone is counted as an entry
     //To test
@@ -386,6 +398,7 @@ public class PartitionedRegionStatsDUnitTest extends
     validateEntryCount(vm1, 1);
   }
   
+  @Test
   public void testDataStoreEntryCount2WithRebalance() throws InterruptedException {
     final Host host = Host.getHost(0);
 
@@ -438,6 +451,7 @@ public class PartitionedRegionStatsDUnitTest extends
    * accurate.
    * @throws InterruptedException 
    */
+  @Test
   public void testDataStoreEntryCount() throws InterruptedException {
     //Ok, first problem, GC'd tombstone is counted as an entry
     //To test
@@ -554,6 +568,7 @@ public class PartitionedRegionStatsDUnitTest extends
   }
   
     
+  @Test
   public void testTotalNumBuckets() {
 	  final 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/cache/PartitionedRegionTestUtilsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
index b99024b..276ee87 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
@@ -17,6 +17,15 @@
 
 package com.gemstone.gemfire.internal.cache;
 
+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 hydra.GsRandom;
 
 import java.io.DataInput;
@@ -46,12 +55,13 @@ import com.gemstone.gemfire.test.dunit.VM;
  * @since 5.0 
  *
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionTestUtilsDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
   final int totalNumBuckets = 5;
-  public PartitionedRegionTestUtilsDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionTestUtilsDUnitTest() {
+    super();
   }
 
   /**
@@ -59,6 +69,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
    * returns keys when there are keys and {@link java.util.Collections#EMPTY_SET} when there are none.
    * @throws Exception
    */
+  @Test
   public void testGetKeys() throws Exception {
     final String r = getUniqueName();
     Host host = Host.getHost(0);
@@ -151,6 +162,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
     public void toData(DataOutput out) throws IOException  {out.writeInt(this.hc); }
     public void fromData(DataInput in) throws IOException, ClassNotFoundException { this.hc = in.readInt(); } 
   }
+  @Test
   public void testGetNodes() throws Exception {
     final String r = getUniqueName();
     Host host = Host.getHost(0);
@@ -234,6 +246,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
    * Test the test utiltities that allow investigation of a PartitionedRegion's local cache. 
    * @throws Exception
    */
+  @Test
   public void testLocalCacheOps() throws Exception {
     final String r = getUniqueName();
     Host host = Host.getHost(0);
@@ -348,6 +361,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
    * 
    * @throws Exception
    */
+  @Test
   public void testGetBucketKeys() throws Exception {
     final String r = getUniqueName();
     Host host = Host.getHost(0);
@@ -442,6 +456,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
    * Verify that the information it discovers is the same as the local advisor.
    * @throws Exception
    */
+  @Test
   public void testGetBucketOwners() throws Exception {
     final String rName0 = getUniqueName() + "-r0";
     final String rName1 = getUniqueName() + "-r1";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
index 20048c5..bba30ef 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
@@ -22,6 +22,15 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+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.Iterator;
 import java.util.List;
@@ -47,6 +56,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * This test is to verify creation of partition region and
  * distributed region with same name.
  */
+@Category(DistributedTest.class)
 public class PartitionedRegionWithSameNameDUnitTest extends
     PartitionedRegionDUnitTestCase
 {
@@ -73,8 +83,8 @@ public class PartitionedRegionWithSameNameDUnitTest extends
 
   static protected final int PARTITIONED_REGION = 1;
 
-  public PartitionedRegionWithSameNameDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionWithSameNameDUnitTest() {
+    super();
   }
 
   /**
@@ -85,6 +95,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * on vm0 </br> In this test RegionExistException is expected while creating
    * region with the same as partition region.
    */
+  @Test
   public void testNameWithPartitionRegionFirstOnSameVM()
   {
     Host host = Host.getHost(0);
@@ -131,6 +142,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * In this test RegionExistException is expected while creating Partition
    * region with the same as region.
    */
+  @Test
   public void testNameWithDistributedRegionFirstOnSameVM()
   {
     Host host = Host.getHost(0);
@@ -174,6 +186,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * region.
    */
 
+  @Test
   public void testNameWithPartitionRegionFirstOnDifferentVM()
   {
     Host host = Host.getHost(0);
@@ -222,6 +235,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * InternalGemFireException is expected while creating region.
    */
 
+  @Test
   public void testNameWithDistributedRegionFirstOnDifferentVM()
   {
     Host host = Host.getHost(0);
@@ -263,6 +277,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * 2. creates partition region with the same name as distributed region on
    * vm1,vm2,vm3</br> NoException is expected.
    */
+  @Test
   public void testLocalRegionFirst()
   {
     Host host = Host.getHost(0);
@@ -305,6 +320,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * 2. creates distributed region scope = LOCAL with the same name as
    * partitioned region on vm1,vm2,vm3</br> NoException is expected.
    */
+  @Test
   public void testLocalRegionSecond()
   {
     Host host = Host.getHost(0);
@@ -346,6 +362,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * 2. Creates distributed subregion of parent region </br>
    * OperationNotSupportedException is expected.
    */
+  @Test
   public void testWithPartitionedRegionAsParentRegionAndDistributedSubRegion()
   {
     Host host = Host.getHost(0);
@@ -384,6 +401,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * OperationNotSupportedException is expected
    */
 
+  @Test
   public void testWithPartitionedRegionAsParentRegionAndPartitionedSubRegion()
   {
     Host host = Host.getHost(0);
@@ -422,6 +440,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * 3.Creates a distributed region as subregion of parent on vm1,vm2,vm3 </br>
    * In this case InternalGemFireException is expected.
    */
+  @Test
   public void testWithSubRegionPartitionedRegionFirst()
   {
     Host host = Host.getHost(0);
@@ -471,6 +490,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
    * 3.Creates a partitioned region as subregion of parent on vm1,vm2,vm3 </br>
    * In this case IllegalStateException is expected.
    */
+  @Test
   public void testWithSubRegionDistributedRegionFirst()
   {
     Host host = Host.getHost(0);


Mime
View raw message