geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [27/29] incubator-geode git commit: Fixing compile errors due to the automatic conversion to junit 4
Date Tue, 24 May 2016 00:31:52 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/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 79e6eb0..dbb8d21 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
@@ -62,7 +62,6 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  *
  * @since 4.2.1
  */
-@Category(DistributedTest.class)
 @Ignore("Test was disabled by renaming to DisabledTest")
 @Category(DistributedTest.class)
 public class SlowRecDUnitTest extends JUnit4CacheTestCase {
@@ -463,7 +462,8 @@ public class SlowRecDUnitTest extends JUnit4CacheTestCase {
    * Test disabled because it intermittently fails due to race conditions
    * in test. This has been fixed in congo's tests. See bug 35357.
    */
-  public void _disabled_testConflationSequence() throws CacheException {
+  @Test
+  public void testConflationSequence() throws CacheException {
     final AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_NO_ACK);
     factory.setEnableAsyncConflation(true);
@@ -725,7 +725,7 @@ public class SlowRecDUnitTest extends JUnit4CacheTestCase {
    * June 2006 due to hangs.  Some of the tests, like this one, still need
    * work because the periodically (some quite often) fail.
    */
-  public void donottestTimeoutDisconnect() throws CacheException {
+  public void testTimeoutDisconnect() throws CacheException {
     final String expected = 
       "com.gemstone.gemfire.internal.tcp.ConnectionException: Forced disconnect sent to" +
       "||java.io.IOException: Broken pipe";
@@ -921,7 +921,7 @@ public class SlowRecDUnitTest extends JUnit4CacheTestCase {
    * June 2006 r13222 in the trunk.  This test is failing because conflation
    * isn't kicking in for some reason.
    */
-  public void donottestMultipleRegionConflation() throws Throwable {
+  public void testMultipleRegionConflation() throws Throwable {
     try {
       doTestMultipleRegionConflation();
     }
@@ -1298,7 +1298,7 @@ public class SlowRecDUnitTest extends JUnit4CacheTestCase {
    * June 2006 due to hangs.  Some of the tests, like this one, still need
    * work because the periodically (some quite often) fail.
  */
-  public void donottestPartialMessage() throws Throwable {
+  public void testPartialMessage() throws Throwable {
     try {
       doTestPartialMessage();
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedLockServiceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedLockServiceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedLockServiceDUnitTest.java
index eb2348c..c53360d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedLockServiceDUnitTest.java
@@ -71,7 +71,6 @@ import org.junit.experimental.categories.Category;
  * This class tests distributed ownership via the DistributedLockService api.
  */
 @Category(DistributedTest.class)
-@Category(DistributedTest.class)
 public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
   
 	protected static DistributedSystem dlstSystem;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index 67555c8..bb78e42 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -60,17 +60,10 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 /**
  * This tests the rolling upgrade for locators with
  * different GOSSIPVERSION.
- *
- *
  */
 @Category(DistributedTest.class)
-//@Ignore("Test was disabled by renaming to DisabledTest")
-@Category(DistributedTest.class)
 public class TcpServerBackwardCompatDUnitTest extends JUnit4DistributedTestCase {
 
-  /**
-   * @param name
-   */
   public TcpServerBackwardCompatDUnitTest() {
     super();
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
index bf469d9..6977050 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -95,7 +95,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * @throws Exception
    */
   @Test
-  @Test
   public void testToDataFromHigherVersionToLower() throws Exception {
     DataOutputStream dos = new VersionedDataOutputStream(new DataOutputStream(
         baos), Version.GFE_56);
@@ -111,7 +110,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * @throws Exception
    */
   @Test
-  @Test
   public void testToDataFromLowerVersionToHigher() throws Exception {
     DataOutputStream dos = new VersionedDataOutputStream(new DataOutputStream(
         baos), Version.GFE_701);
@@ -126,7 +124,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * @throws Exception
    */
   @Test
-  @Test
   public void testFromDataFromHigherVersionToLower() throws Exception {
     InternalDataSerializer.writeDSFID(msg, new DataOutputStream(baos));
     this.bais = new ByteArrayInputStream(baos.toByteArray());
@@ -145,7 +142,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * @throws Exception
    */
   @Test
-  @Test
   public void testFromDataFromLowerVersionToHigher() throws Exception {
     InternalDataSerializer.writeDSFID(msg, new DataOutputStream(baos));
     this.bais = new ByteArrayInputStream(baos.toByteArray());
@@ -164,7 +160,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * @throws Exception
    */
   @Test
-  @Test
   public void testAllMessages() throws Exception {
     // list of msgs not created using reflection
     // taken from DSFIDFactory.create()

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
index 53562c4..a52a80c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
@@ -92,7 +92,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
   }
   
   @Test
-  @Test
   public void testDeployFileAndChange() throws IOException, ClassNotFoundException {
     final JarDeployer jarDeployer = new JarDeployer();
     final File currentDir = new File(".").getAbsoluteFile();
@@ -144,7 +143,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
   }
 
   @Test
-  @Test
   public void testDeployNoUpdateWhenNoChange() throws IOException, ClassNotFoundException {
     final JarDeployer jarDeployer = new JarDeployer();
     final File currentDir = new File(".").getAbsoluteFile();
@@ -171,7 +169,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
     }
   }
 
-  @Test
   @SuppressWarnings("serial")
   @Test
   public void testDeployExclusiveLock() throws IOException, ClassNotFoundException {
@@ -229,7 +226,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
     });
   }
 
-  @Test
   @SuppressWarnings("serial")
   @Test
   public void testDeploySharedLock() throws IOException, ClassNotFoundException {
@@ -295,7 +291,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
     });
   }
 
-  @Test
   @SuppressWarnings("serial")
   @Test
   public void testUndeploySharedLock() throws IOException, ClassNotFoundException {
@@ -348,7 +343,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
     });
   }
 
-  @Test
   @SuppressWarnings("serial")
   @Test
   public void testDeployUpdateByAnotherVM() throws IOException, ClassNotFoundException {
@@ -411,7 +405,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
   }
 
   @Test
-  @Test
   public void testLoadPreviouslyDeployedJars() throws IOException {
     final File parentJarFile = new File(JarDeployer.JAR_PREFIX + "JarDeployerDUnitAParent.jar#1");
     final File usesJarFile = new File(JarDeployer.JAR_PREFIX + "JarDeployerDUnitUses.jar#1");
@@ -475,7 +468,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
   }
 
   @Test
-  @Test
   public void testDeployToAlternateDirectory() throws IOException, ClassNotFoundException {
     final File alternateDir = new File("JarDeployerDUnit");
     alternateDir.mkdir();
@@ -507,7 +499,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
   }
   
   @Test
-  @Test
   public void testDeployToInvalidDirectory() throws IOException, ClassNotFoundException {
     final File alternateDir = new File("JarDeployerDUnit");
     FileUtil.delete(new File("JarDeployerDUnit"));
@@ -563,7 +554,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
 
   boolean okayToResume;
   @Test
-  @Test
   public void testSuspendAndResume() throws IOException, ClassNotFoundException {    
     final JarDeployer jarDeployer = new JarDeployer();
     byte[] jarBytes = this.classBuilder.createJarFromName("JarDeployerDUnitSAR");
@@ -599,7 +589,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
   
 
   @Test
-  @Test
   public void testZeroLengthFile() throws IOException, ClassNotFoundException {
     final JarDeployer jarDeployer = new JarDeployer();
 
@@ -620,7 +609,6 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
   }
 
   @Test
-  @Test
   public void testInvalidJarFile() throws IOException, ClassNotFoundException {
     final JarDeployer jarDeployer = new JarDeployer();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
index 5c92f53..ba87eb6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
@@ -74,20 +74,11 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
 
   private static final long  MAX_WAIT = 30 * 1000;
 
-
-
-  public BackupDUnitTest() {
-    super();
-  }
-  
   @Override
   public final void preTearDownCacheTestCase() throws Exception {
     StringBuilder failures = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
index 1ffd9c8..0531100 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
@@ -77,17 +77,12 @@ public class Bug37377DUnitTest extends JUnit4CacheTestCase
 
   private static final int maxEntries = 10000;
 
-  /**
-   * Constructor
-   * 
-   * @param name
-   */
   public Bug37377DUnitTest() {
     super();
-    File file1 = new File(name + "1");
+    File file1 = new File(getTestMethodName() + "1");
     file1.mkdir();
     file1.deleteOnExit();
-    File file2 = new File(name + "2");
+    File file2 = new File(getTestMethodName() + "2");
     file2.mkdir();
     file2.deleteOnExit();
     dirs = new File[2];

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
index 31e98fb..0845cd7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
@@ -70,7 +70,6 @@ public class Bug39079DUnitTest extends JUnit4CacheTestCase {
 
   static Properties props = new Properties();
   
-
   private VM vm0 = null;
 
   private static VM vm1 = null;
@@ -85,17 +84,12 @@ public class Bug39079DUnitTest extends JUnit4CacheTestCase {
 
   private static final int maxEntries = 10000;
 
-  /**
-   * Constructor
-   * 
-   * @param name
-   */
   public Bug39079DUnitTest() {
     super();
-    File file1 = new File(name + "1");
+    File file1 = new File(getTestMethodName() + "1");
     file1.mkdir();
     file1.deleteOnExit();
-    File file2 = new File(name + "2");
+    File file2 = new File(getTestMethodName() + "2");
     file2.mkdir();
     file2.deleteOnExit();
     dirs = new File[2];

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
index a28eb85..5d7511d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
@@ -20,6 +20,7 @@
 package com.gemstone.gemfire.internal.cache;
 
 import org.junit.experimental.categories.Category;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -190,7 +191,9 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
    * 
    * @throws Exception
    */
-  public void _testS2CDeltaPropagationFailedStats2() throws Exception {
+  @Ignore("TODO")
+  @Test
+  public void testS2CDeltaPropagationFailedStats2() throws Exception {
   }
 
   /**
@@ -264,7 +267,9 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
    * 
    * @throws Exception
    */
-  public void _testP2PDeltaPropagationFailedStats2() throws Exception {
+  @Ignore("TODO")
+  @Test
+  public void testP2PDeltaPropagationFailedStats2() throws Exception {
   }
 
   /**
@@ -337,7 +342,9 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
    * 
    * @throws Exception
    */
-  public void _testC2SDeltaPropagationFailedStats2() throws Exception {
+  @Ignore("TODO")
+  @Test
+  public void testC2SDeltaPropagationFailedStats2() throws Exception {
   }
 
   public static void waitForLastKey() {
@@ -573,8 +580,7 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   public static Integer createServerCache(Boolean flag, DataPolicy policy,
       Scope scope, Boolean listener) throws Exception {
     ConnectionTable.threadWantsSharedResources();
-    DeltaPropagationStatsDUnitTest test = new DeltaPropagationStatsDUnitTest(
-        "temp");
+    DeltaPropagationStatsDUnitTest test = new DeltaPropagationStatsDUnitTest();
     Properties props = new Properties();
     if (!flag) {
       props

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java
index 2a67a2c..2fe634b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java
@@ -63,27 +63,26 @@ public class DiskRegByteArrayDUnitTest extends JUnit4CacheTestCase {
   static CacheTransactionManager cacheTxnMgr;
   protected static File[] dirs = null;
   final static byte[] value = new byte[1024];
-  
-   
+
     public DiskRegByteArrayDUnitTest() {
-        super();
-        File file1 = new File( name + "1");
-        file1.mkdir();
-        file1.deleteOnExit();
-        File file2 = new File( name + "2");
-        file2.mkdir();
-        file2.deleteOnExit();
-        File file3 = new File( name + "3");
-        file3.mkdir();
-        file3.deleteOnExit();
-        File file4 = new File( name + "4");
-        file4.mkdir();
-        file4.deleteOnExit();
-        dirs = new File[4];
-        dirs[0] = file1;
-        dirs[1] = file2;
-        dirs[2] = file3;
-        dirs[3] = file4;
+      super();
+      File file1 = new File( getTestMethodName() + "1");
+      file1.mkdir();
+      file1.deleteOnExit();
+      File file2 = new File( getTestMethodName() + "2");
+      file2.mkdir();
+      file2.deleteOnExit();
+      File file3 = new File( getTestMethodName() + "3");
+      file3.mkdir();
+      file3.deleteOnExit();
+      File file4 = new File( getTestMethodName() + "4");
+      file4.mkdir();
+      file4.deleteOnExit();
+      dirs = new File[4];
+      dirs[0] = file1;
+      dirs[1] = file2;
+      dirs[2] = file3;
+      dirs[3] = file4;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionDUnitTest.java
index 4132c0d..7e161e6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionDUnitTest.java
@@ -38,7 +38,6 @@ import com.gemstone.gemfire.internal.cache.lru.MemLRUCapacityController;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
-@Category(DistributedTest.class)
 @Ignore("Test was disabled by renaming to DisabledTest")
 @Category(DistributedTest.class)
 public class EvictionDUnitTest extends EvictionTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
index 330f021..e6fd2cb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
@@ -357,8 +357,7 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
   public static int createServer(boolean isAccessor,
       List<FixedPartitionAttributes> fpaList) {
 
-    CacheTestCase test = new FixedPRSinglehopDUnitTest(
-        "FixedPRSinglehopDUnitTest");
+    FixedPRSinglehopDUnitTest test = new FixedPRSinglehopDUnitTest();
     cache = test.getCache();
     CacheServer server = cache.addCacheServer();
     int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
@@ -397,8 +396,7 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
   public static int createServerWithLocator(String locator, boolean isAccessor,
       List<FixedPartitionAttributes> fpaList, boolean simpleFPR) {
 
-    CacheTestCase test = new FixedPRSinglehopDUnitTest(
-    "FixedPRSinglehopDUnitTest");
+    FixedPRSinglehopDUnitTest test = new FixedPRSinglehopDUnitTest();
     Properties props = new Properties();
     props = new Properties();
     props.setProperty("locators", locator);
@@ -459,8 +457,7 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
   }
   
   public static int totalNumBucketsCreated () {
-    CacheTestCase test = new FixedPRSinglehopDUnitTest(
-    "FixedPRSinglehopDUnitTest");
+    FixedPRSinglehopDUnitTest test = new FixedPRSinglehopDUnitTest();
     PartitionedRegion pr = (PartitionedRegion)cache.getRegion(PR_NAME);
     assertNotNull(pr);
     return pr.getLocalPrimaryBucketsListTestOnly().size();
@@ -468,8 +465,7 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
   
   public static void createPeer(boolean isAccessor,
       List<FixedPartitionAttributes> fpaList) {
-    CacheTestCase test = new FixedPRSinglehopDUnitTest(
-        "FixedPRSinglehopDUnitTest");
+    FixedPRSinglehopDUnitTest test = new FixedPRSinglehopDUnitTest();
     cache = test.getCache();
 
     PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@ -497,8 +493,7 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new FixedPRSinglehopDUnitTest(
-        "FixedPRSinglehopDUnitTest");
+    FixedPRSinglehopDUnitTest test = new FixedPRSinglehopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -523,8 +518,7 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new FixedPRSinglehopDUnitTest(
-        "FixedPRSinglehopDUnitTest");
+    FixedPRSinglehopDUnitTest test = new FixedPRSinglehopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -549,8 +543,7 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new FixedPRSinglehopDUnitTest(
-        "FixedPRSinglehopDUnitTest");
+    FixedPRSinglehopDUnitTest test = new FixedPRSinglehopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -574,8 +567,7 @@ public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new FixedPRSinglehopDUnitTest(
-        "FixedPRSinglehopDUnitTest");
+    FixedPRSinglehopDUnitTest test = new FixedPRSinglehopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/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 63942f8..70ea3b5 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
@@ -65,9 +65,6 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 @Category(DistributedTest.class)
 public class PartitionedRegionEvictionDUnitTest extends JUnit4CacheTestCase {
-  public PartitionedRegionEvictionDUnitTest(final String name) {
-    super();
-  }
 
   @Test
   public void testHeapLRUWithOverflowToDisk() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/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 36b2ab3..364a4ee 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
@@ -46,8 +46,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  *
  */
 @Category(DistributedTest.class)
-public class PartitionedRegionInvalidateDUnitTest extends
-    CacheTestCase {
+public class PartitionedRegionInvalidateDUnitTest extends JUnit4CacheTestCase {
 
   public PartitionedRegionInvalidateDUnitTest() {
     super();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/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 5a57da1..b56f3db 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
@@ -39,10 +39,6 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 public class PartitionedRegionOffHeapEvictionDUnitTest extends
     PartitionedRegionEvictionDUnitTest {
   
-  public PartitionedRegionOffHeapEvictionDUnitTest() {
-    super();
-  }  
-  
   @Override
   public final void preTearDownAssertions() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/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 ca4b97c..b376436 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
@@ -185,10 +185,8 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
       int redundantCopies, int totalNoofBuckets) {
 
     Properties props = new Properties();
-    props = new Properties();
     props.setProperty("locators", locString);
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
 
@@ -1131,8 +1129,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -1153,8 +1150,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
   }
 
   public static int createAccessorServer() {
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     cache = test.getCache();
     CacheServer server = cache.addCacheServer();
     int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
@@ -1223,8 +1219,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
   }
 
   public static int createServer(int redundantCopies, int totalNoofBuckets) {
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     cache = test.getCache();
     CacheServer server = cache.addCacheServer();
     int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
@@ -1297,8 +1292,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
   }
 
   public static int createPersistentPrsAndServer(int redundantCopies, int totalNoofBuckets) {
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     cache = test.getCache();
     DiskStore disk = cache.findDiskStore("disk");
     if(disk == null) {
@@ -1381,8 +1375,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
     return port;
   }
   public static int createPersistentPrsAndServerOnPort(int redundantCopies, int totalNoofBuckets, int port) {
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     cache = test.getCache();
     DiskStore disk = cache.findDiskStore("disk");
     if(disk == null) {
@@ -1464,8 +1457,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
     return port;
   }
   public static void createServerOnPort(int redundantCopies, int totalNoofBuckets, int port) {
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     cache = test.getCache();
     CacheServer server = cache.addCacheServer();
     server.setPort(port);
@@ -1536,8 +1528,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
   }
 
   public static void startServerOnPort(int port) {
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     cache = test.getCache();
     CacheServer server = cache.addCacheServer();
     server.setPort(port);
@@ -1552,8 +1543,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
 
 
   public static void createPeer() {
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     cache = test.getCache();
 
     PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@ -1613,8 +1603,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -1639,8 +1628,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -1665,8 +1653,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -1690,8 +1677,7 @@ public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
-        "PartitionedRegionSingleHopDUnitTest");
+    PartitionedRegionSingleHopDUnitTest test = new PartitionedRegionSingleHopDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/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 9d4d0e3..b72ba66 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
@@ -751,8 +751,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca
   }
   
   public static int createServer(int redundantCopies, int totalNoofBuckets, String group) {
-    CacheTestCase test = new PartitionedRegionSingleHopWithServerGroupDUnitTest(
-        "PartitionedRegionSingleHopWithServerGroupDUnitTest");
+    PartitionedRegionSingleHopWithServerGroupDUnitTest test = new PartitionedRegionSingleHopWithServerGroupDUnitTest();
     cache = test.getCache();
     CacheServer server = cache.addCacheServer();
     int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
@@ -823,12 +822,10 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca
       int localMaxMemory,int redundantCopies, int totalNoofBuckets, String group) {
 
     Properties props = new Properties();
-    props = new Properties();
     props.setProperty("locators", locator);
     
     System.setProperty("gemfire.PoolImpl.honourServerGroupsInPRSingleHop", "true");
-    CacheTestCase test = new PartitionedRegionSingleHopWithServerGroupDUnitTest(
-        "PartitionedRegionSingleHopWithServerGroupDUnitTest");
+    PartitionedRegionSingleHopWithServerGroupDUnitTest test = new PartitionedRegionSingleHopWithServerGroupDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
 
@@ -909,12 +906,10 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca
       int localMaxMemory,int redundantCopies, int totalNoofBuckets, String group) {
 
     Properties props = new Properties();
-    props = new Properties();
     props.setProperty("locators", locator);
     
     System.setProperty("gemfire.PoolImpl.honourServerGroupsInPRSingleHop", "true");
-    CacheTestCase test = new PartitionedRegionSingleHopWithServerGroupDUnitTest(
-        "PartitionedRegionSingleHopWithServerGroupDUnitTest");
+    PartitionedRegionSingleHopWithServerGroupDUnitTest test = new PartitionedRegionSingleHopWithServerGroupDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
 
@@ -1046,12 +1041,10 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca
   
   public static void createClientWithLocator(String host, int port0, String group) {
     Properties props = new Properties();
-    props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
     props.setProperty(DistributionConfig.LOG_FILE_NAME, "");
-    CacheTestCase test = new PartitionedRegionSingleHopWithServerGroupDUnitTest(
-        "PartitionedRegionSingleHopWithServerGroupDUnitTest");
+    PartitionedRegionSingleHopWithServerGroupDUnitTest test = new PartitionedRegionSingleHopWithServerGroupDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -1072,11 +1065,9 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca
   
   public static void create2ClientWithLocator(String host, int port0, String group1, String group2) {
     Properties props = new Properties();
-    props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new PartitionedRegionSingleHopWithServerGroupDUnitTest(
-        "PartitionedRegionSingleHopWithServerGroupDUnitTest");
+    PartitionedRegionSingleHopWithServerGroupDUnitTest test = new PartitionedRegionSingleHopWithServerGroupDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -1101,11 +1092,9 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca
   
   public static void createClientWith3PoolLocator(String host, int port0, String group1, String group2,String group3) {
     Properties props = new Properties();
-    props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new PartitionedRegionSingleHopWithServerGroupDUnitTest(
-        "PartitionedRegionSingleHopWithServerGroupDUnitTest");
+    PartitionedRegionSingleHopWithServerGroupDUnitTest test = new PartitionedRegionSingleHopWithServerGroupDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -1291,8 +1280,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca
 
   
   public static int createAccessorServer(int redundantCopies, int numBuckets, String group) {
-    CacheTestCase test = new PartitionedRegionSingleHopWithServerGroupDUnitTest(
-        "PartitionedRegionSingleHopWithServerGroupDUnitTest");
+    PartitionedRegionSingleHopWithServerGroupDUnitTest test = new PartitionedRegionSingleHopWithServerGroupDUnitTest();
     cache = test.getCache();
     CacheServer server = cache.addCacheServer();
     int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
@@ -1360,11 +1348,9 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca
   
   public static void createClientWithLocatorWithoutSystemProperty(String host, int port0, String group) {
     Properties props = new Properties();
-    props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new PartitionedRegionSingleHopWithServerGroupDUnitTest(
-        "PartitionedRegionSingleHopWithServerGroupDUnitTest");
+    PartitionedRegionSingleHopWithServerGroupDUnitTest test = new PartitionedRegionSingleHopWithServerGroupDUnitTest();
     DistributedSystem ds = test.getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionCCEDUnitTest.java
index 189d75b..d067ed1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionCCEDUnitTest.java
@@ -25,18 +25,11 @@ 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;
 
-/**
- * 
- */
 @Category(DistributedTest.class)
 public class RemoteTransactionCCEDUnitTest extends RemoteTransactionDUnitTest {
 
   private static final long serialVersionUID = 5960292521068781262L;
 
-  public RemoteTransactionCCEDUnitTest() {
-    super();
-  }
-  
   @Override
   protected boolean getConcurrencyChecksEnabled() {
     return true;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
index ee50b97..a7d61c0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+import static org.junit.Assert.*;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -25,13 +27,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
-
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.transaction.RollbackException;
 import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.gemstone.gemfire.TXExpiryJUnitTest;
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.AttributesMutator;
@@ -78,14 +83,11 @@ import com.gemstone.gemfire.cache.execute.FunctionContext;
 import com.gemstone.gemfire.cache.execute.FunctionService;
 import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
 import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
-import com.gemstone.gemfire.cache.query.CqAttributes;
-import com.gemstone.gemfire.cache.query.CqAttributesFactory;
 import com.gemstone.gemfire.cache.query.CqEvent;
 import com.gemstone.gemfire.cache.query.CqListener;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
-import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.AvailablePort;
@@ -101,15 +103,15 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
-import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
+@Category(DistributedTest.class)
+public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
 
-/**
- *
- */
-public class RemoteTransactionDUnitTest extends CacheTestCase {
   final protected String CUSTOMER = "custRegion";
   final protected String ORDER = "orderRegion";
   final protected String D_REFERENCE = "distrReference";
@@ -139,12 +141,6 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
       return null;
     }
   };
-  /**
-   * @param name
-   */
-  public RemoteTransactionDUnitTest(String name) {
-    super(name);
-  }
 
   protected enum OP {
     PUT, GET, DESTROY, INVALIDATE, KEYS, VALUES, ENTRIES, PUTALL, GETALL, REMOVEALL
@@ -521,10 +517,12 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
   
   
 
+  @Test
   public void testTXCreationAndCleanupAtCommit() throws Exception {
     doBasicChecks(true);
   }
 
+  @Test
   public void testTXCreationAndCleanupAtRollback() throws Exception {
     doBasicChecks(false);
   }
@@ -584,6 +582,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     }
   }
 
+  @Test
   public void testPRTXGet() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -624,6 +623,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testPRTXGetOnRemoteWithLoader() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -670,6 +670,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
   /**
    * Make sure that getEntry returns null properly and values when it should
    */
+  @Test
   public void testPRTXGetEntryOnRemoteSide() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -722,6 +723,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
   
   
   
+  @Test
   public void testPRTXGetOnLocalWithLoader() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -763,6 +765,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
   
   
 
+  @Test
   public void testTXPut() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -806,6 +809,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testTXInvalidate() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -847,6 +851,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
   }
 
   
+  @Test
   public void testTXDestroy() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -887,6 +892,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testTxPutIfAbsent() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -983,6 +989,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     return accessor;
   }
   
+  @Test
   public void testTxRemove() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -1056,6 +1063,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testTxRemoveAll() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -1149,6 +1157,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testTxRemoveAllNotColocated() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -1194,6 +1203,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testTxRemoveAllWithRedundancy() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -1241,6 +1251,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     datastore2.invoke(checkArtifacts);
   }
 
+  @Test
   public void testTxReplace() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -1320,6 +1331,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
    * When we have narrowed down on a target node for a transaction, test that
    * we throw an exception if that node does not host primary for subsequent entries
    */
+  @Test
   public void testNonColocatedTX() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -1371,18 +1383,22 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testListenersForPut() {
     doTestListeners(OP.PUT);
   }
 
+  @Test
   public void testListenersForDestroy() {
     doTestListeners(OP.DESTROY);
   }
 
+  @Test
   public void testListenersForInvalidate() {
     doTestListeners(OP.INVALIDATE);
   }
   
+  @Test
   public void testListenersForRemoveAll() {
     doTestListeners(OP.REMOVEALL);
   }
@@ -1694,6 +1710,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     }
   }
 
+  @Test
   public void testRemoteExceptionThrown() {
     Host host = Host.getHost(0);
     VM acc = host.getVM(0);
@@ -1731,10 +1748,12 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testSizeForTXHostedOnRemoteNode() {
     doSizeTest(false);
   }
 
+  @Test
   public void testSizeOnAccessor() {
     doSizeTest(true);
   }
@@ -1812,50 +1831,62 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     assertEquals(0, txOnDatastore2_2.intValue());
   }
 
+  @Test
   public void testKeysIterator() {
     doTestIterator(OP.KEYS, 0, OP.PUT);
   }
 
+  @Test
   public void testValuesIterator() {
     doTestIterator(OP.VALUES, 0, OP.PUT);
   }
 
+  @Test
   public void testEntriesIterator() {
     doTestIterator(OP.ENTRIES, 0, OP.PUT);
   }
   
+  @Test
   public void testKeysIterator1() {
     doTestIterator(OP.KEYS, 1, OP.PUT);
   }
 
+  @Test
   public void testValuesIterator1() {
     doTestIterator(OP.VALUES, 1, OP.PUT);
   }
 
+  @Test
   public void testEntriesIterator1() {
     doTestIterator(OP.ENTRIES, 1, OP.PUT);
   }
 
+  @Test
   public void testKeysIteratorOnDestroy() {
     doTestIterator(OP.KEYS, 0, OP.DESTROY);
   }
 
+  @Test
   public void testValuesIteratorOnDestroy() {
     doTestIterator(OP.VALUES, 0, OP.DESTROY);
   }
 
+  @Test
   public void testEntriesIteratorOnDestroy() {
     doTestIterator(OP.ENTRIES, 0, OP.DESTROY);
   }
   
+  @Test
   public void testKeysIterator1OnDestroy() {
     doTestIterator(OP.KEYS, 1, OP.DESTROY);
   }
 
+  @Test
   public void testValuesIterator1OnDestroy() {
     doTestIterator(OP.VALUES, 1, OP.DESTROY);
   }
 
+  @Test
   public void testEntriesIterator1OnDestroy() {
     doTestIterator(OP.ENTRIES, 1, OP.DESTROY);
   }
@@ -2099,6 +2130,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testKeyIterationOnRR() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -2148,6 +2180,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testValuesIterationOnRR() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -2197,6 +2230,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testEntriesIterationOnRR() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -2246,6 +2280,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testIllegalIteration() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -2380,10 +2415,12 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     OnMember
   }
   
+  @Test
   public void testTxFunctionOnRegion() {
     doTestTxFunction(Executions.OnRegion);
   }
 
+  @Test
   public void testTxFunctionOnMember() {
     doTestTxFunction(Executions.OnMember);
   }
@@ -2499,6 +2536,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testNestedTxFunction() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -2571,6 +2609,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testDRFunctionExecution() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -2660,6 +2699,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testTxFunctionWithOtherOps() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -2873,10 +2913,12 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     return expectedSet;
   }
 
+  @Test
   public void testRemoteJTACommit() {
     doRemoteJTA(true);
   }
 
+  @Test
   public void testRemoteJTARollback() {
     doRemoteJTA(false);
   }
@@ -2942,6 +2984,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
   }
   
   
+  @Test
   public void testOriginRemoteIsTrueForRemoteReplicatedRegions() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -3046,6 +3089,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
   
   
   
+  @Test
   public void testRemoteCreateInReplicatedRegion() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -3084,6 +3128,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testRemoteTxCleanupOnCrash() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -3115,16 +3160,19 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
   
+  @Test
   public void testNonColocatedPutAll() {
     doNonColocatedbulkOp(OP.PUTALL);
   }
 
   /**
-   * disabled because rather than throwing an exception, 
+   * disabled because rather than throwing an exception,
    * getAll catches all exceptions and logs a warning
    * message
    */
-  public void _SWAP_testNonColocatedGetAll() {
+  @Ignore("disabled because rather than throwing an exception, getAll catches all exceptions and logs a warning message")
+  @Test
+  public void testNonColocatedGetAll() {
     doNonColocatedbulkOp(OP.GETALL);
   }
   
@@ -3167,10 +3215,12 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testBasicPutAll() {
     doTestBasicBulkOP(OP.PUTALL);
   }
 
+  @Test
   public void testBasicRemoveAll() {
     doTestBasicBulkOP(OP.REMOVEALL);
   }
@@ -3312,6 +3362,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
     });
   }
 
+  @Test
   public void testDestroyCreateConflation() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -3604,6 +3655,7 @@ protected static class ClientListener extends CacheListenerAdapter {
   }
   
   
+  @Test
   public void testTXWithRI() throws Exception {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -3652,6 +3704,7 @@ protected static class ClientListener extends CacheListenerAdapter {
   
   private static final String EMPTY_REGION = "emptyRegionName";
   
+  @Test
   public void testBug43176() {
     Host host = Host.getHost(0);
     VM datastore = host.getVM(0);
@@ -3725,6 +3778,7 @@ protected static class ClientListener extends CacheListenerAdapter {
     });
   }
   
+  @Test
   public void testTXWithRICommitInDatastore() throws Exception {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -3772,6 +3826,7 @@ protected static class ClientListener extends CacheListenerAdapter {
   }
   
 
+  @Test
   public void testListenersNotInvokedOnSecondary() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -3822,6 +3877,7 @@ protected static class ClientListener extends CacheListenerAdapter {
     }
   }
 
+  @Test
   public void testBug33073() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -3860,6 +3916,7 @@ protected static class ClientListener extends CacheListenerAdapter {
     });
   }
   
+  @Test
   public void testBug43081() throws Exception {
     createRegion(false, 0, null);
     Context ctx = getCache().getJNDIContext();
@@ -3944,6 +4001,7 @@ protected static class ClientListener extends CacheListenerAdapter {
     }
   }
   
+  @Test
   public void testBug45556() {
     Host host = Host.getHost(0);
     VM accessor = host.getVM(0);
@@ -4038,6 +4096,7 @@ protected static class ClientListener extends CacheListenerAdapter {
     });
   }
   
+  @Test
   public void testExpirySuspend_bug45984() {
     Host host = Host.getHost(0);
     VM vm1 = host.getVM(0);
@@ -4114,6 +4173,7 @@ protected static class ClientListener extends CacheListenerAdapter {
     
   }
   
+  @Test
   public void testRemoteFetchVersionMessage() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -4150,6 +4210,7 @@ protected static class ClientListener extends CacheListenerAdapter {
     });
   }
 
+  @Test
   public void testTransactionWithRemoteVersionFetch() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
@@ -4201,6 +4262,7 @@ protected static class ClientListener extends CacheListenerAdapter {
     });
   }
 
+  @Test
   public void testBug49398() {
     disconnectAllFromDS();
     Host host = Host.getHost(0);
@@ -4255,6 +4317,7 @@ protected static class ClientListener extends CacheListenerAdapter {
    * Install Listeners and verify that they are invoked after all tx events have been applied to the cache
    * see GEODE-278
    */
+  @Test
   public void testNonInlineRemoteEvents() {
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
index da8a6f3..02bf902 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
@@ -69,11 +69,6 @@ public class SingleHopStatsDUnitTest extends JUnit4CacheTestCase {
   private static long metaDataRefreshCount_Shipment;
   private static long nonSingleHopsCount_Shipment;
 
-
-  public SingleHopStatsDUnitTest() {
-    super();
-  }
-
   @Override
   public final void postSetUp() throws Exception {
     Host host = Host.getHost(0);
@@ -150,12 +145,9 @@ public class SingleHopStatsDUnitTest extends JUnit4CacheTestCase {
 
   private void createClient(int port0, int port1, int port2, String colocation) {
     Properties props = new Properties();
-    props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new SingleHopStatsDUnitTest(
-        "SingleHopStatsDUnitTest");
-    DistributedSystem distributedSystem = test.getSystem(props);
+    DistributedSystem distributedSystem = getSystem(props);
     Cache cache = CacheFactory.create(distributedSystem);
     assertNotNull(cache);
     CacheServerTestUtil.disableShufflingOfEndpoints();
@@ -175,9 +167,7 @@ public class SingleHopStatsDUnitTest extends JUnit4CacheTestCase {
   }
 
   private int createServerForStats(int redundantCopies, int totalNoofBuckets, String colocation) {
-    CacheTestCase test = new SingleHopStatsDUnitTest(
-        "SingleHopStatsDUnitTest");
-    Cache cache = test.getCache();
+    Cache cache = getCache();
     CacheServer server = cache.addCacheServer();
     server.setPort(0);
     server.setHostnameForClients("localhost");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
index 2288640..c860cfc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
@@ -16,11 +16,14 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import junit.framework.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
 
 import com.gemstone.gemfire.CancelException;
 import com.gemstone.gemfire.LogWriter;
@@ -52,13 +55,8 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
   static final Scope SCOPE = Scope.DISTRIBUTED_ACK;
   
   volatile static Object newValue, oldValue;
-  
-  public SystemFailureDUnitTest(String name) {
-    super(name);
-  }
-
-  /////////  Public test methods
 
+  @Test
   public void testNullFailure() {
     com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("TODO: this test needs to use VM#bounce.");
     try {
@@ -73,13 +71,13 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
   /**
    * @see StackOverflowError
    */
-  public void _testStackOverflow()
+  @Ignore("TODO")
+  @Test
+  public void testStackOverflow()
     throws CacheException, InterruptedException {
     String exceptions =
       StackOverflowError.class.getName() 
       + "||"
-//      + OutOfMemoryError.class.getName()
-//      + "||"
       + AssertionError.class.getName();
     
     try {
@@ -106,7 +104,9 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
    * @throws CacheException
    * @throws InterruptedException
    */
-  public void _testOutOfMemory()
+  @Ignore("TODO")
+  @Test
+  public void testOutOfMemory()
     throws CacheException, InterruptedException {
   
     String exceptions =
@@ -137,7 +137,9 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
    * @throws CacheException
    * @throws InterruptedException
    */
-  public void _testPersistentOutOfMemory()
+  @Ignore("TODO")
+  @Test
+  public void testPersistentOutOfMemory()
     throws CacheException, InterruptedException {
   
     String exceptions =
@@ -169,7 +171,9 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
    * @throws CacheException
    * @throws InterruptedException
    */
-  public void _testMemoryMonitor()
+  @Ignore("TODO")
+  @Test
+  public void testMemoryMonitor()
     throws CacheException, InterruptedException {
   
     String exceptions =
@@ -201,7 +205,9 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
      * @throws CacheException
      * @throws InterruptedException
      */
-    public void _testInternalError()
+    @Ignore("TODO")
+    @Test
+    public void testInternalError()
     throws CacheException, InterruptedException {
       String exceptions =
         InternalError.class.getName()
@@ -231,7 +237,9 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
    * @throws CacheException
    * @throws InterruptedException
    */
-  public void _testUnknownError()
+  @Ignore("TODO")
+  @Test
+  public void testUnknownError()
       throws CacheException, InterruptedException {
     String exceptions =
       UnknownError.class.getName()
@@ -275,11 +283,13 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
   }
   
   /**
-     * Create some sort of horrible failure that is <em>not</em>
-     * a VirtualMachineError.
-     */
-    public void _testError()
-    throws CacheException, InterruptedException {
+   * Create some sort of horrible failure that is <em>not</em>
+   * a VirtualMachineError.
+   */
+  @Ignore("TODO")
+  @Test
+  public void testError()
+  throws CacheException, InterruptedException {
     // In this case we do NOT expect a failure
     String exceptions =
       Error.class.getName();
@@ -287,7 +297,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
     try {
       String name = "testError";
       doCreateEntry(name);
-      Assert.assertTrue(doVerifyConnected());
+      assertTrue(doVerifyConnected());
       
        doMessage(
           "<ExpectedException action=add>"
@@ -331,59 +341,37 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
   /**
    * Verify that listener gets called, and exactly once.
    */
-  public void _testListener()
+  @Ignore("TODO")
+  @Test
+  public void testListener()
       throws CacheException, InterruptedException {
 
-  String exceptions =
-      Error.class.getName();
-  try {
-    String name = "testListener";
-    doExec("setListener1");
-    
-    doMessage(
-        "<ExpectedException action=add>"
+    String exceptions =
+        Error.class.getName();
+    try {
+      String name = "testListener";
+      doExec("setListener1");
+
+      doMessage(
+          "<ExpectedException action=add>"
+          + exceptions
+          + "</ExpectedException>");
+      doCreateEntry(name);
+
+      Integer count = (Integer)doExec("getListenerCount");
+      assertEquals(1, count.intValue());
+      doVerifyDisconnected();
+    }
+    finally {
+      doMessage(
+        "<ExpectedException action=remove>"
         + exceptions
         + "</ExpectedException>");
-    doCreateEntry(name);
+      resetVM();
+    }
 
-    Integer count = (Integer)doExec("getListenerCount");
-    Assert.assertEquals(1, count.intValue());
-    doVerifyDisconnected();
-  }
-  finally {
-    doMessage(
-      "<ExpectedException action=remove>"
-      + exceptions
-      + "</ExpectedException>");
-    resetVM();
   }
 
-}
-
-//  protected static void doReset() {
-//    // TODO instead of trying to patch up this VM, Lise should create
-//    // me a brand spanking new one
-//    throw new AssertionError("Sorry, ask Lise to fix this");
-//    
-//    // You'll have to un-comment some methods in order to make
-//    // the following hack work ONCE on a VM...
-////    try {
-////      Thread.sleep(5000);
-////    }
-////    catch (InterruptedException e) {
-////      fail("interrupted");
-////    }
-////    
-////    SystemFailure.reset(); <--- here
-////    DistributedCacheTestCase.cache = null;
-////
-////    // Discard the existing cache instance
-////    GemFireCache.clearInstance(); <--- here
-////    
-////    // This is just to stop the stat sampler thread
-////    HostStatSampler.emergencyStop(); <--- here
-//  }
-  
   private void resetVM() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
@@ -459,7 +447,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
     }
     
     // At this point, the cache we peeked earlier should be unavailable
-    Assert.assertTrue(GemFireCacheImpl.getInstance() == null);
+    assertTrue(GemFireCacheImpl.getInstance() == null);
     
     // Ditto for the distributed system
     InternalDistributedSystem ids = (InternalDistributedSystem)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TestDelta.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TestDelta.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TestDelta.java
index fefbc60..667a654 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TestDelta.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TestDelta.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+import static org.junit.Assert.*;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -27,70 +29,70 @@ import com.gemstone.gemfire.InvalidDeltaException;
 
 public final class TestDelta implements Delta, DataSerializable, Cloneable {
 
-    public boolean hasDelta;
-    public String info;
-    public int serializations;
-    public int deserializations;
-    public int deltas;
-    public int clones;
-    
-    public TestDelta() {
-    }
+  public boolean hasDelta;
+  public String info;
+  public int serializations;
+  public int deserializations;
+  public int deltas;
+  public int clones;
+
+  public TestDelta() {
+  }
+
+  public TestDelta(boolean hasDelta, String info) {
+    this.hasDelta = hasDelta;
+    this.info = info;
+  }
 
-    public TestDelta(boolean hasDelta, String info) {
-      this.hasDelta = hasDelta;
-      this.info = info;
-    }
-    
-    public synchronized void checkFields(final int serializations, final int deserializations, final int deltas, final int clones) {
-      DeltaSizingDUnitTest.assertEquals(serializations, this.serializations);
-      DeltaSizingDUnitTest.assertEquals(deserializations, this.deserializations);
-      DeltaSizingDUnitTest.assertEquals(deltas, this.deltas);
-      DeltaSizingDUnitTest.assertEquals(clones, this.clones);
-    }
+  public synchronized void checkFields(final int serializations, final int deserializations, final int deltas, final int clones) {
+    assertEquals(serializations, this.serializations);
+    assertEquals(deserializations, this.deserializations);
+    assertEquals(deltas, this.deltas);
+    assertEquals(clones, this.clones);
+  }
 
-    public synchronized void fromDelta(DataInput in) throws IOException,
-        InvalidDeltaException {
+  public synchronized void fromDelta(DataInput in) throws IOException,
+      InvalidDeltaException {
 //      new Exception("DAN - From Delta Called").printStackTrace();
-      this.hasDelta = true;
-      info = DataSerializer.readString(in);
-      deltas++;
-    }
+    this.hasDelta = true;
+    info = DataSerializer.readString(in);
+    deltas++;
+  }
 
-    public boolean hasDelta() {
-      return hasDelta;
-    }
+  public boolean hasDelta() {
+    return hasDelta;
+  }
 
-    public synchronized void toDelta(DataOutput out) throws IOException {
+  public synchronized void toDelta(DataOutput out) throws IOException {
 //      new Exception("DAN - To Delta Called").printStackTrace();
-      DataSerializer.writeString(info, out);
-    }
+    DataSerializer.writeString(info, out);
+  }
 
-    public synchronized void fromData(DataInput in) throws IOException,
-        ClassNotFoundException {
+  public synchronized void fromData(DataInput in) throws IOException,
+      ClassNotFoundException {
 //      new Exception("DAN - From Data Called").printStackTrace();
-      info = DataSerializer.readString(in);
-      serializations = in.readInt();
-      deserializations = in.readInt();
-      deltas = in.readInt();
-      clones = in.readInt();
-      deserializations++;
-    }
+    info = DataSerializer.readString(in);
+    serializations = in.readInt();
+    deserializations = in.readInt();
+    deltas = in.readInt();
+    clones = in.readInt();
+    deserializations++;
+  }
 
-    public synchronized void toData(DataOutput out) throws IOException {
+  public synchronized void toData(DataOutput out) throws IOException {
 //      new Exception("DAN - To Data Called").printStackTrace();
-      serializations++;
-      DataSerializer.writeString(info, out);
-      out.writeInt(serializations);
-      out.writeInt(deserializations);
-      out.writeInt(deltas);
-      out.writeInt(clones);
-    }
+    serializations++;
+    DataSerializer.writeString(info, out);
+    out.writeInt(serializations);
+    out.writeInt(deserializations);
+    out.writeInt(deltas);
+    out.writeInt(clones);
+  }
 
-    @Override
-    public synchronized Object clone() throws CloneNotSupportedException {
+  @Override
+  public synchronized Object clone() throws CloneNotSupportedException {
 //    new Exception("DAN - Clone Called").printStackTrace();
-      clones++;
-      return super.clone();
-    } 
-  }
\ No newline at end of file
+    clones++;
+    return super.clone();
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index 8256a58..4584ecb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -325,18 +325,18 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
     startLocatorInVM(portLocator);
     try {
 
-    Integer port1 = (Integer)server1.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false,
+    Integer port1 = (Integer)server1.invoke(() -> createServerWithLocator( locator, false,
             commonAttributes ));
 
-    Integer port2 = (Integer)server2.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false,
+    Integer port2 = (Integer)server2.invoke(() -> createServerWithLocator( locator, false,
             commonAttributes ));
 
-    server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createClientWithLocator( hostLocator, portLocator ));
+    server4.invoke(() -> createClientWithLocator( hostLocator, portLocator ));
     server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.putIntoRegion());
 
     server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.fetchMetaData());
     
-    Integer port3 = (Integer)server3.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false,
+    Integer port3 = (Integer)server3.invoke(() -> createServerWithLocator( locator, false,
             commonAttributes ));
 
     Object result = server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.executeFunction());
@@ -370,15 +370,15 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
     startLocatorInVM(portLocator);
     try {
 
-    Integer port1 = (Integer)server1.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false,
+    Integer port1 = (Integer)server1.invoke(() -> createServerWithLocator( locator, false,
             commonAttributes ));
 
-    server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createClientWithLocator( hostLocator, portLocator ));
+    server4.invoke(() -> createClientWithLocator( hostLocator, portLocator ));
     server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.putIntoRegion());
 
     server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.fetchMetaData());
     
-    Integer port2 = (Integer)server2.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false,
+    Integer port2 = (Integer)server2.invoke(() -> createServerWithLocator( locator, false,
             commonAttributes ));
 
     Object result = server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.executeFunction());
@@ -414,13 +414,11 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
     locator.stop();
   }
   
-  public static int createServerWithLocator(String locator, boolean isAccessor, ArrayList commonAttrs) {
-    CacheTestCase test = new PRClientServerRegionFunctionExecutionFailoverDUnitTest(
-    "PRClientServerRegionFunctionExecutionFailoverDUnitTest");
+  public int createServerWithLocator(String locator, boolean isAccessor, ArrayList commonAttrs) {
     Properties props = new Properties();
     props = new Properties();
     props.setProperty("locators", locator);
-    DistributedSystem ds = test.getSystem(props);
+    DistributedSystem ds = getSystem(props);
     cache = new CacheFactory(props).create(ds);
     
     CacheServer server = cache.addCacheServer();
@@ -450,14 +448,12 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
     return port;
   }
   
-  public static void createClientWithLocator(String host, int port0) {
+  public void createClientWithLocator(String host, int port0) {
     Properties props = new Properties();
     props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
-    CacheTestCase test = new PRClientServerRegionFunctionExecutionFailoverDUnitTest(
-        "PRClientServerRegionFunctionExecutionFailoverDUnitTest");
-    DistributedSystem ds = test.getSystem(props);
+    DistributedSystem ds = getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
     CacheServerTestUtil.disableShufflingOfEndpoints();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java
index 47c1fb0..1445e07 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java
@@ -372,11 +372,6 @@ public class HAGIIBugDUnitTest extends JUnit4DistributedTestCase
     }
   }
 
-  public HAGIIBugDUnitTest(String arg0) {
-    super(arg0);
-
-  }
-
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java
index 178595d..abbba32 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java
@@ -234,7 +234,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase
 
   public static void createRegion() throws Exception
   {
-    HARegionDUnitTest test = new HARegionDUnitTest(REGION_NAME);
+    HARegionDUnitTest test = new HARegionDUnitTest();
     cache = test.createCache();
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -254,7 +254,7 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase
 
   public static void createRegionQueue() throws Exception
   {
-    HARegionDUnitTest test = new HARegionDUnitTest(REGION_NAME);
+    HARegionDUnitTest test = new HARegionDUnitTest();
     cache = test.createCache();
     /*AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_ACK);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
index 4c640ce..49020fd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
@@ -63,7 +63,6 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  * 
  * 
  */
-@Category(DistributedTest.class)
 @Ignore("Test was disabled by renaming to DisabledTest")
 @Category(DistributedTest.class)
 public class StatsBugDUnitTest extends JUnit4DistributedTestCase
@@ -104,12 +103,6 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase
   /** prefix added to the keys of events generated on secondary */
   private static final String secondaryPrefix = "secondary_";
 
-  /**
-   * Constructor
-   * 
-   * @param name -
-   *          name for this test instance
-   */
   public StatsBugDUnitTest() {
     super();
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java
index 6a4f98c..3da750f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java
@@ -53,10 +53,6 @@ public class PersistPRKRFDUnitTest extends PersistentPartitionedRegionTestBase {
   private static final int MAX_WAIT = 30 * 1000;
   static Object lockObject = new Object();
   
-  public PersistPRKRFDUnitTest() {
-    super();
-  }
-  
   /**
    * do a put/modify/destroy while closing disk store
    * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
index 59700d9..692378c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.internal.cache.partitioned;
 
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -44,8 +46,6 @@ import com.gemstone.gemfire.cache.control.RebalanceFactory;
 import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
 import com.gemstone.gemfire.cache.partition.PartitionRegionInfo;
 import com.gemstone.gemfire.cache.persistence.PersistentID;
-import com.gemstone.gemfire.cache.persistence.RevokeFailedException;
-import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.FileUtil;
 import com.gemstone.gemfire.internal.cache.DiskRegion;
@@ -65,19 +65,16 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+
+public abstract class PersistentPartitionedRegionTestBase extends JUnit4CacheTestCase {
 
-/**
- *
- */
-public abstract class PersistentPartitionedRegionTestBase extends CacheTestCase {
   public static String PR_REGION_NAME = "region";
 //This must be bigger than the dunit ack-wait-threshold for the revoke
   //tests. The command line is setting the ack-wait-threshold to be 
   //60 seconds.
   private static final int MAX_WAIT = 70 * 1000;
   
-  
-
   /* (non-Javadoc)
    * Set the region name for this test so that multiple subclasses of this
    * test base do not conflict with one another during parallel dunit runs
@@ -99,13 +96,6 @@ public abstract class PersistentPartitionedRegionTestBase extends CacheTestCase
     PR_REGION_NAME = testName + "Region";
   }
 
-  /**
-   * @param name
-   */
-  public PersistentPartitionedRegionTestBase(String name) {
-    super(name);
-  }
-
   protected void checkRecoveredFromDisk(VM vm, final int bucketId, final boolean recoveredLocally) {
     vm.invoke(new SerializableRunnable("check recovered from disk") {
       public void run() { 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
index b529e49..4fb2f82 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
@@ -102,9 +102,6 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  */
 @Category(DistributedTest.class)
 public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBase {
-  public PersistentRecoveryOrderDUnitTest() {
-    super();
-  }
 
   public static void resetAckWaitThreshold() {
     if (SAVED_ACK_WAIT_THRESHOLD != null) {



Mime
View raw message