geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [22/44] incubator-geode git commit: Refactor dunit
Date Tue, 02 Feb 2016 20:21:29 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
index 5b35720..878a64c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
@@ -40,6 +40,8 @@ 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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.VM;
 
 /**
@@ -163,9 +165,9 @@ public class Bug36457DUnitTest extends DistributedTestCase
     Integer port2 = ((Integer)server2.invoke(Bug36457DUnitTest.class,
         "createServerCache"));
     client1.invoke(Bug36457DUnitTest.class, "createClientCache", new Object[] {
-        getServerHostName(server1.getHost()), port1, port2 });
+        NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
     client2.invoke(Bug36457DUnitTest.class, "createClientCache", new Object[] {
-        getServerHostName(server1.getHost()), port1, port2 });
+        NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
     //set a cllabck so that we come to know that whether a failover is called or not
     // if failover is called means this bug is present.
     client2.invoke(Bug36457DUnitTest.class, "setClientServerObserver");
@@ -189,7 +191,7 @@ public class Bug36457DUnitTest extends DistributedTestCase
         .setInstance(new ClientServerObserverAdapter() {
           public void afterPrimaryIdentificationFromBackup(ServerLocation primaryEndpoint)
           {
-            getLogWriter().fine("TEST FAILED HERE YOGI ");
+            LogWriterSupport.getLogWriter().fine("TEST FAILED HERE YOGI ");
             isFaileoverHappened = true;
           }
         });

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
index fa1bed1..ba42f26 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
@@ -36,7 +36,10 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 /**
  * bug test for bug 36805
@@ -156,9 +159,9 @@ public class Bug36805DUnitTest extends DistributedTestCase
     Integer port2 = ((Integer)server2.invoke(Bug36805DUnitTest.class,
         "createServerCache"));
     client1.invoke(Bug36805DUnitTest.class, "createClientCache", new Object[] {
-        getServerHostName(server1.getHost()), port1, port2 });
+        NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
     client2.invoke(Bug36805DUnitTest.class, "createClientCache", new Object[] {
-        getServerHostName(server1.getHost()), port1, port2 });
+        NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
     // set a cllabck so that we come to know that whether a failover is called
     // or not
     // if failover is called means this bug is present.
@@ -215,7 +218,7 @@ public class Bug36805DUnitTest extends DistributedTestCase
         return excuse;
       }
     };
-    DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true);
+    Wait.waitForCriterion(wc, 3 * 60 * 1000, 1000, true);
 
     // we no longer verify dead servers; live is good enough
 //     start = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
index 34ccfe1..48222d6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
@@ -30,6 +30,7 @@ import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
 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.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.VM;
 
 public class Bug36829DUnitTest extends DistributedTestCase {
@@ -67,7 +68,7 @@ public class Bug36829DUnitTest extends DistributedTestCase {
 
     this.ClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
         new Object[] {
-            getClientPool(getServerHostName(ClientVM.getHost()), PORT, true, 0),
+            getClientPool(NetworkSupport.getServerHostName(ClientVM.getHost()), PORT, true, 0),
             regionName,
             getClientDistributedSystemProperties(durableClientId,
                 durableClientTimeout), Boolean.TRUE });

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
index 0f0520e..285b200 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
@@ -30,7 +30,10 @@ import com.gemstone.gemfire.internal.AvailablePort;
 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.NetworkSupport;
 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.cache.client.*;
 import com.gemstone.gemfire.cache.client.internal.PoolImpl;
 
@@ -165,7 +168,7 @@ public class Bug36995DUnitTest extends DistributedTestCase
     Integer port3 = ((Integer)server3.invoke(Bug36995DUnitTest.class,
         "createServerCache"));
     createClientCacheWithDefaultMessageTrackingTimeout(
-        getServerHostName(server1.getHost()), port1.intValue(), port2
+        NetworkSupport.getServerHostName(server1.getHost()), port1.intValue(), port2
         .intValue(), port3.intValue());
     assertEquals(PoolFactory.DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT,
                  pool.getSubscriptionMessageTrackingTimeout());
@@ -177,14 +180,14 @@ public class Bug36995DUnitTest extends DistributedTestCase
   public void testBug36995_UserSpecified()
   {
     //work around GEODE-507
-    IgnoredException.addExpectedException("Connection reset");
+    IgnoredException.addIgnoredException("Connection reset");
     Integer port1 = ((Integer)server1.invoke(Bug36995DUnitTest.class,
         "createServerCache"));
     Integer port2 = ((Integer)server2.invoke(Bug36995DUnitTest.class,
         "createServerCache"));
     Integer port3 = ((Integer)server3.invoke(Bug36995DUnitTest.class,
         "createServerCache"));
-    createClientCache(getServerHostName(server1.getHost()),
+    createClientCache(NetworkSupport.getServerHostName(server1.getHost()),
         port1.intValue(), port2.intValue(), port3.intValue());
     assertEquals(54321, pool.getSubscriptionMessageTrackingTimeout());
   }
@@ -200,7 +203,7 @@ public class Bug36995DUnitTest extends DistributedTestCase
         "createServerCache"));
     Integer port3 = ((Integer)server3.invoke(Bug36995DUnitTest.class,
         "createServerCache"));
-    createClientCache(getServerHostName(server1.getHost()),
+    createClientCache(NetworkSupport.getServerHostName(server1.getHost()),
         port1.intValue(), port2.intValue(), port3.intValue());
     verifyDeadAndLiveServers(0, 3);
     server2.invoke(Bug36995DUnitTest.class, "stopServer");
@@ -233,7 +236,7 @@ public class Bug36995DUnitTest extends DistributedTestCase
         return excuse;
       }
     };
-    DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true);
+    Wait.waitForCriterion(wc, 3 * 60 * 1000, 1000, true);
     
     // we no longer verify dead servers; just live
 //     while (proxy.getDeadServers().size() != expectedDeadServers) { // wait

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
index 3221e4b..ecb3d7c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -36,6 +36,8 @@ import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
 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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.cache.client.*;
 
@@ -84,7 +86,7 @@ public class Bug37210DUnitTest extends DistributedTestCase
   {
     super.setUp();
     
-    IgnoredException.addExpectedException("java.io.IOException");
+    IgnoredException.addIgnoredException("java.io.IOException");
     
     final Host host = Host.getHost(0);
     server = host.getVM(0);
@@ -145,11 +147,11 @@ public class Bug37210DUnitTest extends DistributedTestCase
    */
   public void testHAStatsCleanup() throws Exception
   {
-    getLogWriter().info("testHAStatsCleanup : BEGIN");
-    IgnoredException.addExpectedException("java.net.SocketException");
-    IgnoredException.addExpectedException("Unexpected IOException");
+    LogWriterSupport.getLogWriter().info("testHAStatsCleanup : BEGIN");
+    IgnoredException.addIgnoredException("java.net.SocketException");
+    IgnoredException.addIgnoredException("Unexpected IOException");
     client.invoke(Bug37210DUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT) });
