geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [01/29] incubator-geode git commit: Manual conversion of DUnit tests to JUnit 4.
Date Tue, 24 May 2016 00:31:26 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-837 6e386333c -> fe911cc56


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index 20ffd4a..ea06da2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,6 +25,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
+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.CacheException;
@@ -47,23 +52,22 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 /**
  * Class <code>ClientServerGetAllDUnitTest</code> test client/server getAll.
  *
  * @since 5.7
  */
- public class ClientServerGetAllDUnitTest extends ClientServerTestCase {
-
-  public ClientServerGetAllDUnitTest(String name) {
-    super(name);
-  }
+@Category(DistributedTest.class)
+public class ClientServerGetAllDUnitTest extends ClientServerTestCase {
 
   @Override
   public final void postTearDownCacheTestCase() throws Exception {
     disconnectAllFromDS();
   }
 
+  @Test
   public void testGetAllFromServer() throws Exception {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);
@@ -116,6 +120,7 @@ import com.gemstone.gemfire.test.dunit.VM;
     stopBridgeServer(server);
   }
 
+  @Test
   public void testOffHeapGetAllFromServer() throws Exception {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);
@@ -168,6 +173,7 @@ import com.gemstone.gemfire.test.dunit.VM;
     stopBridgeServer(server);
   }
 
+  @Test
   public void testLargeOffHeapGetAllFromServer() throws Throwable {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);
@@ -278,7 +284,8 @@ import com.gemstone.gemfire.test.dunit.VM;
 
     stopBridgeServer(server);
   }
-  
+
+  @Test
   public void testLargeGetAllFromServer() throws Throwable {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);
@@ -391,6 +398,7 @@ import com.gemstone.gemfire.test.dunit.VM;
     stopBridgeServer(server);
   }
 
+  @Test
   public void testGetAllWithCallbackFromServer() throws Exception {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);
@@ -442,14 +450,17 @@ import com.gemstone.gemfire.test.dunit.VM;
     stopBridgeServer(server);
   }
 
+  @Test
   public void testGetSomeFromServer() throws Exception {
     testGetFromServer(2);
   }
 
+  @Test
   public void testGetAllFromClient() throws Exception {
     testGetFromServer(5);
   }
 
+  @Test
   public void testGetAllFromServerWithPR() throws Exception {
     final Host host = Host.getHost(0);
     final VM server1 = host.getVM(0);
@@ -580,7 +591,8 @@ import com.gemstone.gemfire.test.dunit.VM;
     IgnoredException.addIgnoredException("Server unreachable", client);
     stopBridgeServer(server);
   }
-  
+
+  @Test
   public void testGetAllWithExtraKeyFromServer() throws Exception {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/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 9b1f29e..ee50b97 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
@@ -1708,7 +1708,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
           }
           public void beforeCommit(TransactionEvent event)
               throws TransactionWriterException {
-            throw new TransactionWriterException("TestException");
+            throw new TransactionWriterException("AssertionError");
           }
         });
         return null;
@@ -1724,7 +1724,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
           getGemfireCache().getTxManager().commit();
           fail("Expected exception not thrown");
         } catch (Exception e) {
-          assertEquals("TestException", e.getCause().getMessage());
+          assertEquals("AssertionError", e.getCause().getMessage());
         }
         return null;
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/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 9474be2..2288640 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,25 +16,30 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
+
+import junit.framework.Assert;
+
 import com.gemstone.gemfire.CancelException;
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.cache.util.*;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.ExpirationAction;
+import com.gemstone.gemfire.cache.ExpirationAttributes;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionEvent;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.distributed.internal.DistributionManager;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.RMIException;
 import com.gemstone.gemfire.test.dunit.VM;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-
