geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [1/7] incubator-geode git commit: Misc test cleanup
Date Thu, 02 Jun 2016 20:18:42 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-837 fb5578498 -> 24aa64341


Misc test cleanup


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cff6e863
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cff6e863
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cff6e863

Branch: refs/heads/feature/GEODE-837
Commit: cff6e8630b7f26ccd527abb8e3cca3fee87e8e49
Parents: fb55784
Author: Kirk Lund <klund@apache.org>
Authored: Thu Jun 2 10:29:00 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Thu Jun 2 10:29:00 2016 -0700

----------------------------------------------------------------------
 .../MemoryThresholdsOffHeapDUnitTest.java       |  10 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  |   2 +-
 .../internal/cache/Bug41733DUnitTest.java       |   4 +-
 .../cache/locks/TXLockServiceDUnitTest.java     |   2 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |   6 +-
 .../PersistentPartitionedRegionDUnitTest.java   |   2 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java |  12 +-
 .../DestroyEntryPropagationDUnitTest.java       | 133 +++++-----
 .../DurableClientReconnectAutoDUnitTest.java    |  30 +--
 .../DurableClientReconnectDUnitTest.java        | 263 +++++++++----------
 .../sockets/RedundancyLevelPart1DUnitTest.java  |  77 ++----
 .../sockets/RedundancyLevelPart2DUnitTest.java  |  97 ++-----
 .../sockets/RedundancyLevelPart3DUnitTest.java  |  40 +--
 .../tier/sockets/RedundancyLevelTestBase.java   |  26 +-
 ...WithLineMissingFromEndOfOutputJUnitTest.java |   1 -
 ...hLineMissingFromMiddleOfOutputJUnitTest.java |   1 -
 16 files changed, 283 insertions(+), 423 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 26eca67..4aabe62 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -516,8 +516,8 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
     final String rName = getUniqueName();
     
     // Make sure the desired VMs will have a fresh DS.
-    AsyncInvocation d1 = replicate1.invokeAsync(() -> DistributedTestCase.disconnectFromDS());
-    AsyncInvocation d2 = replicate2.invokeAsync(() -> DistributedTestCase.disconnectFromDS());
+    AsyncInvocation d1 = replicate1.invokeAsync(() -> disconnectFromDS());
+    AsyncInvocation d2 = replicate2.invokeAsync(() -> disconnectFromDS());
     d1.join();
     assertFalse(d1.exceptionOccurred());
     d2.join();
@@ -921,8 +921,8 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
     final String rName = getUniqueName();
 
     // Make sure the desired VMs will have a fresh DS. TODO: convert these from AsyncInvocation to invoke
-    AsyncInvocation d0 = accessor.invokeAsync(() -> DistributedTestCase.disconnectFromDS());
-    AsyncInvocation d1 = ds1.invokeAsync(() -> DistributedTestCase.disconnectFromDS());
+    AsyncInvocation d0 = accessor.invokeAsync(() -> disconnectFromDS());
+    AsyncInvocation d1 = ds1.invokeAsync(() -> disconnectFromDS());
     d0.join();
     assertFalse(d0.exceptionOccurred());
     d1.join();
@@ -1145,7 +1145,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
     final VM vm = host.getVM(2);
     final String rName = getUniqueName();
 
-    vm.invoke(() -> DistributedTestCase.disconnectFromDS());
+    vm.invoke(() -> disconnectFromDS());
     
     vm.invoke(new CacheSerializableRunnable("test LocalRegion load passthrough when critical") {
       @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
index 61baf52..530c316 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
@@ -4860,7 +4860,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
   public void testNBRegionInvalidationDuringGetInitialImage() throws Exception {
     assumeTrue(supportsReplication());
 
-    DistributedTestCase.disconnectAllFromDS();
+    disconnectAllFromDS();
 
     // don't run this for noAck, too many race conditions
     if (getRegionAttributes().getScope().isDistributedNoAck()) return;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
index 3f0e2a0..8d1453c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
@@ -93,7 +93,7 @@ public class Bug41733DUnitTest extends JUnit4CacheTestCase {
           public void beforeProcessMessage(DistributionManager dm,
               DistributionMessage message) {
             if(message instanceof ManageBucketReplyMessage) {
-              DistributedTestCase.disconnectFromDS();
+              disconnectFromDS();
             }
           }
         });
@@ -144,7 +144,7 @@ public class Bug41733DUnitTest extends JUnit4CacheTestCase {
           public void beforeProcessMessage(DistributionManager dm,
               DistributionMessage message) {
             if(message instanceof ManageBucketMessage) {
-              vm0.invoke(() -> DistributedTestCase.disconnectFromDS());
+              vm0.invoke(() -> disconnectFromDS());
             }
           }
         });

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java
index db7496e..15b39d8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java
@@ -399,7 +399,7 @@ public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
         TXLockService.destroyServices();
       }
     });
-    Host.getHost(0).getVM(originatorVM).invoke(() -> DistributedTestCase.disconnectFromDS());
+    Host.getHost(0).getVM(originatorVM).invoke(() -> disconnectFromDS());
     
     
     // grantor sends TXOriginatorRecoveryMessage...

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
index 37577b5..59380b7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
@@ -103,7 +103,7 @@ public class Bug43684DUnitTest extends JUnit4DistributedTestCase {
     if (cache != null && !cache.isClosed()) {
       cache.close();
     }
-    DistributedTestCase.disconnectFromDS();
+    disconnectFromDS();
   }
 
   @Test