+        new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT) });
     server.invoke(Bug37210DUnitTest.class, "doEntryOperations");
     
     server.invoke(Bug37210DUnitTest.class,
@@ -159,7 +161,7 @@ public class Bug37210DUnitTest extends DistributedTestCase
     Thread.currentThread().sleep(1000);
     server.invoke(Bug37210DUnitTest.class,
             "closeCacheClientProxyAndVerifyStats2");
-    getLogWriter().info("testHAStatsCleanup : END");
+    LogWriterSupport.getLogWriter().info("testHAStatsCleanup : END");
   }
 
   /**
@@ -188,7 +190,7 @@ public class Bug37210DUnitTest extends DistributedTestCase
     server.setSocketBufferSize(32768);
     server.setMaximumTimeBetweenPings(1000000);
     server.start();
-    getLogWriter().info("Server started at PORT = " + port);
+    LogWriterSupport.getLogWriter().info("Server started at PORT = " + port);
     return new Integer(server.getPort());
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
index 24674fe..db99c5b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
@@ -30,6 +30,7 @@ import com.gemstone.gemfire.internal.cache.HARegion;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.VM;
 
 /**
@@ -84,7 +85,7 @@ public class Bug37805DUnitTest extends DistributedTestCase{
 
     this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
         new Object[] {
-            getClientPool(getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
+            getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
             regionName,
             getDurableClientDistributedSystemProperties(durableClientId,
                 durableClientTimeout), Boolean.TRUE });

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
index 3418ae2..ed0d7fd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
@@ -39,8 +39,8 @@ import com.gemstone.gemfire.cache.client.internal.Connection;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
@@ -177,7 +177,7 @@ public class CacheServerMaxConnectionsJUnitTest
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 1000, 200, true);
+    Wait.waitForCriterion(ev, 1000, 200, true);
     assertEquals(MAX_CNXS, s.getInt("currentClientConnections"));
     assertEquals(1, s.getInt("currentClients"));
     this.system.getLogWriter().info("<ExpectedException action=add>" 
@@ -214,7 +214,7 @@ public class CacheServerMaxConnectionsJUnitTest
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 3 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 3 * 1000, 200, true);
     this.system.getLogWriter().info("currentClients="
         + s.getInt("currentClients")
         + " currentClientConnections="

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
index 14b6dcf..78050cc 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
@@ -52,7 +52,9 @@ import com.gemstone.gemfire.internal.cache.PoolFactoryImpl.PoolAttributes;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestSupport;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
 /**
  *
  * @author Yogesh Mahajan
@@ -158,7 +160,7 @@ public class CacheServerTestUtil extends DistributedTestCase
   public static void createCacheClient(Pool poolAttr, String regionName,
       Properties dsProperties, Boolean addControlListener, Properties javaSystemProperties) throws Exception {  		
       new CacheServerTestUtil("temp").createCache(dsProperties);
-      IgnoredException.addExpectedException("java.net.ConnectException||java.net.SocketException");
+      IgnoredException.addIgnoredException("java.net.ConnectException||java.net.SocketException");
       
       if (javaSystemProperties != null && javaSystemProperties.size() > 0) {
       	Enumeration e = javaSystemProperties.propertyNames();
@@ -224,9 +226,9 @@ public class CacheServerTestUtil extends DistributedTestCase
     ccf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId);
     ccf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(timeout));
     ccf.set("log-file", "abs_client_system.log");
-    ccf.set("log-level", getDUnitLogLevel());
+    ccf.set("log-level", LogWriterSupport.getDUnitLogLevel());
     cache = (Cache)ccf.create();
-    expected = IgnoredException.addExpectedException("java.net.ConnectionException||java.net.SocketException");
+    expected = IgnoredException.addIgnoredException("java.net.ConnectionException||java.net.SocketException");
     pool = (PoolImpl)PoolManager.find(poolName);
     
   }
@@ -245,7 +247,7 @@ public class CacheServerTestUtil extends DistributedTestCase
     ccf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId);
     ccf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(timeout));
     cache = (Cache)ccf.create();
-    expected = IgnoredException.addExpectedException("java.net.ConnectionException||java.net.SocketException");
+    expected = IgnoredException.addIgnoredException("java.net.ConnectionException||java.net.SocketException");
     pool = (PoolImpl)PoolManager.find(poolName);
     
   }
@@ -256,9 +258,9 @@ public class CacheServerTestUtil extends DistributedTestCase
       File cacheXmlFile = new File(url.toURI().getPath());
       ccf.set("cache-xml-file", cacheXmlFile.toURI().getPath());
       ccf.set("mcast-port", "0");
-      ccf.set("locators", "localhost["+DistributedTestCase.getDUnitLocatorPort()+"]");
+      ccf.set("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]");
       ccf.set("log-file", "abs_server_system.log");
-      ccf.set("log-level", getDUnitLogLevel());
+      ccf.set("log-level", LogWriterSupport.getDUnitLogLevel());
     }
     catch (URISyntaxException e) {
       throw new ExceptionInInitializerError(e);
@@ -273,7 +275,7 @@ public class CacheServerTestUtil extends DistributedTestCase
       File cacheXmlFile = new File(url.toURI().getPath());
       ccf.set("cache-xml-file", cacheXmlFile.toURI().getPath());
       ccf.set("mcast-port", "0");
-      ccf.set("locators", "localhost["+DistributedTestCase.getDUnitLocatorPort()+"]");
+      ccf.set("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]");
     }
     catch (URISyntaxException e) {
       throw new ExceptionInInitializerError(e);
@@ -328,7 +330,7 @@ public class CacheServerTestUtil extends DistributedTestCase
   {
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestCase.getDUnitLocatorPort()+"]");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]");
     new CacheServerTestUtil("temp").createCache(props);
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -350,7 +352,7 @@ public class CacheServerTestUtil extends DistributedTestCase
     Properties props = new Properties();
 //    int mcastPort = AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS);
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestCase.getDUnitLocatorPort()+"]");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]");
     new CacheServerTestUtil("temp").createCache(props);
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -371,7 +373,7 @@ public class CacheServerTestUtil extends DistributedTestCase
       throws Exception {
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestCase.getDUnitLocatorPort()+"]");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]");
     new CacheServerTestUtil("temp").createCache(props);
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -427,7 +429,7 @@ public class CacheServerTestUtil extends DistributedTestCase
     setSystem(props, cc.getDistributedSystem());
     cache = (Cache)cc;
     assertNotNull(cache);
-    expected = IgnoredException.addExpectedException("java.net.ConnectionException||java.net.SocketException");
+    expected = IgnoredException.addIgnoredException("java.net.ConnectionException||java.net.SocketException");
   }
 
   public static void closeCache()

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index b11f510..7264a38 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -39,7 +39,11 @@ import com.gemstone.gemfire.internal.AvailablePort;
 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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 /**
  * Tests behaviour of transactions in client server model
@@ -112,10 +116,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
   {
     Integer port1 = initServerCache(server1);
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
-    pause(PAUSE);
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+    Wait.pause(PAUSE);
 
     server1.invoke(resetFlags());
     client1.invoke(resetFlags());
@@ -123,14 +127,14 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "putInTransaction",
         new Object[] { "server1" });
-    pause(PAUSE);
+    Wait.pause(PAUSE);
     
     client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
     client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
 
     server1.invoke(CacheServerTransactionsDUnitTest.class,
         "commitTransactionOnServer1");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
     client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
@@ -149,10 +153,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     Integer port1 = initServerCache(server1);
     Integer port2 = initServerCache(server2);
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1, port2 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1, port2 });
-    pause(PAUSE);
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+    Wait.pause(PAUSE);
 
     server1.invoke(resetFlags());
     server2.invoke(resetFlags());
@@ -161,7 +165,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "putInTransaction",
         new Object[] { "server1" });
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
     client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
@@ -169,7 +173,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
 
     server1.invoke(CacheServerTransactionsDUnitTest.class,
         "commitTransactionOnServer1");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
     server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
@@ -187,10 +191,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     Integer port1 = initServerCache(server1);
     Integer port2 = initServerCache(server2);
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port2 });
-    pause(PAUSE);
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port2 });
+    Wait.pause(PAUSE);
 
     server1.invoke(resetFlags());
     server2.invoke(resetFlags());
@@ -199,7 +203,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "putInTransaction",
         new Object[] { "server1" });
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
     client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
@@ -207,7 +211,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
 
     server1.invoke(CacheServerTransactionsDUnitTest.class,
         "commitTransactionOnServer1");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
     server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
@@ -223,10 +227,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
   {
     Integer port1 = initServerCache(server1);
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
-    pause(PAUSE);
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+    Wait.pause(PAUSE);
 
     server1.invoke(resetFlags());
     client1.invoke(resetFlags());
@@ -236,7 +240,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
         new Object[] { "server1" });
     server1.invoke(CacheServerTransactionsDUnitTest.class,
         "commitTransactionOnServer1");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
     client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
@@ -252,10 +256,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     Integer port1 = initServerCache(server1);
     Integer port2 = initServerCache(server2);
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1, port2 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1, port2 });
-    pause(PAUSE);
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+    Wait.pause(PAUSE);
 
     server1.invoke(resetFlags());
     server2.invoke(resetFlags());
@@ -266,7 +270,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
         new Object[] { "server1" });
     server1.invoke(CacheServerTransactionsDUnitTest.class,
         "commitTransactionOnServer1");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
     server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
@@ -284,10 +288,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     Integer port1 = initServerCache(server1);
     Integer port2 = initServerCache(server2);
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port2 });
-    pause(PAUSE);
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port2 });
+    Wait.pause(PAUSE);
 
     server1.invoke(resetFlags());
     server2.invoke(resetFlags());
@@ -298,7 +302,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
         new Object[] { "server1" });
     server1.invoke(CacheServerTransactionsDUnitTest.class,
         "commitTransactionOnServer1");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
     server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
@@ -316,10 +320,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
   {
     Integer port1 = initServerCache(server1);
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
-    pause(PAUSE);
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+    Wait.pause(PAUSE);
 
     server1.invoke(resetFlags());
     client1.invoke(resetFlags());
@@ -329,7 +333,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
         new Object[] { "server1" });
     server1.invoke(CacheServerTransactionsDUnitTest.class,
         "commitTransactionOnServer1");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
     client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
@@ -345,10 +349,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     Integer port1 = initServerCache(server1);
     Integer port2 = initServerCache(server2);
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1, port2 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1, port2 });
-    pause(PAUSE);
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+    Wait.pause(PAUSE);
     
     server1.invoke(resetFlags());
     server2.invoke(resetFlags());
@@ -359,7 +363,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
         new Object[] { "server1" });
     server1.invoke(CacheServerTransactionsDUnitTest.class,
         "commitTransactionOnServer1");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
     server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
@@ -377,10 +381,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     Integer port1 = initServerCache(server1);
     Integer port2 = initServerCache(server2);
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port2 });
-    pause(PAUSE);
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port2 });
+    Wait.pause(PAUSE);
     
     server1.invoke(resetFlags());
     server2.invoke(resetFlags());
@@ -391,7 +395,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
         new Object[] { "server1" });
     server1.invoke(CacheServerTransactionsDUnitTest.class,
         "commitTransactionOnServer1");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
 
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
     server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
@@ -410,11 +414,11 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     Integer port2 = ((Integer)server2.invoke(
         CacheServerTransactionsDUnitTest.class, "createServerCache"));
     client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port1 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
     client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), port2 });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port2 });
     client1.invoke(CacheServerTransactionsDUnitTest.class, "commitTransactionOnClient");
-    pause(PAUSE);
+    Wait.pause(PAUSE);
     
     server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdatesOnServer");
     server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdatesOnServer");
@@ -456,7 +460,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
     assertNotNull(r1);
     try {
-      getLogWriter().info(
+      LogWriterSupport.getLogWriter().info(
           "vlaue for the key k1" + r1.getEntry(k1).getValue());
       WaitCriterion ev = new WaitCriterion() {
         public boolean done() {
@@ -467,7 +471,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
           return null;
         }
       };
-      DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+      Wait.waitForCriterion(ev, 120 * 1000, 200, true);
       
       ev = new WaitCriterion() {
         public boolean done() {
@@ -478,7 +482,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
           return null;
         }
       };
-      DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+      Wait.waitForCriterion(ev, 120 * 1000, 200, true);
     }
     catch (Exception e) {
       fail("Exception in trying to get due to " + e);
@@ -566,7 +570,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
     final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
     assertNotNull(r1);
     try {
-      getLogWriter().info(
+      LogWriterSupport.getLogWriter().info(
           "vlaue for the key k1" + r1.getEntry(k1).getValue());
       // wait until
       // condition is
@@ -580,7 +584,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
           return null;
         }
       };
-      DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+      Wait.waitForCriterion(ev, 120 * 1000, 200, true);
 
       ev = new WaitCriterion() {
         public boolean done() {
@@ -591,7 +595,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
           return null;
         }
       };
-      DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+      Wait.waitForCriterion(ev, 120 * 1000, 200, true);
     }
     catch (Exception e) {
       fail("Exception in trying to get due to " + e);
@@ -614,7 +618,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
               + "; it is still " + r1.getEntry(k1).getValue();
         }
       };
-      DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+      Wait.waitForCriterion(ev, 120 * 1000, 200, true);
       
       ev = new WaitCriterion() {
         public boolean done() {
@@ -625,7 +629,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
           return null;
         }
       };
-      DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+      Wait.waitForCriterion(ev, 120 * 1000, 200, true);
     }
     catch (Exception e) {
       fail("Exception in trying to get due to " + e);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
index 61b2e53..fd2c5e6 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
@@ -39,6 +39,8 @@ import com.gemstone.gemfire.internal.cache.EventID;
 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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.cache.client.*;
 import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -104,9 +106,9 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
         "createServerCache")).intValue();
 
     client1.invoke(ClearPropagationDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
     client2.invoke(ClearPropagationDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
+        new Object[] { NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
 
     CacheObserverHolder.setInstance(new CacheObserverAdapter());
 
@@ -161,7 +163,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
 
     client1.invoke(ClearPropagationDUnitTest.class,
         "acquireConnectionsAndClear",
-        new Object[] { getServerHostName(client1.getHost())});
+        new Object[] { NetworkSupport.getServerHostName(client1.getHost())});
 
     client1.invoke(checkSizeRegion(2, false/*Do not Block*/));
     client2.invoke(checkSizeRegion(0, true /* block*/));