-import util.TestException;
-
-import junit.framework.Assert;
-
 /**
  * This class tests the response of GemFire to various
  * occurrences of {@link VirtualMachineError}
@@ -358,7 +363,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
 //  protected static void doReset() {
 //    // TODO instead of trying to patch up this VM, Lise should create
 //    // me a brand spanking new one
-//    throw new TestException("Sorry, ask Lise to fix this");
+//    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...
@@ -556,7 +561,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
       private void forceOutOfMemory() {
         peskyMemory = new ArrayList();
         // Allocate this _before_ exhausting memory :-)
-        final TestException whoops = new TestException("Timeout!");
+        final AssertionError whoops = new AssertionError("Timeout!");
         try {
           for (;;) {
             peskyMemory.add(new long[100000]);
@@ -618,7 +623,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
       
       peskyMemory = new ArrayList();
       // Allocate this _before_ exhausting memory :-)
-      final TestException whoops = new TestException("Timeout!");
+      final AssertionError whoops = new AssertionError("Timeout!");
       
       // Fill up a lot of memory
       for (;;) {
@@ -748,7 +753,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
       listener = listener_error;
     }
     else {
-      throw new TestException("don't know which listener: " + which);
+      throw new AssertionError("don't know which listener: " + which);
     }
     return listener;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
index f4a0588..61a3aa9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
@@ -33,8 +33,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import util.TestException;
-
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.LowMemoryException;
@@ -362,7 +360,7 @@ public class MemoryMonitorJUnitTest {
       caughtException = true;
     }
     if(expectLowMemEx && !caughtException){
-      throw new TestException("An expected exception was not thrown");
+      throw new AssertionError("An expected exception was not thrown");
     }
     //make region healthy
     heapMonitor.updateStateAndSendEvent(91);
@@ -370,7 +368,7 @@ public class MemoryMonitorJUnitTest {
     try{
       region.put("key-1", "value-2");      
     } catch(LowMemoryException low){      
-      throw new TestException("Unexpected exception:",low);
+      throw new AssertionError("Unexpected exception:",low);
     }
     if (useTransaction) {
       cache.getCacheTransactionManager().commit();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index dcbd38a..4987e48 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -41,13 +41,9 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.cache30.ClientServerTestCase;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
-import com.gemstone.gemfire.internal.cache.ha.HAContainerMap;
-import com.gemstone.gemfire.internal.cache.ha.HAContainerRegion;
-import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
@@ -60,8 +56,6 @@ import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
-import util.TestException;
-
 /**
  * This DUnit contains various tests to ensure new implementation of ha region
  * queues works as expected.
@@ -1191,7 +1185,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
       while (iter.hasNext()) {
         rName = ((Region)iter.next()).getName();
         if (cmrName.equals(rName)) {
-          throw new TestException(
+          throw new AssertionError(
               "Cache.rootRegions() method should not return the client_messages_region.");
         }
         logger.fine("Region name returned from cache.rootRegions(): " + rName);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
index ea1ed4a..267d76e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
 import java.util.Set;
 
 import org.junit.experimental.categories.Category;
-import util.TestException;
 
 import junit.framework.Assert;
 
@@ -945,7 +944,7 @@ public class HARegionQueueDUnitTest extends DistributedTestCase {
     
     CacheSerializableRunnable waitForCreateQueuesThread = new CacheSerializableRunnable(
         "joinCreateCache") {
-      public void run2() throws TestException {
+      public void run2() {
         WaitCriterion ev = new WaitCriterion() {
           public boolean done() {
             return createQueuesThread != null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
index 7e0fb44..8cd89f1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -25,8 +25,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import util.TestException;
-
 import com.gemstone.gemfire.DataSerializer;
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
@@ -402,7 +400,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
     try {
       async.join(3000);
     } catch (InterruptedException e) {
-      new TestException("VM1 entry destroy did not finish in 3000 ms");
+      new AssertionError("VM1 entry destroy did not finish in 3000 ms");
     }
 
     vm1.invoke(new CacheSerializableRunnable("Verifying entry version in new node VM1") {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/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 9a7d5a4..565a892 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
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Properties;
 
 import org.junit.experimental.categories.Category;
-import util.TestException;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
@@ -37,7 +36,6 @@ import com.gemstone.gemfire.cache.Scope;
 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.EntryEventImpl;
 import com.gemstone.gemfire.internal.cache.EventID;
 import com.gemstone.gemfire.internal.cache.EventIDHolder;
 import com.gemstone.gemfire.test.dunit.Assert;
@@ -275,7 +273,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase {
       srp.destroyOnForTestsOnly(conn1, "key2", null, Operation.DESTROY, new EventIDHolder(new EventID(new byte[] {1},100000,2)), null);
     }
     catch (Exception ex) {
-      throw new TestException("Failed while setting acquireConnectionsAndDestroyEntry  ", ex);
+      throw new AssertionError("Failed while setting acquireConnectionsAndDestroyEntry  ", ex);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
index 0805e2a..10f707d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
@@ -39,7 +39,7 @@ public class ObjectPartListJUnitTest {
     list.addObjectPart("key", "value2", true, null);
     byte[] serializedObjectBytes = BlobHelper.serializeToBlob("value3");
     list.addObjectPart("key", serializedObjectBytes, true, null);
-    list.addExceptionPart("key", new TestException("hello"));
+    list.addExceptionPart("key", new AssertionError("hello"));
     list.addObjectPartForAbsentKey("key", null);
     
     //Create a clone of the this.
@@ -65,7 +65,7 @@ public class ObjectPartListJUnitTest {
     assertEquals("value1", new String((byte[]) values.get(0)));
     assertEquals("value2", values.get(1));
     assertEquals("value3", values.get(2));
-    assertEquals(new TestException("hello"), values.get(3));
+    assertEquals(new AssertionError("hello"), values.get(3));
     assertNull(values.get(4));
   }
 
@@ -77,7 +77,7 @@ public class ObjectPartListJUnitTest {
     list.addObjectPart("key", "value2", true, null);
     byte[] serializedObjectBytes = BlobHelper.serializeToBlob("value3");
     list.addObjectPart("key", serializedObjectBytes, true, null);
-    list.addExceptionPart("key", new TestException("hello"));
+    list.addExceptionPart("key", new AssertionError("hello"));
     list.addObjectPartForAbsentKey("key", null);
     
     //Create a clone of the this list.
@@ -100,22 +100,22 @@ public class ObjectPartListJUnitTest {
     assertEquals("value1", new String((byte[]) values.get(0)));
     assertEquals("value2", BlobHelper.deserializeBlob((byte[])values.get(1)));
     assertEquals("value3", BlobHelper.deserializeBlob((byte[])values.get(2)));
-    assertEquals(new TestException("hello"), values.get(3));
+    assertEquals(new AssertionError("hello"), values.get(3));
     assertNull(values.get(4));
   }
   
-  private static class TestException extends Exception {
+  private static class AssertionError extends Exception {
 
-    public TestException(String message) {
+    public AssertionError(String message) {
       super(message);
     }
 
     @Override
     public boolean equals(Object o) {
-      if(!(o instanceof TestException)) {
+      if(!(o instanceof AssertionError)) {
         return false;
       }
-      if(!((TestException) o ).getMessage().equals(getMessage())) {
+      if(!((AssertionError) o ).getMessage().equals(getMessage())) {
         return false;
       }
       return true;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index c96c1c8..ef229e3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -16,6 +16,9 @@
  */
 package com.gemstone.gemfire.management;
 
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashSet;
@@ -23,6 +26,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.InternalGemFireException;
@@ -56,6 +60,7 @@ 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.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
 /**
@@ -63,6 +68,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  *
  * @since 4.2.1
  */