@@ -259,7 +259,7 @@ public class Bug43684DUnitTest extends JUnit4DistributedTestCase {
 
   @SuppressWarnings("rawtypes")
   public static Integer createServerCache(Boolean isReplicated, Boolean isPrimaryEmpty) throws Exception {
-    DistributedTestCase.disconnectFromDS();
+    disconnectFromDS();
     Properties props = new Properties();
     props.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]");
 //    props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
@@ -288,7 +288,7 @@ public class Bug43684DUnitTest extends JUnit4DistributedTestCase {
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public static void createClientCache(Host host, Integer port) {
-    DistributedTestCase.disconnectFromDS();
+    disconnectFromDS();
     Properties props = new Properties();
 //    props.setProperty("log-file", "client_" + OSProcess.getId() + ".log");
 //    props.setProperty("log-level", "fine");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index 70546d4..e8a3c7b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -1482,7 +1482,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
               DistributionMessage msg) {
             if(msg instanceof ManageBucketReplyMessage) {
               Cache cache = getCache();
-              DistributedTestCase.disconnectFromDS();
+              disconnectFromDS();
               
               await().atMost(30, SECONDS).until(() -> {return (cache == null || cache.isClosed());});
               LogWriterUtils.getLogWriter().info("Cache is confirmed closed");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
index eed4bb2..8ccfea6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
@@ -83,17 +83,11 @@ import com.gemstone.gemfire.test.dunit.Wait;
  */
 @Category(DistributedTest.class)
 public class ShutdownAllDUnitTest extends JUnit4CacheTestCase {
-  protected static HangingCacheListener listener;
 
+  private static HangingCacheListener listener;
 
-  final String expectedExceptions = InternalGemFireError.class.getName()+"||ShutdownAllRequest: disconnect distributed without response";
+  private static final String expectedExceptions = InternalGemFireError.class.getName()+"||ShutdownAllRequest: disconnect distributed without response";
 
-  public ShutdownAllDUnitTest() {
-    super();
-  }
-  /**
-   * 
-   */
   private static final int MAX_WAIT = 600 * 1000;
   
   @Override
@@ -101,7 +95,7 @@ public class ShutdownAllDUnitTest extends JUnit4CacheTestCase {
     //Get rid of any existing distributed systems. We want
     //to make assertions about the number of distributed systems
     //we shut down, so we need to start with a clean slate.
-    DistributedTestCase.disconnectAllFromDS();
+    disconnectAllFromDS();
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index 565a892..4c39aef 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -16,11 +16,14 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
@@ -33,51 +36,49 @@ import com.gemstone.gemfire.cache.Operation;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.Connection;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.EventID;
 import com.gemstone.gemfire.internal.cache.EventIDHolder;
 import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
 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.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
-import com.gemstone.gemfire.cache.client.*;
-import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy;
-import com.gemstone.gemfire.cache.client.internal.Connection;
-import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
 /**
  * Tests propagation of destroy entry operation across the vms
  */
-public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
-
-  VM vm0 = null;
+@Category(DistributedTest.class)
+public class DestroyEntryPropagationDUnitTest extends JUnit4DistributedTestCase {
 
-  VM vm1 = null;
+  private static final String REGION_NAME = DestroyEntryPropagationDUnitTest.class.getSimpleName() + "_region";
+  private static final String WAIT_PROPERTY = DestroyEntryPropagationDUnitTest.class.getSimpleName() + ".maxWaitTime";
+  private static final int WAIT_DEFAULT = 120000;
 
-  VM vm2 = null;
+  private static Cache cache;
 
-  VM vm3 = null;
+  private VM vm0;
+  private VM vm1;
+  private VM vm2;
+  private VM vm3;
 
   private int PORT1 ;
   private int PORT2;
-  protected static Cache cache = null;
-
-  private static final String REGION_NAME = "DestroyEntryPropagationDUnitTest_region";
-
-  /** constructor */
-  public DestroyEntryPropagationDUnitTest(String name) {
-    super(name);
-  }
 
   @Override
   public final void postSetUp() throws Exception {
@@ -103,8 +104,22 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)));
   }
 
-  private void createCache(Properties props) throws Exception
-  {
+  @Override
+  public final void preTearDown() throws Exception {
+    //close client
+    vm2.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache());
+    vm3.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache());
+    //close server
+    vm0.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache());
+    vm1.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache());
+  }
+
+  @Override
+  public final void postTearDown() throws Exception {
+    cache = null;
+  }
+
+  private void createCache(Properties props) throws Exception {
     DistributedSystem ds = getSystem(props);
     cache = CacheFactory.create(ds);
     assertNotNull(cache);
@@ -112,10 +127,9 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
 
   /**
    * This tests whether the destroy are propagted or not according to interest registration.
-   *
    */
-  public void testDestroyPropagation()
-  {
+  @Test
+  public void testDestroyPropagation() {
     //First create entries on both servers via the two clients
     vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2());
     vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2());
@@ -141,10 +155,9 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
   /**
    * This tests whether the destroy happened directly on server are propagted or
    * not.
-   *
    */
-  public void testDestroyOnServerPropagation()
-  {
+  @Test
+  public void testDestroyOnServerPropagation() {
     //First create entries on both servers via the two client
     vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2());
     vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2());
@@ -165,16 +178,12 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
 
   }
 
-  static private final String WAIT_PROPERTY =
-    "DestroyEntryPropagationDUnitTest.maxWaitTime";
-  static private final int WAIT_DEFAULT = 120000;
-
   /**
    * This tests whether the destroy are received by the sender or not if there
    * are situation of Interest List fail over
-   *
    */
   @Category(FlakyTest.class) // GEODE-897: random port, time sensitive, waitForCriterion, 2 minute timeouts, eats exception (1 fixed)
+  @Test
   public void testVerifyDestroyNotReceivedBySender() {
     final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
     //First create entries on both servers via the two client
@@ -250,8 +259,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
 
   }
 
-  public void acquireConnectionsAndDestroyEntriesK1andK2()
-  {
+  private void acquireConnectionsAndDestroyEntriesK1andK2() {
     try {
       Region r1 = cache.getRegion(Region.SEPARATOR+REGION_NAME);
       assertNotNull(r1);
@@ -277,8 +285,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     }
   }
 
-  public static void killServer(Integer port)
-  {
+  private static void killServer(Integer port) {
     try {
       Iterator iter = cache.getCacheServers().iterator();
       LogWriterUtils.getLogWriter().fine ("Asif: servers running = "+cache.getCacheServers().size());
@@ -295,8 +302,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     }
   }
 
-  public static void startServer(Integer port)
-  {
+  private static void startServer(Integer port) {
     try {
       CacheServer server1 = cache.addCacheServer();
       server1.setPort(port.intValue());
@@ -310,10 +316,8 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
 
   /**
    * Creates entries on the server
-   *
    */
-  public static void createEntriesK1andK2()
-  {
+  private static void createEntriesK1andK2() {
     try {
       Region r1 = cache.getRegion(Region.SEPARATOR+REGION_NAME);
       assertNotNull(r1);
@@ -333,10 +337,8 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
 
   /**
    * destroy entry
-   *
    */
-  public static void destroyEntriesK1andK2()
-  {
+  private static void destroyEntriesK1andK2() {
     try {
       Region r = cache.getRegion(Region.SEPARATOR+ REGION_NAME);
       assertNotNull(r);
@@ -348,8 +350,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     }
   }
 
-  public static void verifyNoDestroyEntryInSender()
-  {
+  private static void verifyNoDestroyEntryInSender() {
     try {
       Region r = cache.getRegion(Region.SEPARATOR+ REGION_NAME);
       assertNotNull(r);
@@ -361,8 +362,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     }
   }
 
-  public static void verifyEntriesAreDestroyed()
-  {
+  private static void verifyEntriesAreDestroyed() {
     try {
       Region r = cache.getRegion(Region.SEPARATOR+ REGION_NAME);
       assertNotNull(r);
@@ -375,8 +375,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     }
   }
 
-  public static void verifyOnlyRegisteredEntriesAreDestroyed()
-  {
+  private static void verifyOnlyRegisteredEntriesAreDestroyed() {
     try {
       Region r = cache.getRegion(Region.SEPARATOR+ REGION_NAME);
       assertNotNull(r);
@@ -389,7 +388,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     }
   }
 
-  public static void waitForDestroyEvent(Region r, final Object key) {
+  private static void waitForDestroyEvent(Region r, final Object key) {
     final CertifiableTestCacheListener ccl = (CertifiableTestCacheListener) r.getAttributes().getCacheListener();
     WaitCriterion ev = new WaitCriterion() {
       public boolean done() {
@@ -403,14 +402,13 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     ccl.destroys.remove(key);
   }
 
-  public static void createClientCache(String host, Integer port1, Integer port2) throws Exception
-  {
+  private static void createClientCache(String host, Integer port1, Integer port2) throws Exception {
     int PORT1 = port1.intValue();
     int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
-    new DestroyEntryPropagationDUnitTest("temp").createCache(props);
+    new DestroyEntryPropagationDUnitTest().createCache(props);
     CacheServerTestUtil.disableShufflingOfEndpoints();
     Pool p;
     try {
@@ -438,9 +436,8 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
 
   }
 
-  public static Integer createServerCache() throws Exception
-  {
-    new DestroyEntryPropagationDUnitTest("temp").createCache(new Properties());
+  private static Integer createServerCache() throws Exception {
+    new DestroyEntryPropagationDUnitTest().createCache(new Properties());
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_ACK);
     factory.setDataPolicy(DataPolicy.REPLICATE);
@@ -456,8 +453,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     return new Integer(server.getPort());
   }
 
-  public static void registerKey1()
-  {
+  private static void registerKey1() {
     try {
       Region r = cache.getRegion(Region.SEPARATOR+REGION_NAME);
       assertNotNull(r);
@@ -471,21 +467,10 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
     }
   }
 
-  public static void closeCache()
-  {
+  private static void closeCache() {
     if (cache != null && !cache.isClosed()) {
       cache.close();
       cache.getDistributedSystem().disconnect();
     }
   }
-
-  @Override
-  public final void preTearDown() throws Exception {
-    //close client
-    vm2.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache());
-    vm3.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache());
-    //close server
-    vm0.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache());
-    vm1.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache());
-  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
index 599e167..1812dca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
@@ -16,45 +16,41 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import org.junit.experimental.categories.Category;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.cache.client.PoolFactory;
 import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.DistributedTestUtils;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 /**
- * @since 5.7
- *
  * Test reconnecting a durable client that is using
  * the locator to discover its servers
+ *
+ * @since 5.7
  */
 @Category(DistributedTest.class)
-public class DurableClientReconnectAutoDUnitTest extends
-    DurableClientReconnectDUnitTest {
+public class DurableClientReconnectAutoDUnitTest extends DurableClientReconnectDUnitTest {
 
+  @BeforeClass
   public static void caseSetUp() throws Exception {
-    DistributedTestCase.disconnectAllFromDS();
+    disconnectAllFromDS();
   }
  
-  public DurableClientReconnectAutoDUnitTest() {
-    super();
-  }
-  
+  @Ignore("do nothing, this test doesn't make sense with the locator")
+  @Override
   @Test
   public void testDurableReconnectSingleServerWithZeroConnPerServer() {
     //do nothing, this test doesn't make sense with the locator
   }
 
+  @Ignore("do nothing, this test doesn't make sense with the locator")
+  @Override
   @Test
   public void testDurableReconnectSingleServer() throws Exception {
     //do nothing, this test doesn't make sense with the locator

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index d3aa881..9b0691d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -16,15 +16,8 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
 import static org.junit.Assert.*;
 
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,6 +28,10 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
@@ -53,25 +50,24 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
-import com.gemstone.gemfire.test.dunit.Host;
 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.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 /**      
  * Tests for durable reconnect issue
  * 
  * @since 5.2   
  */
-
 @Category(DistributedTest.class)
-public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
-{
+public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase {
+
   private static Cache cache = null;
   
   private static VM server1 = null;
@@ -95,13 +91,9 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
   
   private DurableClientReconnectDUnitTest instance = null ;
 
-  /** constructor */
-  public DurableClientReconnectDUnitTest() {
-    super();
-  }
-
+  @BeforeClass
   public static void caseSetUp() throws Exception {
-    DistributedTestCase.disconnectAllFromDS();
+    disconnectAllFromDS();
   }
  
   @Override
@@ -127,8 +119,7 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
   }
 
   @Test
-  public void testDurableReconnectSingleServer() throws Exception
-  {
+  public void testDurableReconnectSingleServer() throws Exception {
     createCacheClientAndConnectToSingleServer(NetworkUtils.getServerHostName(Host.getHost(0)), 0);
     List redundantServers = pool.getRedundantNames();    
     String primaryName = pool.getPrimaryName();
@@ -145,9 +136,9 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     assertTrue(redundantServers2.isEmpty());
     assertTrue(primaryName2.equals(primaryName));
   }
+
   @Test
-  public void testDurableReconnectSingleServerWithZeroConnPerServer() throws Exception
-  {
+  public void testDurableReconnectSingleServerWithZeroConnPerServer() throws Exception {
     createCacheClientAndConnectToSingleServerWithZeroConnPerServer(NetworkUtils.getServerHostName(Host.getHost(0)), 0);
     List redundantServers = pool.getRedundantNames();
     String primaryName = pool.getPrimaryName();
@@ -160,9 +151,9 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     assertTrue(redundantServers2.isEmpty());
     assertTrue(primaryName2.equals(primaryName));
   }
+
   @Test
-  public void testDurableReconnectNonHA() throws Exception
-  {
+  public void testDurableReconnectNonHA() throws Exception {
     createCacheClient(0);
     List redundantServers = pool.getRedundantNames();
     String primaryName = pool.getPrimaryName();
@@ -179,13 +170,12 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     assertTrue(redundantServers2.isEmpty());
     assertTrue(primaryName2.equals(primaryName));
   }
+
   /**
    * (R = 1 ) , four servers , all Servers are up, Check client reconnect to either of server having queue.
-   * @throws Exception
-   */ 
+   */
   @Test
-  public void testDurableReconnect() throws Exception
-  {
+  public void testDurableReconnect() throws Exception {
    //create client cache and Send clientReady message
     createCacheClient();
     HashSet redundantServers = new HashSet(pool.getRedundantNames());
@@ -211,11 +201,9 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     
     assertTrue(redundantServers.equals(redundantServersAfterReconnect));
   }
-  
-  
+
   @Test
-  public void testDurableReconnect_DifferentPrimary() throws Exception
-  {
+  public void testDurableReconnect_DifferentPrimary() throws Exception {
    //create client cache and Send clientReady message
     createCacheClient();
     HashSet redundantServers = new HashSet(pool.getRedundantNames());
@@ -241,11 +229,10 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     
     assertTrue(redundantServers.equals(redundantServersAfterReconnect));
     assertFalse(primaryBefore.equals(primaryAfter));
-    
   }
+
   @Test
-  public void testDurableReconnectWithOneRedundantServerDown() throws Exception
-  {
+  public void testDurableReconnectWithOneRedundantServerDown() throws Exception {
     //create client cache and Send clientReady message
     createCacheClient();
     List redundantServers = pool.getRedundantNames();
@@ -283,8 +270,7 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
   }
   
   @Test
-  public void testDurableReconnectWithBothRedundantServersDown() throws Exception
-  {
+  public void testDurableReconnectWithBothRedundantServersDown() throws Exception {
    //create client cache and Send clientReady message
     createCacheClient();
     List redundantServers = pool.getRedundantNames();
@@ -326,10 +312,8 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     assertFalse(redundantServersAfterReconnect.contains(rServer2));
   }
   
-  
   @Test
-  public void testDurableReconnectWithBothNonRedundantServersDown() throws Exception
-  {
+  public void testDurableReconnectWithBothNonRedundantServersDown() throws Exception {
    //create client cache and Send clientReady message
     createCacheClient();
     HashSet redundantServers = new HashSet(pool.getRedundantNames());
@@ -380,7 +364,8 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     assertFalse("redundantServersAfterReconnect contains " + rServer2, redundantServersAfterReconnect.contains(rServer2));
   }
   
-  /** This test checks a problem found in bug 39332 
+  /**
+   * This test checks a problem found in bug 39332
    * 1. Durable client disconnects
    * 2. Durable client comes back, creates a create to server connection but not a queue connection
    * 3. Durable client disconnects again
@@ -462,8 +447,7 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     
     assertEquals(redundantServers, redundantServersAfterReconnect);
   }
-  
-  
+
   private static void verifyRedundantServers(Set redundantServers , Set redundantServersAfterReconnect) {
     try{
       Iterator iter = redundantServers.iterator();
@@ -483,9 +467,8 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
       Assert.fail("test failed due to" , e);
     }    
   }
-  
-  public static Integer createServerCache() throws Exception
-  {
+
+  private static Integer createServerCache() throws Exception {
     Properties props = new Properties();
     new DurableClientReconnectDUnitTest().createCache(props);
     AttributesFactory factory = new AttributesFactory();
@@ -547,16 +530,15 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     }
   }
 
-  
   private static void verifyDurableClientOnServer() {
-    try{
-    checkNumberOfClientProxies(1);
-    CacheClientProxy proxy = getClientProxy();
-    assertNotNull(proxy);    
-    // Verify that it is durable and its properties are correct
-    assertTrue(proxy.isDurable());
-    assertEquals("DurableClientReconnectDUnitTest_client", proxy.getDurableId());
-//    assertIndexDetailsEquals(60, proxy.getDurableTimeout());
+    try {
+      checkNumberOfClientProxies(1);
+      CacheClientProxy proxy = getClientProxy();
+      assertNotNull(proxy);
+      // Verify that it is durable and its properties are correct
+      assertTrue(proxy.isDurable());
+      assertEquals("DurableClientReconnectDUnitTest_client", proxy.getDurableId());
+  //    assertIndexDetailsEquals(60, proxy.getDurableTimeout());
     }catch (Exception e){
       Assert.fail("test failed due to" , e);
     }    
@@ -578,17 +560,19 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
   
   private static void checkNumberOfClientProxies(final int expected) {
     WaitCriterion ev = new WaitCriterion() {
+      @Override
       public boolean done() {
         return expected == getNumberOfClientProxies();
       }
+      @Override
       public String description() {
         return null;
       }
     };
     Wait.waitForCriterion(ev, 15 * 1000, 200, true);
   }
-  
-  protected static int getNumberOfClientProxies() {
+
+  private static int getNumberOfClientProxies() {
     return getBridgeServer().getAcceptor().getCacheClientNotifier()
         .getClientProxies().size();
   }
@@ -598,25 +582,25 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     assertNotNull(bridgeServer);
     return bridgeServer;
   }
-  private  void createCache(Properties props) 
-  {try{
-    DistributedSystem ds = getSystem(props);
-    assertNotNull(ds);
-    ds.disconnect();
-    ds = getSystem(props);
-    cache = CacheFactory.create(ds);
-    assertNotNull(cache);    
-  } catch(Exception e){
-    Assert.fail("test failed due to " , e ); 
-  }
+
+  private  void createCache(Properties props) {
+    try{
+      DistributedSystem ds = getSystem(props);
+      assertNotNull(ds);
+      ds.disconnect();
+      ds = getSystem(props);
+      cache = CacheFactory.create(ds);
+      assertNotNull(cache);
+    } catch(Exception e){
+      Assert.fail("test failed due to ", e);
+    }
   }
 
-  private void createCacheClient()
-  {
+  private void createCacheClient() {
     createCacheClient(1);
   }
-  
-  protected PoolFactory getPoolFactory() {
+
+  private PoolFactory getPoolFactory() {
     Host host = Host.getHost(0);
     PoolFactory factory = PoolManager.createFactory()
     .addServer(NetworkUtils.getServerHostName(host), PORT1.intValue())
@@ -630,80 +614,79 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     createCacheClient(redundancyLevel, 60);
   }
   
-  private void createCacheClient(int redundancyLevel, final int durableClientTimeout){
+  private void createCacheClient(int redundancyLevel, final int durableClientTimeout) {
     createCacheClient(redundancyLevel, durableClientTimeout, true);
   }
   
-  private void createCacheClient(int redundancyLevel, final int durableClientTimeout, boolean queueEnabled){
-    try{
-    final String durableClientId = "DurableClientReconnectDUnitTest_client";
-    Properties props = getClientDistributedSystemProperties(durableClientId,durableClientTimeout );
-    instance = new DurableClientReconnectDUnitTest();
-    instance.createCache(props);
-//    Host host = Host.getHost(0);
-    PoolImpl p = (PoolImpl) getPoolFactory()
-      .setSubscriptionEnabled(queueEnabled)
-      .setReadTimeout(10000)
-      // .setRetryInterval(2000)
-      .setSubscriptionRedundancy(redundancyLevel)
-      .create("DurableClientReconnectDUnitTestPool");
+  private void createCacheClient(int redundancyLevel, final int durableClientTimeout, boolean queueEnabled) {
+    try {
+      final String durableClientId = "DurableClientReconnectDUnitTest_client";
+      Properties props = getClientDistributedSystemProperties(durableClientId,durableClientTimeout );
+      instance = new DurableClientReconnectDUnitTest();
+      instance.createCache(props);
+  //    Host host = Host.getHost(0);
+      PoolImpl p = (PoolImpl) getPoolFactory()
+        .setSubscriptionEnabled(queueEnabled)
+        .setReadTimeout(10000)
+        // .setRetryInterval(2000)
+        .setSubscriptionRedundancy(redundancyLevel)
+        .create("DurableClientReconnectDUnitTestPool");
 
-    AttributesFactory factory = new AttributesFactory();
-    factory.setScope(Scope.LOCAL);
-    factory.setPoolName(p.getName());
+      AttributesFactory factory = new AttributesFactory();
+      factory.setScope(Scope.LOCAL);
+      factory.setPoolName(p.getName());
 
-    RegionAttributes attrs = factory.create();
-    Region r = cache.createRegion(REGION_NAME, attrs);
-    assertNotNull(r);
+      RegionAttributes attrs = factory.create();
+      Region r = cache.createRegion(REGION_NAME, attrs);
+      assertNotNull(r);
 
-    pool = p;
-    conn = pool.acquireConnection();
-    assertNotNull(conn);
-    
-    cache.readyForEvents();
+      pool = p;
+      conn = pool.acquireConnection();
+      assertNotNull(conn);
+
+      cache.readyForEvents();
     
     }catch(Exception e){
       Assert.fail("test failed due to " , e );
     }
-    
   }
   
-  private void createCacheClientAndConnectToSingleServer(String host, int redundancyLevel){
-    try{
-    final String durableClientId = "DurableClientReconnectDUnitTest_client";
-    final int durableClientTimeout = 60; // keep the client alive for 60 seconds
-    Properties props = getClientDistributedSystemProperties(durableClientId,durableClientTimeout );
-    instance = new DurableClientReconnectDUnitTest();
-    instance.createCache(props);
-    PoolImpl p = (PoolImpl)PoolManager.createFactory()
-      .addServer(host, PORT1.intValue())
-      .setSubscriptionEnabled(true)
-      .setReadTimeout(10000)
-      // .setRetryInterval(2000)
-      .setSubscriptionRedundancy(redundancyLevel)
-      .create("DurableClientReconnectDUnitTestPool");
-      
-    AttributesFactory factory = new AttributesFactory();
-    factory.setScope(Scope.LOCAL);
-    factory.setPoolName(p.getName());
+  private void createCacheClientAndConnectToSingleServer(String host, int redundancyLevel) {
+    try {
+      final String durableClientId = "DurableClientReconnectDUnitTest_client";
+      final int durableClientTimeout = 60; // keep the client alive for 60 seconds
+      Properties props = getClientDistributedSystemProperties(durableClientId,durableClientTimeout );
+      instance = new DurableClientReconnectDUnitTest();
+      instance.createCache(props);
+      PoolImpl p = (PoolImpl)PoolManager.createFactory()
+        .addServer(host, PORT1.intValue())
+        .setSubscriptionEnabled(true)
+        .setReadTimeout(10000)
+        // .setRetryInterval(2000)
+        .setSubscriptionRedundancy(redundancyLevel)
+        .create("DurableClientReconnectDUnitTestPool");
 
-    RegionAttributes attrs = factory.create();
-    Region r = cache.createRegion(REGION_NAME, attrs);
-    assertNotNull(r);
+      AttributesFactory factory = new AttributesFactory();
+      factory.setScope(Scope.LOCAL);
+      factory.setPoolName(p.getName());
 
-    pool = p;
-    conn = pool.acquireConnection();
-    assertNotNull(conn);
-    
-    cache.readyForEvents();
+      RegionAttributes attrs = factory.create();
+      Region r = cache.createRegion(REGION_NAME, attrs);
+      assertNotNull(r);
+
+      pool = p;
+      conn = pool.acquireConnection();
+      assertNotNull(conn);
+
+      cache.readyForEvents();
     
     }catch(Exception e){
       Assert.fail("test failed due to " , e );
     }    
   }
 
-  private void createCacheClientAndConnectToSingleServerWithZeroConnPerServer(String host, int redundancyLevel){
-    try{
+  private void createCacheClientAndConnectToSingleServerWithZeroConnPerServer(String host, int redundancyLevel) {
+    try {
       final String durableClientId = "DurableClientReconnectDUnitTest_client";
       final int durableClientTimeout = 60; // keep the client alive for 60 seconds
       Properties props = getClientDistributedSystemProperties(durableClientId,durableClientTimeout );
@@ -732,13 +715,12 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
       
       cache.readyForEvents();
       
-      }catch(Exception e){
-        Assert.fail("test failed due to " , e );
-      }    
+    }catch(Exception e){
+      Assert.fail("test failed due to " , e );
+    }
   }
 
-  private Properties getClientDistributedSystemProperties(
-      String durableClientId, int durableClientTimeout) {
+  private Properties getClientDistributedSystemProperties( String durableClientId, int durableClientTimeout) {
     Properties properties = new Properties();
     properties.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     properties.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -759,17 +741,14 @@ public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase
     server4.invoke(() -> DurableClientReconnectDUnitTest.closeCache());
   }
 
- public void closeCache(boolean keepAlive)
- {
-   if (cache != null && !cache.isClosed()) {
-     cache.close(keepAlive);
-     cache.getDistributedSystem().disconnect();
-   }
- }
-
+  private void closeCache(boolean keepAlive) {
+    if (cache != null && !cache.isClosed()) {
+      cache.close(keepAlive);
+      cache.getDistributedSystem().disconnect();
+    }
+  }
 
-  public static void closeCache()
-  {
+  private static void closeCache() {
     if (cache != null && !cache.isClosed()) {
       cache.close();
       cache.getDistributedSystem().disconnect();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index 5b408c0..e7e128b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
@@ -16,38 +16,29 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
 import static org.junit.Assert.*;
 
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 /**
  * Tests Redundancy Level Functionality
- * 
- * 
  */
 @Category(DistributedTest.class)
-public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
-{
-    /** constructor */
-  public RedundancyLevelPart1DUnitTest() {
-    super();
-  }
-  
+public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase {
+
+  @BeforeClass
   public static void caseSetUp() throws Exception {
-    DistributedTestCase.disconnectAllFromDS();
+    disconnectAllFromDS();
   }
 
   private void waitConnectedServers(final int expected) {
@@ -63,13 +54,12 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
     Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
   }
   
-  /*
+  /**
    * Redundancy level not specifed, an EP which dies of should be removed from
    * the fail over set as well as the live server map
    */
   @Test
-  public void testRedundancyNotSpecifiedNonPrimaryServerFail()
-  {    
+  public void testRedundancyNotSpecifiedNonPrimaryServerFail() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 0);
       verifyOrderOfEndpoints();
@@ -98,14 +88,13 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
     }
   }
 
-  /*
+  /**
    * Redundancy level not specified. If an EP which dies of is a Primary EP ,
    * then the EP should be removed from the live server map, added to dead
    * server map. 
    */
   @Test
-  public void testRedundancyNotSpecifiedPrimaryServerFails()
-  {
+  public void testRedundancyNotSpecifiedPrimaryServerFails() {
     /*ClientServerObserver oldBo = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
       public void beforeFailoverByCacheClientUpdater(Endpoint epFailed)
       {
@@ -152,15 +141,14 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
     }*/
   }
 
-  /*
+  /**
    * Redundancy level specified & less than total Eps. If an EP dies & was not
    * part of the fail over list , then it should be removed from Live Server Map &
    * added to dead server map. It should not change the current failover set.
    * Failover detection by LSM
    */
   @Test
-  public void testRedundancySpecifiedNonFailoverEPFails()
-  {
+  public void testRedundancySpecifiedNonFailoverEPFails() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1);
       waitConnectedServers(4);
@@ -286,15 +274,14 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
     //assertIndexDetailsEquals(1, proxy.getDeadServers().size());
   }
   
-  /*
+  /**
    * Redundancy level specified & less than total Eps. If an EP dies & was not
    * part of the fail over list , then it should be removed from Live Server Map &
    * added to dead server map. It should not change the current failover set.
    * Failover detection by Put operation.
    */
   @Test
-  public void testRedundancySpecifiedNonFailoverEPFailsDetectionByPut()
-  {
+  public void testRedundancySpecifiedNonFailoverEPFailsDetectionByPut() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,500,1000);
       waitConnectedServers(4);
@@ -325,17 +312,15 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
     }
   }  
   
-  /*
+  /**
    * Redundancy level specified & less than total Eps. If an EP dies & is part
    * of the fail over list , then it should be removed from live server map &
    * added to dead server map. A new EP should be picked from the Live Server
    * Map to compensate for the failure.
    * Failure Detection by LSM.
    */
-
   @Test
-  public void testRedundancySpecifiedNonPrimaryEPFails()
-  {
+  public void testRedundancySpecifiedNonPrimaryEPFails() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1);
       waitConnectedServers(4);
@@ -364,17 +349,15 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
     }
   }
 
-  /*
+  /**
    * Redundancy level specified & less than total Eps. If an EP dies & is part
    * of the fail over list , then it should be removed from live server map &
    * added to dead server map. A new EP should be picked from the Live Server
    * Map to compensate for the failure.
    * Failure Detection by CCU.
    */
-
   @Test
-  public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByCCU()
-  {
+  public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByCCU() {
     try {
       
       FailOverDetectionByCCU = true;
@@ -405,17 +388,15 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
     }
   }
   
-  /*
+  /**
    * Redundancy level specified & less than total Eps. If an EP dies & is part
    * of the fail over list , then it should be removed from live server map &
    * added to dead server map. A new EP should be picked from the Live Server
    * Map to compensate for the failure.
    * Failure Detection by Register Interest.
    */
-  
   @Test
-  public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByRegisterInterest()
-  {
+  public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByRegisterInterest() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250, 500);
       waitConnectedServers(4);
@@ -446,17 +427,15 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
     }
   }
 
-  /*
+  /**
    * Redundancy level specified & less than total Eps. If an EP dies & is part
    * of the fail over list , then it should be removed from live server map &
    * added to dead server map. A new EP should be picked from the Live Server
    * Map to compensate for the failure.
    * Failure Detection by Unregister Interest.
    */
-
   @Test
-  public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByUnregisterInterest()
-  {
+  public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByUnregisterInterest() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250,500);
       waitConnectedServers(4);
@@ -487,17 +466,15 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
     }
   }
 
-  /*
+  /**
    * Redundancy level specified & less than total Eps. If an EP dies & is part
    * of the fail over list , then it should be removed from live server map &
    * added to dead server map. A new EP should be picked from the Live Server
    * Map to compensate for the failure.
    * Failure Detection by Put operation.
    */
-
   @Test
-  public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByPut()
-  {
+  public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByPut() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250,500);
       waitConnectedServers(4);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
index cb865a5..7847092 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
@@ -16,34 +16,25 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
 import static org.junit.Assert.*;
 
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 @Category(DistributedTest.class)
-public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
-{
-  
-  
-  /** constructor */
-  public RedundancyLevelPart2DUnitTest() {
-    super();
-  }
-  
+public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase {
+
+  @BeforeClass
   public static void caseSetUp() throws Exception {
-    DistributedTestCase.disconnectAllFromDS();
+    disconnectAllFromDS();
   }
 
   private void waitConnectedServers(final int expected) {
@@ -59,7 +50,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
     Wait.waitForCriterion(wc, 2 * 60 * 1000, 1000, true);
   }
   
-  /*
+  /**
    * Redundancy level specified & less than total Eps. If an EP dies & is part
    * of the fail over list , then it should be removed from live server map &
    * added to dead server map. A new EP should be picked from the live server
@@ -70,8 +61,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
    * Failure Detection by LSM
    */
   @Test
-  public void testRedundancySpecifiedPrimaryEPFails()
-  {
+  public void testRedundancySpecifiedPrimaryEPFails() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1);
       waitConnectedServers(4);
@@ -100,7 +90,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
     }
   }
   
-  /*
+  /**
    * Redundancy level specified & less than total Eps. If an EP dies & is part
    * of the fail over list , then it should be removed from live server map &
    * added to dead server map. A new EP should be picked from the live server
@@ -111,8 +101,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
    * Failure Detection by CCU
    */
   @Test
-  public void testRedundancySpecifiedPrimaryEPFailsDetectionByCCU()
-  {
+  public void testRedundancySpecifiedPrimaryEPFailsDetectionByCCU() {
     try {
       
       FailOverDetectionByCCU = true;
@@ -153,8 +142,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
    * Failure Detection by Register Interest
    */
   @Test
-  public void testRedundancySpecifiedPrimaryEPFailsDetectionByRegisterInterest()
-  {
+  public void testRedundancySpecifiedPrimaryEPFailsDetectionByRegisterInterest() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000, 100);
       waitConnectedServers(4);
@@ -195,8 +183,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
    * Failure Detection by Unregister Interest
    */  
   @Test
-  public void testRedundancySpecifiedPrimaryEPFailsDetectionByUnregisterInterest()
-  {
+  public void testRedundancySpecifiedPrimaryEPFailsDetectionByUnregisterInterest() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000,100);
       waitConnectedServers(4);
@@ -236,8 +223,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
    * Failure Detection by put operation
    */
   @Test
-  public void testRedundancySpecifiedPrimaryEPFailsDetectionByPut()
-  {
+  public void testRedundancySpecifiedPrimaryEPFailsDetectionByPut() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000, 100);
       waitConnectedServers(4);
@@ -273,8 +259,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
    * created on both the server with relevant interest registartion.
    */
   @Test
-  public void testRedundancySpecifiedPrimarySecondaryEPFails()
-  {
+  public void testRedundancySpecifiedPrimarySecondaryEPFails() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1);
       waitConnectedServers(4);
@@ -303,7 +288,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
     }
   }
 
-  /*
+  /**
    * There are 4 Eps in Live serevr Map with redundancy level as 2. Kill two Eps
    * (excluding the primary). As a result live server map will contain 2 ,
    * active list will contain two & dead server map will contain 2. Redundancy
@@ -313,8 +298,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
    * Bringing the 4th EP alive should simply add it to Live server map.
    */
   @Test
-  public void testRedundancySpecifiedEPFails()
-  {
+  public void testRedundancySpecifiedEPFails() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 2);
       waitConnectedServers(4);
@@ -362,14 +346,13 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
     }
   }
 
-  /*
+  /**
    * Redundancy level specified but not satisfied, new EP is added then it
    * should be added in Live server map as well as failover set and make sure
    * that CCP is created on the server with relevant interest registartion.
    */
   @Test
-  public void testRedundancyLevelSpecifiedButNotSatisfied()
-  {
+  public void testRedundancyLevelSpecifiedButNotSatisfied() {
     try {
       // stop two secondaries
       server2.invoke(() -> RedundancyLevelTestBase.stopServer());
@@ -421,14 +404,13 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
 
   }
 
-  /*
+  /**
    * Redundancy level specified and satisfied, new EP is added then it should be
    * added only in Live server map and make sure that no CCP is created on the
    * server.
    */
   @Test
-  public void testRedundancyLevelSpecifiedAndSatisfied()
-  {
+  public void testRedundancyLevelSpecifiedAndSatisfied() {
     try {
       // TODO: Yogesh
       server1.invoke(() -> RedundancyLevelTestBase.stopServer());
@@ -462,14 +444,13 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
     }
   }
 
-  /*
+  /**
    * Redundancy level not specified, new EP is added then it should be added in
    * live server map as well as failover set and make sure that CCP is created
    * on the server with relevant interest registartion.
    */
   @Test
-  public void testRedundancyLevelNotSpecified()
-  {
+  public void testRedundancyLevelNotSpecified() {
     try {
       // TODO: Yogesh
       server2.invoke(() -> RedundancyLevelTestBase.stopServer());
@@ -506,38 +487,12 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
     }
   }
 
-  /*
-   * There are 4 EndPoints. Redundancy level is 1. The load balancing policy is round
-   * robin. 4 Explicit calls to proxy.acquireConnection should given Connections to all
-   * the 4 end points & not just the Eps satisfying redundancy. 
-   
-  @Test
-  public void testAcquireConnectionWithRedundancy()
-  {
-    try {
-      createClientCache(getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1);
-      assertIndexDetailsEquals(1, proxy.getRedundantServers().size());
-      assertIndexDetailsEquals(PORT3, proxy.acquireConnection().getEndpoint().getPort());
-      assertIndexDetailsEquals(PORT4, proxy.acquireConnection().getEndpoint().getPort());
-      assertIndexDetailsEquals(PORT1, proxy.acquireConnection().getEndpoint().getPort());
-      assertIndexDetailsEquals(PORT2, proxy.acquireConnection().getEndpoint().getPort());
-      assertIndexDetailsEquals(PORT3, proxy.acquireConnection().getEndpoint().getPort());
-    }
-    catch (Exception ex) {
-      ex.printStackTrace();
-      fail(
-          "test failed due to exception in test testAcquireConnectionWithRedundancy ",
-          ex);
-    }
-  }*/
-
-  /*
+  /**
    * Redundancy level specified is more than the total EndPoints. In such situation there should
    * not be any exception & all the EPs should has CacheClientProxy created.
    */
   @Test
-  public void testRedundancySpecifiedMoreThanEPs()
-  {
+  public void testRedundancySpecifiedMoreThanEPs() {
     try {
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 5);
       assertEquals(3, pool.getRedundantNames().size());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
index 3d34a29..88dca25 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
@@ -16,38 +16,29 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
 import static org.junit.Assert.*;
 
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
 import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
 import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
 import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
-import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 /**
  * Tests Redundancy Level Functionality
- * 
- * 
  */
 @Category(DistributedTest.class)
-public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
-{
-    /** constructor */
-  public RedundancyLevelPart3DUnitTest() {
-    super();
-  }
-  
+public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase {
+
+  @BeforeClass
   public static void caseSetUp() throws Exception {
-    DistributedTestCase.disconnectAllFromDS();
+    disconnectAllFromDS();
   }
   
   /**
@@ -55,11 +46,9 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
    * After every failure, the order, the dispatcher, the interest registration and the makePrimary calls
    * are verified. The failure detection in these tests could be either through CCU or cache operation,
    * whichever occurs first
-   *
    */
   @Test
-  public void testRegisterInterestAndMakePrimaryWithFullRedundancy()
-  {
+  public void testRegisterInterestAndMakePrimaryWithFullRedundancy() {
     try {
       CacheServerTestUtil.disableShufflingOfEndpoints();
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 3);
@@ -159,12 +148,9 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
    * After every failure, the order, the dispatcher, the interest registration and the makePrimary calls
    * are verified. The failure detection in these tests could be either through CCU or cache operation,
    * whichever occurs first
-   *
    */
-  
   @Test
-  public void testRegisterInterestAndMakePrimaryWithZeroRedundancy()
-  {
+  public void testRegisterInterestAndMakePrimaryWithZeroRedundancy() {
     try {
       CacheServerTestUtil.disableShufflingOfEndpoints();
       createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 0);
@@ -212,11 +198,9 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
    * After every failure, the order, the dispatcher, the interest registration and the makePrimary calls
    * are verified. The failure detection in these tests could be either through CCU or cache operation,
    * whichever occurs first
-   *
    */
   @Test
-  public void testRegisterInterestAndMakePrimaryWithRedundancyOne()
-  {
+  public void testRegisterInterestAndMakePrimaryWithRedundancyOne() {
     try {
 //      long maxWaitTime = 60000;
       CacheServerTestUtil.disableShufflingOfEndpoints();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index 980c4c8..e499717 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -16,21 +16,17 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-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;
 import java.util.Properties;
 import java.util.Set;
 
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
@@ -46,6 +42,7 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.ClientServerObserver;
 import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
 import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
@@ -57,16 +54,15 @@ import com.gemstone.gemfire.test.dunit.NetworkUtils;
 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.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 /**
  * Tests Redundancy Level Functionality
- * 
- * 
  */
 @Category(DistributedTest.class)
-public class RedundancyLevelTestBase extends JUnit4DistributedTestCase
-{
+public class RedundancyLevelTestBase extends JUnit4DistributedTestCase {
+
   static Cache cache = null;
 
   VM server0 = null;
@@ -102,11 +98,7 @@ public class RedundancyLevelTestBase extends JUnit4DistributedTestCase
   
   static boolean FailOverDetectionByCCU = false;
   
-  /** constructor */
-  public RedundancyLevelTestBase() {
-    super();
-  }
-
+  @BeforeClass
   public static void caseSetUp() throws Exception {
     DistributedTestCase.disconnectAllFromDS();
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
index 8b45e3f..1fb3ff5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
@@ -27,7 +27,6 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Verifies that test output missing an expected line (at the end of
  * the golden file) will fail with that line as the failure message.
- * 
  */
 @Category(IntegrationTest.class)
 public class FailWithLineMissingFromEndOfOutputJUnitTest extends FailOutputTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cff6e863/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
index f4769d0..b92e6ec 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
@@ -27,7 +27,6 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Verifies that test output missing an expected line (at the middle 
  * of the golden file) will fail with that line as the failure message.
- * 
  */
 @Category(IntegrationTest.class)
 public class FailWithLineMissingFromMiddleOfOutputJUnitTest extends FailOutputTestCase {


Mime
View raw message