@@ -212,7 +214,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
 
     client1.invoke(ClearPropagationDUnitTest.class,
       "acquireConnectionsAndDestroyRegion",
-      new Object[] { getServerHostName(client1.getHost())});
+      new Object[] { NetworkSupport.getServerHostName(client1.getHost())});
 
     client1.invoke(checkSizeRegion(2, false/*Do not Block*/));
     client2.invoke(checkDestroyRegion(true /* block*/));
@@ -264,7 +266,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
       {
         Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME);
         assertNotNull(region);
-        getLogWriter().info("Size of the region " + region.size());
+        LogWriterSupport.getLogWriter().info("Size of the region " + region.size());
 
         if (toBlock) {
           synchronized (ClearPropagationDUnitTest.class) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 994ff5f..930e560 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -42,7 +42,11 @@ 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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 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;
 
 /**
@@ -129,8 +133,8 @@ public class ClientConflationDUnitTest extends DistributedTestCase
   }
   
   private void performSteps(String conflation) throws Exception {
-    createClientCacheFeeder(getServerHostName(Host.getHost(0)), new Integer(PORT));
-    vm1.invoke(ClientConflationDUnitTest.class, "createClientCache", new Object[] { getServerHostName(vm1.getHost()), new Integer(PORT),
+    createClientCacheFeeder(NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT));
+    vm1.invoke(ClientConflationDUnitTest.class, "createClientCache", new Object[] { NetworkSupport.getServerHostName(vm1.getHost()), new Integer(PORT),
       conflation});
     vm1.invoke(ClientConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
     vm1.invoke(ClientConflationDUnitTest.class, "setAllCountersZero");
@@ -335,7 +339,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
     
     final int u1 = update1;
     ev = new WaitCriterion() {
@@ -347,7 +351,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
     
     ev = new WaitCriterion() {
       public boolean done() {
@@ -358,7 +362,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
     
     final int u2 = update2;
     ev = new WaitCriterion() {
@@ -370,7 +374,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
   }
 
   /**
@@ -501,7 +505,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
   public static void putEntries()
   {
     try {
-      getLogWriter().info("Putting entries...");
+      LogWriterSupport.getLogWriter().info("Putting entries...");
       Region r1 = cacheFeeder.getRegion(Region.SEPARATOR +REGION_NAME1);
       Region r2 = cacheFeeder.getRegion(Region.SEPARATOR +REGION_NAME2);
       r1.put("key-1", "11");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
index 0a8a45a..1a6b038 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
@@ -41,8 +41,8 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.EventID;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
@@ -176,7 +176,7 @@ public class ClientHealthMonitorJUnitTest
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 20 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 20 * 1000, 200, true);
     
     assertEquals(1, s.getInt("currentClients"));
     assertEquals(1, s.getInt("currentClientConnections"));
@@ -193,7 +193,7 @@ public class ClientHealthMonitorJUnitTest
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, TIME_BETWEEN_PINGS * 5, 200, true);
+    Wait.waitForCriterion(ev, TIME_BETWEEN_PINGS * 5, 200, true);
 
     {
       this.system.getLogWriter().info("currentClients="

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index d49be28..c7d27ee 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -42,7 +42,11 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 /**
  * This test verifies the per-client notify-by-subscription (NBS) override
@@ -182,14 +186,14 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
     
     // Create a feeder.
     vm0.invoke(ClientInterestNotifyDUnitTest.class, "createClientCacheFeeder",
-        new Object[] {getServerHostName(Host.getHost(0)), new Integer(PORT)});
+        new Object[] {NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)});
     
     // Client 1 overrides NBS to true.
     // Client 2 "overrides" NSB to false.
     // Client 3 uses the default NBS which is false on the server.
     
     vm1.invoke(ClientInterestNotifyDUnitTest.class, "createClientCache",
-        new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn"});
+        new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn"});
     /*
     vm2.invoke(ClientInterestNotifyDUnitTest.class, "createClientCache",
         new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT), 
@@ -461,7 +465,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
         return excuse;
       }
     };
-    DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+    Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
   }
   
   /**
@@ -568,7 +572,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
   public static void doEntryOps()
   {
     try {
-      getLogWriter().info("Putting entries...");
+      LogWriterSupport.getLogWriter().info("Putting entries...");
       Cache cacheClient = GemFireCacheImpl.getInstance();
       Region r1 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME1);
       Region r2 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME2);
@@ -598,7 +602,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
   public static void doFeed()
   {
     try {
-      getLogWriter().info("Putting entries...");
+      LogWriterSupport.getLogWriter().info("Putting entries...");
       Cache cacheClient = GemFireCacheImpl.getInstance();
       Region r1 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME1);
       Region r2 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME2);
@@ -619,7 +623,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
   public static void getEntries()
   {
     try {
-      getLogWriter().info("Getting entries...");
+      LogWriterSupport.getLogWriter().info("Getting entries...");
       Cache cacheClient = GemFireCacheImpl.getInstance();
       Region r3 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME3);
       r3.get("key-1");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index 87d21e8..6786efd 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -42,12 +42,15 @@ import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 import java.util.Iterator;
 import java.util.Properties;
@@ -144,13 +147,13 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
   public void testConcurrentOperationsWithDRandPR() throws Exception {
     int port1 = initServerCache(true); // vm0
     int port2 = initServerCache2(true); // vm1
-    String serverName = getServerHostName(Host.getHost(0));
+    String serverName = NetworkSupport.getServerHostName(Host.getHost(0));
     host.getVM(2).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port1});
     host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2});
-    getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
+    LogWriterSupport.getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
     concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
     // TODO add verification in vm3
-    getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
+    LogWriterSupport.getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
     concurrentMapTest(host.getVM(2), "/" + PR_REGION_NAME);
     // TODO add verification in vm3
   }
@@ -158,13 +161,13 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
   public void testConcurrentOperationsWithDRandPRandEmptyClient() throws Exception {
     int port1 = initServerCache(true); // vm0
     int port2 = initServerCache2(true); // vm1
-    String serverName = getServerHostName(Host.getHost(0));
+    String serverName = NetworkSupport.getServerHostName(Host.getHost(0));
     host.getVM(2).invoke(this.getClass(), "createEmptyClientCache", new Object[]{serverName, port1});
     host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2});
-    getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
+    LogWriterSupport.getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
     concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
     // TODO add verification in vm3
-    getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
+    LogWriterSupport.getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
     concurrentMapTest(host.getVM(2), "/" + PR_REGION_NAME);
     // TODO add verification in vm3
   }
@@ -376,7 +379,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
   {
     // start server first
     PORT1 = initServerCache(true);
-    createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+    createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1);
     populateCache();
     registerInterest();
     server1.invoke(ClientServerMiscDUnitTest.class, "put");
@@ -409,11 +412,11 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
   {
     // start server first
     PORT1 = initServerCache(true);
-    createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+    createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1);
     populateCache();
     registerInterestInBothTheRegions();
     closeRegion1();
-    pause(6000);
+    Wait.pause(6000);
     server1.invoke(ClientServerMiscDUnitTest.class,
         "verifyInterestListOnServer");
     server1.invoke(ClientServerMiscDUnitTest.class, "put");
@@ -432,7 +435,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
   {
     // start server first
     PORT1 = initServerCache(true);
-    pool = (PoolImpl)createClientCache(getServerHostName(Host.getHost(0)),PORT1);
+    pool = (PoolImpl)createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)),PORT1);
     populateCache();
     registerInterestInBothTheRegions();
     closeBothRegions();
@@ -459,7 +462,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
   public void testCCPDestroyOnLastDestroyRegion() throws Exception
   {
     PORT1 = initServerCache(true);
-    PoolImpl pool = (PoolImpl)createClientCache(getServerHostName(Host.getHost(0)),PORT1);
+    PoolImpl pool = (PoolImpl)createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)),PORT1);
     destroyRegion1();
     // pause(5000);
     server1.invoke(ClientServerMiscDUnitTest.class,
@@ -496,7 +499,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
   {
     // start server first
     PORT1 = initServerCache(false);
-    createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+    createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1);
     registerInterestForInvalidatesInBothTheRegions();
     populateCache();
     server1.invoke(ClientServerMiscDUnitTest.class, "put");
@@ -517,7 +520,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
   {
     // start server first
     PORT1 = initServerCache(false);
-    createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+    createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1);
     registerInterestForInvalidatesInBothTheRegions();
     Region region = static_cache.getRegion(REGION_NAME1);
     populateCache();
@@ -563,7 +566,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
     new ClientServerMiscDUnitTest("temp").createCache(props);
-    String host = getServerHostName(server1.getHost());
+    String host = NetworkSupport.getServerHostName(server1.getHost());
     PoolImpl p = (PoolImpl)PoolManager.createFactory()
       .addServer(host, PORT1)
       .setSubscriptionEnabled(true)
@@ -603,7 +606,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
         return excuse;
       }
     };
-    DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+    Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
     
     // assertEquals(region1.getEntry(k1).getValue(), k1);
     wc = new WaitCriterion() {
@@ -616,7 +619,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
         return excuse;
       }
     };
-    DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+    Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
     
     wc = new WaitCriterion() {
       String excuse;
@@ -628,7 +631,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
         return excuse;
       }
     };
-    DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+    Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
     
     // assertEquals(region1.getEntry(k2).getValue(), k2);
     // assertEquals(region2.getEntry(k1).getValue(), k1);
@@ -642,7 +645,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
         return excuse;
       }
     };
-    DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+    Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
     
     // assertEquals(region2.getEntry(k2).getValue(), k2);
   }
@@ -666,7 +669,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
     ds.disconnect();
     ds = getSystem(props);
     PORT1 = initServerCache(true);
-    String host = getServerHostName(server1.getHost());
+    String host = NetworkSupport.getServerHostName(server1.getHost());
     Pool p = PoolManager.createFactory()
       .addServer(host, PORT1)
       .setSubscriptionEnabled(true)
@@ -688,7 +691,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
     assertNotNull(region2);
     //region1.registerInterest(CacheClientProxy.ALL_KEYS);
     region2.registerInterest("ALL_KEYS");
-    pause(6000);
+    Wait.pause(6000);
     server1.invoke(ClientServerMiscDUnitTest.class,
         "verifyInterestListOnServer");
 
@@ -709,7 +712,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
   public void testBug35380() throws Exception
   {
     //work around GEODE-477
-    IgnoredException.addExpectedException("Connection reset");
+    IgnoredException.addIgnoredException("Connection reset");
     Properties props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
@@ -717,7 +720,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
     assertNotNull(ds);
     
     PORT1 = initServerCache(true);
-    String host = getServerHostName(server1.getHost());
+    String host = NetworkSupport.getServerHostName(server1.getHost());
     Pool p = PoolManager.createFactory()
       .addServer(host, PORT1)
       .setSubscriptionEnabled(true)
@@ -851,7 +854,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
         return excuse;
       }
     };
-    DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+    Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
     
     return p;
   }
@@ -1070,7 +1073,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 40 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 40 * 1000, 1000, true);
     }
     catch (Exception ex) {
       ex.printStackTrace();
@@ -1115,7 +1118,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 40 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 40 * 1000, 1000, true);
     }
     catch (Exception ex) {
       ex.printStackTrace();
@@ -1195,7 +1198,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
       // assertEquals(k1, r1.getEntry(k1).getValue());
       wc = new WaitCriterion() {
@@ -1208,7 +1211,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
       // assertEquals(k2, r1.getEntry(k2).getValue());
       wc = new WaitCriterion() {
@@ -1221,7 +1224,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
       // assertEquals(server_k1, r2.getEntry(k1).getValue());
       wc = new WaitCriterion() {
@@ -1234,7 +1237,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
       // assertEquals(server_k2, r2.getEntry(k2).getValue());
     }
@@ -1262,7 +1265,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
       
       // assertNull(r1.getEntry(k1).getValue());
       wc = new WaitCriterion() {
@@ -1275,7 +1278,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
       
       // assertNull(r1.getEntry(k2).getValue());
       wc = new WaitCriterion() {
@@ -1288,7 +1291,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
       
 
       // assertNull(r2.getEntry(k1).getValue());
@@ -1302,7 +1305,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
       
       // assertNull(r2.getEntry(k2).getValue());
       wc = new WaitCriterion() {
@@ -1315,7 +1318,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
     }
     catch (Exception ex) {
       Assert.fail("failed while verifyInvalidatesOnBothRegions()", ex);
@@ -1338,7 +1341,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
       // assertEquals(server_k1, r2.getEntry(k1).getValue());
       wc = new WaitCriterion() {
@@ -1351,7 +1354,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
           return excuse;
         }
       };
-      DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+      Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
       
       // assertEquals(server_k2, r2.getEntry(k2).getValue());
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
index 6256d2a..065dfd4 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -43,7 +43,11 @@ import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
 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.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 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.cache.client.*;
 import com.gemstone.gemfire.cache.client.internal.PoolImpl;
 
@@ -137,9 +141,9 @@ public class ConflationDUnitTest extends DistributedTestCase
   {
     try {
       vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart");
-      createClientCache1UniqueWriter ( getServerHostName(Host.getHost(0)), new Integer(PORT));
+      createClientCache1UniqueWriter ( NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT));
       vm2.invoke(ConflationDUnitTest.class, "createClientCache2UniqueWriter",
-          new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT)});
+          new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)});
       vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
       vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
       vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
@@ -168,9 +172,9 @@ public class ConflationDUnitTest extends DistributedTestCase
   {
     try {
       vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart");
-      createClientCache1CommonWriter( getServerHostName(Host.getHost(0)), new Integer(PORT));
+      createClientCache1CommonWriter( NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT));
       vm2.invoke(ConflationDUnitTest.class, "createClientCache2CommonWriter",
-          new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT)});
+          new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)});
       vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
       vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
       vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
@@ -200,10 +204,10 @@ public class ConflationDUnitTest extends DistributedTestCase
   {
     try {
       vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart");
-      createClientCache1CommonWriterTest3(getServerHostName(Host.getHost(0)), new Integer(PORT));
+      createClientCache1CommonWriterTest3(NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT));
       vm2.invoke(ConflationDUnitTest.class,
           "createClientCache2CommonWriterTest3", new Object[] {
-        getServerHostName(Host.getHost(0)), new Integer(PORT) });
+        NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT) });
       vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
       vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
       vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
@@ -302,7 +306,7 @@ public class ConflationDUnitTest extends DistributedTestCase
     factory.setPoolName(createPool(host,"p1", port, true).getName());
     factory.addCacheListener(new CacheListenerAdapter() {
       public void afterCreate(EntryEvent event) {
-        getLogWriter().info("Listener received event " + event);
+        LogWriterSupport.getLogWriter().info("Listener received event " + event);
         String val = (String) event.getNewValue();
         synchronized (ConflationDUnitTest.class) {
           if (val.equals(MARKER)) {
@@ -318,7 +322,7 @@ public class ConflationDUnitTest extends DistributedTestCase
       }
 
       public void afterUpdate(EntryEvent event) {
-        getLogWriter().info("Listener received event " + event);
+        LogWriterSupport.getLogWriter().info("Listener received event " + event);
         synchronized (this) {
           counterUpdate++;
         }
@@ -326,7 +330,7 @@ public class ConflationDUnitTest extends DistributedTestCase
 
       public void afterDestroy(EntryEvent event)
       {
-        getLogWriter().info("Listener received event " + event);
+        LogWriterSupport.getLogWriter().info("Listener received event " + event);
         synchronized (this) {
           if(!event.getKey().equals(MARKER)) {
             counterDestroy++;
@@ -349,7 +353,7 @@ public class ConflationDUnitTest extends DistributedTestCase
     factory.setPoolName(createPool(host,"p1", port, true).getName());
     factory.addCacheListener(new CacheListenerAdapter() {
       public void afterCreate(EntryEvent event) {
-        getLogWriter().info("Listener received event " + event);
+        LogWriterSupport.getLogWriter().info("Listener received event " + event);
         String val = (String)event.getNewValue();
         synchronized (ConflationDUnitTest.class) {
           if (val.equals(MARKER)) {
@@ -365,14 +369,14 @@ public class ConflationDUnitTest extends DistributedTestCase
       }
 
       public void afterUpdate(EntryEvent event) {
-        getLogWriter().info("Listener received event " + event);
+        LogWriterSupport.getLogWriter().info("Listener received event " + event);
         synchronized (this) {
           counterUpdate++;
         }
       }
 
       public void afterDestroy(EntryEvent event) {
-        getLogWriter().info("Listener received event " + event);
+        LogWriterSupport.getLogWriter().info("Listener received event " + event);
         synchronized (this) {
           if (!event.getKey().equals(MARKER)) {
             counterDestroy++;
@@ -422,7 +426,7 @@ public class ConflationDUnitTest extends DistributedTestCase
       public void afterCreate(EntryEvent event)
       {
         String val = (String) event.getNewValue();
-        getLogWriter().info("Listener received event " + event);
+        LogWriterSupport.getLogWriter().info("Listener received event " + event);
         synchronized (ConflationDUnitTest.class) {
           if (val.equals(MARKER)) {
             count++;
@@ -519,7 +523,7 @@ public class ConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
 
     ev = new WaitCriterion() {
       public boolean done() {
@@ -530,7 +534,7 @@ public class ConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
     
     ev = new WaitCriterion() {
       public boolean done() {
@@ -541,7 +545,7 @@ public class ConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
   }
 
 
@@ -560,7 +564,7 @@ public class ConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
     // assertEquals("creates", 2, counterCreate);
     
     ev = new WaitCriterion() {
@@ -572,7 +576,7 @@ public class ConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
     
     // assertEquals("destroys", 2, counterDestroy);
     // assertTrue("updates", 20000 >= counterUpdate);
@@ -585,7 +589,7 @@ public class ConflationDUnitTest extends DistributedTestCase
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 60 * 1000, 200, true);
   }
 
   public static void waitForMarker()
@@ -816,7 +820,7 @@ public class ConflationDUnitTest extends DistributedTestCase
         HARegionQueue haRegionQueue = HAHelper.getRegionQueue(region);
         statMap.put("eventsConflated", new Long(HAHelper.getRegionQueueStats(
             haRegionQueue).getEventsConflated()));
-        getLogWriter().info("new Stats Map  : " + statMap.toString());
+        LogWriterSupport.getLogWriter().info("new Stats Map  : " + statMap.toString());
 
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index ae73ed4..4ef6e2f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -54,8 +54,8 @@ 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.ha.ThreadIdentifier;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
@@ -260,7 +260,7 @@ public class ConnectionProxyJUnitTest
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 90 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 90 * 1000, 200, true);
    }
    finally {
      if (server != null) {
@@ -321,7 +321,7 @@ public class ConnectionProxyJUnitTest
         return null;
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 90 * 1000, 200, true);
+    Wait.waitForCriterion(ev, 90 * 1000, 200, true);
    }
    finally {
      if (server != null) {
@@ -462,7 +462,7 @@ public class ConnectionProxyJUnitTest
          return null;
        }
      };
-     DistributedTestCase.waitForCriterion(ev, 20 * 1000, 200, true);
+     Wait.waitForCriterion(ev, 20 * 1000, 200, true);
    }
    catch (Exception ex) {
      ex.printStackTrace();
@@ -838,7 +838,7 @@ public class ConnectionProxyJUnitTest
         return "ack flag never became " + expectedAckSend;
       }
     };
-    DistributedTestCase.waitForCriterion(wc, timeToWait, 1000, true);
+    Wait.waitForCriterion(wc, timeToWait, 1000, true);
   }  
   
   private void verifyExpiry(long timeToWait)
@@ -851,7 +851,7 @@ public class ConnectionProxyJUnitTest
         return "Entry never expired";
       }
     };
-    DistributedTestCase.waitForCriterion(wc, timeToWait * 2, 200, true);
+    Wait.waitForCriterion(wc, timeToWait * 2, 200, true);
   }
  
 }


Mime
View raw message