+@Category(DistributedTest.class)
 public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTestCase {
   protected static final boolean CLIENT = true;
   protected static final boolean SERVER = false;
@@ -85,10 +91,6 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
   /** Millis to wait for all three event listeners to be notified */
   private static final int ASYNC_EVENT_WAIT_MILLIS = 120000; // use Integer.MAX_VALUE for debugging
     
-  public UniversalMembershipListenerAdapterDUnitTest(String name) {
-    super(name);
-  }
-
   @Override
   public final void postTearDownCacheTestCase() throws Exception {
     InternalClientMembership.unregisterAllListeners();
@@ -97,6 +99,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
   /**
    * Tests wrapping of BridgeMembershipEvent fired as MembershipEvent.
    */
+  @Test
   public void testAdaptedBridgeEvents() throws Exception {
     getSystem();
     
@@ -139,6 +142,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
   /**
    * Tests use of history to prevent duplicate events.
    */
+  @Test
   public void testNoDuplicates() throws Exception {
     getSystem();
     
@@ -239,14 +243,16 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
   /**
    * Tests notification of events for loner bridge clients in server process.
    */
+  @Test
   public void testLonerClientEventsInServer() throws Exception {
-     try {
-       doTestLonerClientEventsInServer();
-     }
-     finally {
-       disconnectAllFromDS();
-     }
+    try {
+      doTestLonerClientEventsInServer();
+    }
+    finally {
+      disconnectAllFromDS();
+    }
   }
+
   private void doTestLonerClientEventsInServer() throws Exception {
     final boolean[] firedSystem = new boolean[3];
     final DistributedMember[] memberSystem = new DistributedMember[3];
@@ -378,7 +384,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     final int[] ports = new int[1];
 
     // create BridgeServer in controller vm...
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] Create BridgeServer");
+    getLogWriter().info("[testLonerClientEventsInServer] Create BridgeServer");
     getSystem();
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.LOCAL);
@@ -392,9 +398,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     final String serverMemberId = serverMember.toString();
     final Properties serverProperties = getSystem().getProperties();
 
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] ports[0]=" + ports[0]);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] serverMemberId=" + serverMemberId);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] serverMember=" + serverMember);
+    getLogWriter().info("[testLonerClientEventsInServer] ports[0]=" + ports[0]);
+    getLogWriter().info("[testLonerClientEventsInServer] serverMemberId=" + serverMemberId);
+    getLogWriter().info("[testLonerClientEventsInServer] serverMember=" + serverMember);
 
     // register the bridge listener
     ClientMembership.registerClientMembershipListener(bridgeListener);
@@ -413,7 +419,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     new SerializableCallable("Create bridge client") {
       @Override
       public Object call() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] create bridge client");
+        getLogWriter().info("[testLonerClientEventsInServer] create bridge client");
         Properties config = new Properties();
         config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
         config.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -444,7 +450,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client join");
+    getLogWriter().info("[testLonerClientEventsInServer] assert server detected client join");
     assertTrue(firedBridge[JOINED]);
     assertEquals(clientMember, memberBridge[JOINED]);
     //as of 6.1 the id can change when a bridge is created or a connection pool is created
@@ -490,7 +496,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
 
     vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
       public void run() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
+        getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
         final String pl =
           getRootRegion().getSubregion(name).getAttributes().getPoolName();
         PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -500,7 +506,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     
     vm0.invoke(new SerializableRunnable("Close bridge client region") {
       public void run() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] close bridge client region");
+        getLogWriter().info("[testLonerClientEventsInServer] close bridge client region");
         getRootRegion().getSubregion(name).close();
         PoolManager.close();
       }
@@ -517,7 +523,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client left");
+    getLogWriter().info("[testLonerClientEventsInServer] assert server detected client left");
 
     assertFalse(firedBridge[JOINED]);
     assertNull(memberIdBridge[JOINED]);
@@ -576,7 +582,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client re-join");
+    getLogWriter().info("[testLonerClientEventsInServer] assert server detected client re-join");
     assertTrue(firedBridge[JOINED]);
     assertEquals(clientMember, memberBridge[JOINED]);
     assertEquals(clientMemberId, memberIdBridge[JOINED]);
@@ -621,7 +627,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     
     vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
       public void run() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
+        getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
         final String pl =
           getRootRegion().getSubregion(name).getAttributes().getPoolName();
         PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -633,7 +639,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     try {
       vm0.invoke(new SerializableRunnable("Stop bridge client") {
         public void run() {
-          com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] Stop bridge client");
+          getLogWriter().info("[testLonerClientEventsInServer] Stop bridge client");
           getRootRegion().getSubregion(name).close();
           PoolManager.close();
         }
@@ -650,7 +656,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
         }
       }
       
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client crashed");
+    getLogWriter().info("[testLonerClientEventsInServer] assert server detected client crashed");
     assertFalse(firedBridge[JOINED]);
     assertNull(memberIdBridge[JOINED]);
     assertNull(memberBridge[JOINED]);
@@ -702,14 +708,16 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
    * Tests notification of events for loner bridge clients in server process.
    */
   @Category(FlakyTest.class) // GEODE-1174: random port, async behavior, condition await loops
+  @Test
   public void testSystemClientEventsInServer() throws Exception {
-     try {
-       doTestSystemClientEventsInServer();
-     }
-     finally {
-       disconnectAllFromDS();
-     }
+    try {
+      doTestSystemClientEventsInServer();
+    }
+    finally {
+      disconnectAllFromDS();
+    }
   }
+
   private void doTestSystemClientEventsInServer() throws Exception {
     final boolean[] firedSystem = new boolean[3];
     final DistributedMember[] memberSystem = new DistributedMember[3];
@@ -758,7 +766,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       new UniversalMembershipListenerAdapter() {
       @Override
       public synchronized void memberJoined(MembershipEvent event) {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] memberJoined >" + event.getMemberId() + "<");
+        getLogWriter().info("[doTestSystemClientEventsInServer] memberJoined >" + event.getMemberId() + "<");
         firedAdapterDuplicate[JOINED] = firedAdapter[JOINED];
         firedAdapter[JOINED] = true;
         memberAdapter[JOINED] = event.getDistributedMember();
@@ -771,7 +779,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
       @Override
       public synchronized void memberLeft(MembershipEvent event) {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] memberLeft >" + event.getMemberId() + "<");
+        getLogWriter().info("[doTestSystemClientEventsInServer] memberLeft >" + event.getMemberId() + "<");
         firedAdapterDuplicate[LEFT] = firedAdapter[LEFT];
         firedAdapter[LEFT] = true;
         memberAdapter[LEFT] = event.getDistributedMember();
@@ -784,7 +792,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
       @Override
       public synchronized void memberCrashed(MembershipEvent event) {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] memberCrashed >" + event.getMemberId() + "<");
+        getLogWriter().info("[doTestSystemClientEventsInServer] memberCrashed >" + event.getMemberId() + "<");
         firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED];
         firedAdapter[CRASHED] = true;
         memberAdapter[CRASHED] = event.getDistributedMember();
@@ -830,7 +838,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     final int[] ports = new int[1];
 
     // create BridgeServer in controller vm...
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
+    getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
     getSystem();
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.LOCAL);
@@ -850,9 +858,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME);
     serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME);
 
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] serverMember=" + serverMember);
+    getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]);
+    getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId);
+    getLogWriter().info("[doTestSystemClientEventsInServer] serverMember=" + serverMember);
 
     // register the bridge listener
     ClientMembership.registerClientMembershipListener(bridgeListener);
@@ -871,7 +879,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     new SerializableCallable("Create bridge client") {
       @Override
       public Object call() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] create system bridge client");
+        getLogWriter().info("[doTestSystemClientEventsInServer] create system bridge client");
         assertTrue(getSystem(serverProperties).isConnected());
         assertFalse(getCache().isClosed());
         AttributesFactory factory = new AttributesFactory();
@@ -904,10 +912,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client join");
-    assertFalse(firedSystemDuplicate);
-    assertFalse(firedAdapterDuplicate);
-    assertFalse(firedBridgeDuplicate);
+    getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client join");
+    assertArrayFalse(firedSystemDuplicate);
+    assertArrayFalse(firedAdapterDuplicate);
+    assertArrayFalse(firedBridgeDuplicate);
 
     assertTrue(firedBridge[JOINED]);
     assertEquals(clientMember, memberBridge[JOINED]);
@@ -953,7 +961,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
 
     vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
       public void run() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
+        getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
         final String pl =
           getRootRegion().getSubregion(name).getAttributes().getPoolName();
         PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -964,7 +972,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     // close bridge client region
     vm0.invoke(new SerializableRunnable("Close bridge client region") {
       public void run() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
+        getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
         getRootRegion().getSubregion(name).close();
         PoolManager.close();
       }
@@ -981,10 +989,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
-    assertFalse(firedSystemDuplicate);
-    assertFalse(firedAdapterDuplicate);
-    assertFalse(firedBridgeDuplicate);
+    getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
+    assertArrayFalse(firedSystemDuplicate);
+    assertArrayFalse(firedAdapterDuplicate);
+    assertArrayFalse(firedBridgeDuplicate);
     
     assertFalse(firedBridge[JOINED]);
     assertNull(memberIdBridge[JOINED]);
@@ -1043,10 +1051,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
-    assertFalse(firedSystemDuplicate);
-    assertFalse(firedAdapterDuplicate);
-    assertFalse(firedBridgeDuplicate);
+    getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
+    assertArrayFalse(firedSystemDuplicate);
+    assertArrayFalse(firedAdapterDuplicate);
+    assertArrayFalse(firedBridgeDuplicate);
 
     assertTrue(firedBridge[JOINED]);
     assertEquals(clientMember, memberBridge[JOINED]);
@@ -1092,7 +1100,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     
     vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
       public void run() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
+        getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
         final String pl =
           getRootRegion().getSubregion(name).getAttributes().getPoolName();
         PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -1103,7 +1111,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     // have bridge client disconnect from system
     vm0.invoke(new SerializableRunnable("Disconnect bridge client") {
       public void run() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] disconnect bridge client");
+        getLogWriter().info("[doTestSystemClientEventsInServer] disconnect bridge client");
         closeCache();
         disconnectFromDS();
       }
@@ -1125,10 +1133,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
-    assertFalse(firedSystemDuplicate);
-    assertFalse(firedAdapterDuplicate);
-    assertFalse(firedBridgeDuplicate);
+    getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
+    assertArrayFalse(firedSystemDuplicate);
+    assertArrayFalse(firedAdapterDuplicate);
+    assertArrayFalse(firedBridgeDuplicate);
 
     assertFalse(firedBridge[JOINED]);
     assertNull(memberBridge[JOINED]);
@@ -1192,10 +1200,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
-    assertFalse(firedSystemDuplicate);
-    assertFalse(firedAdapterDuplicate);
-    assertFalse(firedBridgeDuplicate);
+    getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
+    assertArrayFalse(firedSystemDuplicate);
+    assertArrayFalse(firedAdapterDuplicate);
+    assertArrayFalse(firedBridgeDuplicate);
 
     assertTrue(firedBridge[JOINED]);
     assertEquals(clientMember, memberBridge[JOINED]);
@@ -1241,7 +1249,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     
     vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
       public void run() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
+        getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
         final String pl =
           getRootRegion().getSubregion(name).getAttributes().getPoolName();
         PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -1254,7 +1262,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     try {
       vm0.invoke(new SerializableRunnable("Close bridge client region") {
         public void run() {
-          com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
+          getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
           getRootRegion().getSubregion(name).close();
           PoolManager.close();
         }
@@ -1271,10 +1279,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
         }
       }
       
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client crashed");
-    assertFalse(firedSystemDuplicate);
-    assertFalse(firedAdapterDuplicate);
-    assertFalse(firedBridgeDuplicate);
+    getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client crashed");
+      assertArrayFalse(firedSystemDuplicate);
+      assertArrayFalse(firedAdapterDuplicate);
+      assertArrayFalse(firedBridgeDuplicate);
 
     assertFalse(firedBridge[JOINED]);
     assertNull(memberBridge[JOINED]);
@@ -1325,7 +1333,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
    * Note: This probably won't work if the pool has more than one Endpoint.
    */
   protected void waitForClientToFullyConnect(final PoolImpl pool) {
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[waitForClientToFullyConnect]");
+    getLogWriter().info("[waitForClientToFullyConnect]");
     final long failMillis = System.currentTimeMillis() + JOIN_FAIL_MILLIS;
     boolean fullyConnected = false;
     while (!fullyConnected) {
@@ -1338,7 +1346,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
                  + " connections were created.",
                  System.currentTimeMillis() < failMillis);
     }
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[waitForClientToFullyConnect] fullyConnected=" + fullyConnected);
+    getLogWriter().info("[waitForClientToFullyConnect] fullyConnected=" + fullyConnected);
   }
   
   /**
@@ -1360,10 +1368,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
   /**
    * Asserts all elements in the array are false.
    */
-  private void assertFalse(boolean[] array) {
-    assertFalse(null, array);
+  private void assertArrayFalse(boolean[] array) {
+    assertArrayFalse(null, array);
   }
-  private void assertFalse(String msg, boolean[] array) {
+  private void assertArrayFalse(String msg, boolean[] array) {
     for (int i = 0; i < array.length; i++) {
       if (msg == null) {
         assertFalse(array[i]);
@@ -1372,10 +1380,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }    
   }
-  private void assertTrue(boolean[] array) {
-    assertTrue(null, array);
+  private void assertArrayTrue(boolean[] array) {
+    assertArrayTrue(null, array);
   }
-  private void assertTrue(String msg, boolean[] array) {
+  private void assertArrayTrue(String msg, boolean[] array) {
     for (int i = 0; i < array.length; i++) {
       if (msg == null) {
         assertTrue(array[i]);
@@ -1389,17 +1397,21 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
    * Tests notification of events for bridge server in system bridge client
    * process.
    */
+  @Test
   public void testServerEventsInPeerSystem() throws Exception {
-       try {
-         doTestServerEventsInPeerSystem();       
-       }finally {
-         disconnectAllFromDS();
-       }
+    try {
+      doTestServerEventsInPeerSystem();
+    }finally {
+     disconnectAllFromDS();
+    }
   }
+
   protected static int testServerEventsInSystemClient_port;
+
   private static int getTestServerEventsInSystemClient_port() {
     return testServerEventsInSystemClient_port;
   }
+
   private void doTestServerEventsInPeerSystem() throws Exception {
     // KIRK: this test fails intermittently with bug 37482
     final boolean[] firedSystem = new boolean[3];
@@ -1449,7 +1461,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       new UniversalMembershipListenerAdapter() {
       @Override
       public synchronized void memberJoined(MembershipEvent event) {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInSystemClient] memberJoined >" + event.getMemberId() + "<");
+        getLogWriter().info("[testServerEventsInSystemClient] memberJoined >" + event.getMemberId() + "<");
         firedAdapterDuplicate[JOINED] = firedAdapter[JOINED];
         firedAdapter[JOINED] = true;
         memberAdapter[JOINED] = event.getDistributedMember();
@@ -1462,7 +1474,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
       @Override
       public synchronized void memberLeft(MembershipEvent event) {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInSystemClient] memberLeft >" + event.getMemberId() + "<");
+        getLogWriter().info("[testServerEventsInSystemClient] memberLeft >" + event.getMemberId() + "<");
         firedAdapterDuplicate[LEFT] = firedAdapter[LEFT];
         firedAdapter[LEFT] = true;
         memberAdapter[LEFT] = event.getDistributedMember();
@@ -1475,7 +1487,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
       @Override
       public synchronized void memberCrashed(MembershipEvent event) {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInSystemClient] memberCrashed >" + event.getMemberId() + "<");
+        getLogWriter().info("[testServerEventsInSystemClient] memberCrashed >" + event.getMemberId() + "<");
         firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED];
         firedAdapter[CRASHED] = true;
         memberAdapter[CRASHED] = event.getDistributedMember();
@@ -1523,7 +1535,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     assertTrue(ports[0] != 0);
         
  // create BridgeServer in controller vm...
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
+    getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
     getSystem();
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.LOCAL);
@@ -1542,9 +1554,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME);
     serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME);
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] serverMember=" + serverMember);
+    getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]);
+    getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId);
+    getLogWriter().info("[testServerEventsInPeerSystem] serverMember=" + serverMember);
     
     GemFireCacheImpl cache = GemFireCacheImpl.getExisting();
     assertNotNull(cache);
@@ -1560,7 +1572,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     new SerializableCallable("Create Peer Cache") {
       @Override
       public Object call() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] Create Peer cache");
+        getLogWriter().info("[testServerEventsInPeerSystem] Create Peer cache");
         getSystem(serverProperties);
         AttributesFactory factory = new AttributesFactory();
         factory.setScope(Scope.LOCAL);
@@ -1574,8 +1586,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     DistributedMember peerMember = (DistributedMember)vm0.invoke(createPeerCache);
     String peerMemberId = peerMember.toString();
 
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] peerMemberId=" + peerMemberId);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] peerMember=" + peerMember);
+    getLogWriter().info("[testServerEventsInPeerSystem] peerMemberId=" + peerMemberId);
+    getLogWriter().info("[testServerEventsInPeerSystem] peerMember=" + peerMember);
 
     
 
@@ -1590,8 +1602,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer join");
-    assertFalse(firedSystemDuplicate);
+    getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer join");
+    assertArrayFalse(firedSystemDuplicate);
     // TODO: sometimes get adapter duplicate since memberId isn't endpoint
     // initial impl uses Endpoint.toString() for memberId of server; final
     // impl should have server send its real memberId to client via HandShake
@@ -1638,7 +1650,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     try {
       vm0.invoke(new SerializableRunnable("Disconnect Peer server") {
         public void run() {
-          com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] disconnect peer server");
+          getLogWriter().info("[testServerEventsInPeerSystem] disconnect peer server");
           closeCache();
           disconnectFromDS();
         }
@@ -1661,14 +1673,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       ex.remove();
     }
 
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer crashed");
-    assertFalse(firedSystemDuplicate);
+    getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer crashed");
+    assertArrayFalse(firedSystemDuplicate);
     // TODO: sometimes get adapter duplicate since memberId isn't endpoint
     // initial impl uses Endpoint.toString() for memberId of server; final
     // impl should have server send its real memberId to client via HandShake
     //assertFalse("Please update testBridgeMembershipEventsInClient to use BridgeServer memberId.",
     //           firedAdapterDuplicate);
-    assertFalse(firedAdapterDuplicate);
+    assertArrayFalse(firedAdapterDuplicate);
       
     assertFalse(firedSystem[JOINED]);
     assertNull(memberSystem[JOINED]);
@@ -1712,18 +1724,22 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
    * Tests notification of events for bridge server in system bridge client
    * process.
    */
+  @Test
   public void testServerEventsInLonerClient() throws Exception {
-     try {
-       doTestServerEventsInLonerClient();
-     }
-     finally {
-       disconnectAllFromDS();
-     }
+    try {
+      doTestServerEventsInLonerClient();
+    }
+    finally {
+      disconnectAllFromDS();
+    }
   }
+
   protected static int testServerEventsInLonerClient_port;
+
   private static int getTestServerEventsInLonerClient_port() {
     return testServerEventsInLonerClient_port;
   }
+
   private void doTestServerEventsInLonerClient() throws Exception {
     final boolean[] firedAdapter = new boolean[3];
     final DistributedMember[] memberAdapter = new DistributedMember[3];
@@ -1742,7 +1758,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       new UniversalMembershipListenerAdapter() {
       @Override
       public synchronized void memberJoined(MembershipEvent event) {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] memberJoined >" + event.getMemberId() + "<");
+        getLogWriter().info("[testServerEventsInLonerClient] memberJoined >" + event.getMemberId() + "<");
         firedAdapterDuplicate[JOINED] = firedAdapter[JOINED];
         firedAdapter[JOINED] = true;
         memberAdapter[JOINED] = event.getDistributedMember();
@@ -1755,7 +1771,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
       @Override
       public synchronized void memberLeft(MembershipEvent event) {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] memberLeft >" + event.getMemberId() + "<");
+        getLogWriter().info("[testServerEventsInLonerClient] memberLeft >" + event.getMemberId() + "<");
         firedAdapterDuplicate[LEFT] = firedAdapter[LEFT];
         firedAdapter[LEFT] = true;
         memberAdapter[LEFT] = event.getDistributedMember();
@@ -1768,7 +1784,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
       @Override
       public synchronized void memberCrashed(MembershipEvent event) {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] memberCrashed >" + event.getMemberId() + "<");
+        getLogWriter().info("[testServerEventsInLonerClient] memberCrashed >" + event.getMemberId() + "<");
         firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED];
         firedAdapter[CRASHED] = true;
         memberAdapter[CRASHED] = event.getDistributedMember();
@@ -1815,13 +1831,13 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       { AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) };
     assertTrue(ports[0] != 0);
 
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] create loner bridge client");
+    getLogWriter().info("[testServerEventsInLonerClient] create loner bridge client");
     Properties config = new Properties();
     config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     config.setProperty(DistributionConfig.LOCATORS_NAME, "");
     getSystem(config);
         
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] create system bridge client");
+    getLogWriter().info("[testServerEventsInLonerClient] create system bridge client");
     getSystem();
 
     // register the bridge listener
@@ -1837,7 +1853,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     new SerializableCallable("Create BridgeServer") {
       @Override
       public Object call() {
-        com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] Create BridgeServer");
+        getLogWriter().info("[testServerEventsInLonerClient] Create BridgeServer");
         getSystem();
         AttributesFactory factory = new AttributesFactory();
         factory.setScope(Scope.LOCAL);
@@ -1848,7 +1864,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
           testServerEventsInLonerClient_port = startBridgeServer(ports[0]);
         }
         catch (IOException e) {
-          com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().error(e);
+          getLogWriter().error(e);
           fail(e.getMessage());
         }
         return basicGetSystem().getDistributedMember();
@@ -1862,9 +1878,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     assertEquals(ports[0],
                  (int) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port()));
 
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
+    getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
+    getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
+    getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
 
     // create region which connects to bridge server
     AttributesFactory factory = new AttributesFactory();
@@ -1884,14 +1900,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server join");
+    getLogWriter().info("[testServerEventsInLonerClient] assert client detected server join");
     // TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK
     // initial impl uses Endpoint.toString() for memberId of server; final
     // impl should have server send its real memberId to client via HandShake
     //assertFalse("Please update testBridgeMembershipEventsInClient to use BridgeServer memberId.",
     //           firedAdapterDuplicate);
-    assertFalse(firedAdapterDuplicate);
-    assertFalse(firedBridgeDuplicate);
+    assertArrayFalse(firedAdapterDuplicate);
+    assertArrayFalse(firedBridgeDuplicate);
 
     assertTrue(firedBridge[JOINED]);
     assertEquals(serverMember, memberBridge[JOINED]);
@@ -1924,7 +1940,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     assertFalse(isClientAdapter[CRASHED]);
     resetArraysForTesting(firedAdapter, memberAdapter, memberIdAdapter, isClientAdapter);
 
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] wait for client to fully connect");
+    getLogWriter().info("[testServerEventsInLonerClient] wait for client to fully connect");
     final String pl =
       getRootRegion().getSubregion(name).getAttributes().getPoolName();
     PoolImpl pi = (PoolImpl)PoolManager.find(pl);
@@ -1953,7 +1969,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     try {
       vm0.invoke(new SerializableRunnable("Disconnect bridge server") {
         public void run() {
-          com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] disconnect bridge server");
+          getLogWriter().info("[testServerEventsInLonerClient] disconnect bridge server");
           closeCache();
         }
       });
@@ -1977,14 +1993,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       lw.info(removeExpected2);
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server crashed");
+    getLogWriter().info("[testServerEventsInLonerClient] assert client detected server crashed");
     // TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK
     // initial impl uses Endpoint.toString() for memberId of server; final
     // impl should have server send its real memberId to client via HandShake
     //assertFalse("Please update testBridgeMembershipEventsInClient to use BridgeServer memberId.",
     //           firedAdapterDuplicate);
-    assertFalse(firedAdapterDuplicate);
-    assertFalse(firedBridgeDuplicate);
+    assertArrayFalse(firedAdapterDuplicate);
+    assertArrayFalse(firedBridgeDuplicate);
 
     assertFalse(firedBridge[JOINED]);
     assertNull(memberIdBridge[JOINED]);
@@ -2030,9 +2046,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
         (int) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port()));
     serverMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember());
 
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
+    getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
+    getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
+    getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
                                                 
     synchronized(adapter) {
       if (!firedAdapter[JOINED]) {
@@ -2045,14 +2061,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
       }
     }
     
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server re-join");
+    getLogWriter().info("[testServerEventsInLonerClient] assert client detected server re-join");
     // TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK
     // initial impl uses Endpoint.toString() for memberId of server; final
     // impl should have server send its real memberId to client via HandShake
     //assertFalse("Please update testBridgeMembershipEventsInClient to use BridgeServer memberId.",
     //           firedAdapterDuplicate);
-    assertFalse(firedAdapterDuplicate);
-    assertFalse(firedBridgeDuplicate);
+    assertArrayFalse(firedAdapterDuplicate);
+    assertArrayFalse(firedBridgeDuplicate);
 
     assertTrue(firedBridge[JOINED]);
     assertNotNull(memberBridge[JOINED]);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
index afbb29d..87368f0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.test.dunit.internal.JUnit3DistributedTestCase;
  */
 public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase implements CacheTestFixture {
 
-  private final JUnit4CacheTestCase delegate = new JUnit4CacheTestCase(this);
+  private final JUnit4CacheTestCase delegate = new JUnit4CacheTestCase(this){};
 
   public JUnit3CacheTestCase(final String name) {
     super(name);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 1f9b54e..2d507d5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -47,7 +47,7 @@ import java.util.Properties;
  *
  * TODO: make this class abstract when JUnit3CacheTestCase is deleted
  */
-public class JUnit4CacheTestCase extends JUnit4DistributedTestCase implements CacheTestFixture {
+public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase implements CacheTestFixture {
 
   private static final Logger logger = LogService.getLogger();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
index 9165358..09047d6 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
@@ -23,8 +23,6 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import util.TestException;
-
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 68960bd..d4c87eb 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -30,6 +32,10 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.gemstone.gemfire.DataSerializable;
 import com.gemstone.gemfire.DataSerializer;
 import com.gemstone.gemfire.cache.AttributesFactory;
@@ -86,12 +92,14 @@ import com.gemstone.gemfire.test.dunit.ThreadUtils;
 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.junit.categories.DistributedTest;
 
 /**
  * Tests putAll for c/s. Also tests removeAll
  * 
  * @since 5.0.23
  */
+@Category(DistributedTest.class)
 @SuppressWarnings("serial")
 public class PutAllCSDUnitTest extends ClientServerTestCase {
 
@@ -114,19 +122,6 @@ public class PutAllCSDUnitTest extends ClientServerTestCase {
   final String expectedExceptions = PutAllPartialResultException.class.getName()+"||"
   + ServerConnectivityException.class.getName()+"||"+RegionDestroyedException.class.getName()+"||java.net.ConnectException";
 
-  // public static void caseTearDown() throws Exception {
-  // disconnectAllFromDS();
-  // }
-
-  /**
-   * Creates a new <code>GemFireMemberStatusDUnitTest</code>
-   */
-  public PutAllCSDUnitTest(String name) {
-    super(name);
-  }
-
-  // ////// Test Methods
-
   private static void checkRegionSize(final Region region, final int expectedSize) {
     WaitCriterion ev = new WaitCriterion() {
       public boolean done() {
@@ -145,7 +140,8 @@ public class PutAllCSDUnitTest extends ClientServerTestCase {
    * 
    * @throws InterruptedException
    */
-public void testOneServer() throws CacheException, InterruptedException {
+  @Test
+  public void testOneServer() throws CacheException, InterruptedException {
     final String title = "testOneServer:";
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -413,6 +409,7 @@ public void testOneServer() throws CacheException, InterruptedException {
    * 
    * @throws InterruptedException
    */
+  @Test
   public void testOldValueInEvent() throws CacheException, InterruptedException {
     final String title = "testOldValueInEvent:";
     final Host host = Host.getHost(0);
@@ -479,6 +476,7 @@ public void testOneServer() throws CacheException, InterruptedException {
    * client to a replicated region 2) putAll from a multi-threaded client to a
    * replicated region 3)
    */
+  @Test
   public void test2Server() throws CacheException, InterruptedException {
     final String title = "test2Server:";
 //    disconnectAllFromDS();
@@ -1106,14 +1104,16 @@ public void testOneServer() throws CacheException, InterruptedException {
     // Stop server
     stopBridgeServers(getCache());
   }
-  
+
+  @Test
   public void test2NormalServerCCE() throws CacheException, InterruptedException {
     doTest2NormalServerCCE(true);
     disconnectAllFromDS();
     doTest2NormalServerCCE(false);
     disconnectAllFromDS();
   }
-  
+
+  @Test
   public void testPRServerRVDuplicatedKeys() throws CacheException, InterruptedException {
     doRVDuplicatedKeys(true, 1);
     disconnectAllFromDS();
@@ -1249,12 +1249,14 @@ public void testOneServer() throws CacheException, InterruptedException {
     // Stop server
     stopBridgeServers(getCache());
   }
-  
+
+  @Test
   public void testBug51725() throws CacheException, InterruptedException {
     doBug51725(false);
     disconnectAllFromDS();
   }
 
+  @Test
   public void testBug51725_singlehup() throws CacheException, InterruptedException {
     doBug51725(true);
     disconnectAllFromDS();
@@ -1373,6 +1375,7 @@ public void testOneServer() throws CacheException, InterruptedException {
   /**
    * Tests putAll to 2 PR servers.
    */
+  @Test
   public void testPRServer() throws CacheException, InterruptedException {
     final String title = "testPRServer:";
 //    disconnectAllFromDS();
@@ -1749,6 +1752,7 @@ public void testOneServer() throws CacheException, InterruptedException {
   // Checks to see if a client does a destroy that throws an exception from CacheWriter beforeDestroy
   // that the size of the region is still correct.
   // See bug 51583.
+  @Test
   public void testClientDestroyOfUncreatedEntry() throws CacheException, InterruptedException {
     final String title = "testClientDestroyOfUncreatedEntry:";
 
@@ -1798,6 +1802,7 @@ public void testOneServer() throws CacheException, InterruptedException {
   /**
    * Tests partial key putAll and removeAll to 2 servers with local region
    */
+  @Test
   public void testPartialKeyInLocalRegion() throws CacheException, InterruptedException {
     final String title = "testPartialKeyInLocalRegion:";
 //    disconnectAllFromDS();
@@ -2083,6 +2088,7 @@ public void testOneServer() throws CacheException, InterruptedException {
    * side is different between PR and LR. PR does it in postPutAll.
    * It's not running in singleHop putAll
    */
+  @Test
   public void testPartialKeyInPR() throws CacheException, InterruptedException {
     final String title = "testPartialKeyInPR:";
 //    disconnectAllFromDS();
@@ -2255,6 +2261,7 @@ public void testOneServer() throws CacheException, InterruptedException {
    * side is different between PR and LR. PR does it in postPutAll.
    * This is a singlehop putAll test.
    */
+  @Test
   public void testPartialKeyInPRSingleHop() throws CacheException, InterruptedException {
     final String title = "testPartialKeyInPRSingleHop_";
     final int cacheWriterAllowedKeyNum = 16;
@@ -2437,6 +2444,7 @@ public void testOneServer() throws CacheException, InterruptedException {
    * Set redundency=1 to see if retry succeeded after PRE
    * This is a singlehop putAll test.
    */
+  @Test
   public void testPartialKeyInPRSingleHopWithRedundency() throws CacheException, InterruptedException {
     final String title = "testPartialKeyInPRSingleHopWithRedundency_";
     int client1Size;
@@ -2597,6 +2605,7 @@ public void testOneServer() throws CacheException, InterruptedException {
    * Tests bug 41403: let 2 sub maps both failed with partial key applied. 
    * This is a singlehop putAll test.
    */
+  @Test
   public void testEventIdMisorderInPRSingleHop() throws CacheException, InterruptedException {
     final String title = "testEventIdMisorderInPRSingleHop_";
 
@@ -2738,8 +2747,8 @@ public void testOneServer() throws CacheException, InterruptedException {
    * Tests while putAll to 2 distributed servers, one server failed over Add a
    * listener to slow down the processing of putAll
    */
-  public void test2FailOverDistributedServer() throws CacheException,
-      InterruptedException {
+  @Test
+  public void test2FailOverDistributedServer() throws CacheException, InterruptedException {
     IgnoredException.addIgnoredException("Broken pipe");
     IgnoredException.addIgnoredException("Connection reset");
     IgnoredException.addIgnoredException("Unexpected IOException");
@@ -2840,6 +2849,7 @@ public void testOneServer() throws CacheException, InterruptedException {
   /**
    * Tests while putAll timeout's exception
    */
+  @Test
   public void testClientTimeOut() throws CacheException, InterruptedException {
     final String title = "testClientTimeOut:";
     disconnectAllFromDS();
@@ -2898,6 +2908,7 @@ public void testOneServer() throws CacheException, InterruptedException {
   /**
    * Tests while putAll timeout at endpoint1 and switch to endpoint2
    */
+  @Test
   public void testEndPointSwitch() throws CacheException, InterruptedException {
     IgnoredException.addIgnoredException("Broken pipe");
     IgnoredException.addIgnoredException("Connection reset");
@@ -2970,6 +2981,7 @@ public void testOneServer() throws CacheException, InterruptedException {
    * Tests while putAll to 2 distributed servers, one server failed over Add a
    * listener to slow down the processing of putAll
    */
+  @Test
   public void testHADRFailOver() throws CacheException, InterruptedException {
     final String title = "testHADRFailOver:";
     disconnectAllFromDS();
@@ -3063,7 +3075,9 @@ public void testOneServer() throws CacheException, InterruptedException {
    * Test TX for putAll. There's no TX for c/s. We only test P2P
    * This is disabled because putAll in TX is disabled.
    */
-  public void no_testTX() throws CacheException, InterruptedException {
+  @Ignore("TODO")
+  @Test
+  public void testTX() throws CacheException, InterruptedException {
     final String title = "testTX:";
     disconnectAllFromDS();
     final Host host = Host.getHost(0);
@@ -3220,10 +3234,10 @@ public void testOneServer() throws CacheException, InterruptedException {
     stopBridgeServers(getCache());
   }
 
-
   List<VersionTag> client1Versions = null;
   List<VersionTag> client2Versions = null;
 
+  @Test
   public void testVersionsOnClientsWithNotificationsOnly() {
     
     final String title = "testVersionsInClients";
@@ -3322,6 +3336,7 @@ public void testOneServer() throws CacheException, InterruptedException {
   List<VersionTag> client2RAVersions = null;
 
   // basically same test as testVersionsOnClientsWithNotificationsOnly but also do a removeAll
+  @Test
   public void testRAVersionsOnClientsWithNotificationsOnly() {
     
     final String title = "testRAVersionsInClients";
@@ -3422,6 +3437,7 @@ public void testOneServer() throws CacheException, InterruptedException {
   List<String> expectedVersions = null;
   List<String> actualVersions = null;
 
+  @Test
   public void testVersionsOnServersWithNotificationsOnly() {
     
     final String title = "testVersionsOnServers";
@@ -3527,6 +3543,7 @@ public void testOneServer() throws CacheException, InterruptedException {
   List<String> actualRAVersions = null;
 
   // Same test as testVersionsOnServersWithNotificationsOnly but also does a removeAll
+  @Test
   public void testRAVersionsOnServersWithNotificationsOnly() {
     
     final String title = "testRAVersionsOnServers";
@@ -3632,7 +3649,7 @@ public void testOneServer() throws CacheException, InterruptedException {
     
   }
 
-
+  @Test
   public void testVersionsOnReplicasAfterPutAllAndRemoveAll() {
     
     final String title = "testVersionsOnReplicas";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index cfe4d67..1bc69b1 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -16,11 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +27,6 @@ import java.util.concurrent.TimeUnit;
 import org.junit.Ignore;
 
 import junit.framework.Assert;
-import util.TestException;
 
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.InterestResultPolicy;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd0fdfa8/reset_existing_junit4_dunits.sh
----------------------------------------------------------------------
diff --git a/reset_existing_junit4_dunits.sh b/reset_existing_junit4_dunits.sh
index 6bbf2a5..e89f91b 100755
--- a/reset_existing_junit4_dunits.sh
+++ b/reset_existing_junit4_dunits.sh
@@ -75,3 +75,39 @@ git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wa
 git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
 git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
 git checkout -- ./geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+
+#Kirks changes
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/TestDataSerializer.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAutoDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryJUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
+git checkout -- geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
+git checkout -- geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
+git checkout -- geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+git checkout -- geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java


Mime
View raw message