You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/02/05 01:16:22 UTC
[16/33] incubator-geode git commit: Cleanup
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
index d530a3b..94ffa6f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
@@ -37,7 +37,7 @@ 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.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -108,7 +108,7 @@ public class Bug36269DUnitTest extends DistributedTestCase
{
try {
createClientCache();
- acquireConnectionsAndDestroyRegion(NetworkSupport.getServerHostName(Host.getHost(0)));
+ acquireConnectionsAndDestroyRegion(NetworkUtils.getServerHostName(Host.getHost(0)));
server1.invoke(Bug36269DUnitTest.class, "verifyRegionDestroy");
server2.invoke(Bug36269DUnitTest.class, "verifyRegionDestroy");
Wait.pause(5000);
@@ -141,7 +141,7 @@ public class Bug36269DUnitTest extends DistributedTestCase
new Bug36269DUnitTest("temp").createCache(props);
CacheServerTestUtil.disableShufflingOfEndpoints();
PoolImpl p;
- String host = NetworkSupport.getServerHostName(Host.getHost(0));
+ String host = NetworkUtils.getServerHostName(Host.getHost(0));
try {
p = (PoolImpl)PoolManager.createFactory()
.addServer(host, PORT1)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 519975e..22a4eae 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,8 +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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
/**
@@ -165,9 +165,9 @@ public class Bug36457DUnitTest extends DistributedTestCase
Integer port2 = ((Integer)server2.invoke(Bug36457DUnitTest.class,
"createServerCache"));
client1.invoke(Bug36457DUnitTest.class, "createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
client2.invoke(Bug36457DUnitTest.class, "createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ NetworkUtils.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");
@@ -191,7 +191,7 @@ public class Bug36457DUnitTest extends DistributedTestCase
.setInstance(new ClientServerObserverAdapter() {
public void afterPrimaryIdentificationFromBackup(ServerLocation primaryEndpoint)
{
- LogWriterSupport.getLogWriter().fine("TEST FAILED HERE YOGI ");
+ LogWriterUtils.getLogWriter().fine("TEST FAILED HERE YOGI ");
isFaileoverHappened = true;
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 bc61ccc..236c8fa 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,7 @@ 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.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -159,9 +159,9 @@ public class Bug36805DUnitTest extends DistributedTestCase
Integer port2 = ((Integer)server2.invoke(Bug36805DUnitTest.class,
"createServerCache"));
client1.invoke(Bug36805DUnitTest.class, "createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
client2.invoke(Bug36805DUnitTest.class, "createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ NetworkUtils.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.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 b50942c..96bca47 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,7 +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.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
public class Bug36829DUnitTest extends DistributedTestCase {
@@ -68,7 +68,7 @@ public class Bug36829DUnitTest extends DistributedTestCase {
this.ClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
new Object[] {
- getClientPool(NetworkSupport.getServerHostName(ClientVM.getHost()), PORT, true, 0),
+ getClientPool(NetworkUtils.getServerHostName(ClientVM.getHost()), PORT, true, 0),
regionName,
getClientDistributedSystemProperties(durableClientId,
durableClientTimeout), Boolean.TRUE });
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 7b4b626..d9ed901 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,7 @@ 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.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -168,7 +168,7 @@ public class Bug36995DUnitTest extends DistributedTestCase
Integer port3 = ((Integer)server3.invoke(Bug36995DUnitTest.class,
"createServerCache"));
createClientCacheWithDefaultMessageTrackingTimeout(
- NetworkSupport.getServerHostName(server1.getHost()), port1.intValue(), port2
+ NetworkUtils.getServerHostName(server1.getHost()), port1.intValue(), port2
.intValue(), port3.intValue());
assertEquals(PoolFactory.DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT,
pool.getSubscriptionMessageTrackingTimeout());
@@ -187,7 +187,7 @@ public class Bug36995DUnitTest extends DistributedTestCase
"createServerCache"));
Integer port3 = ((Integer)server3.invoke(Bug36995DUnitTest.class,
"createServerCache"));
- createClientCache(NetworkSupport.getServerHostName(server1.getHost()),
+ createClientCache(NetworkUtils.getServerHostName(server1.getHost()),
port1.intValue(), port2.intValue(), port3.intValue());
assertEquals(54321, pool.getSubscriptionMessageTrackingTimeout());
}
@@ -203,7 +203,7 @@ public class Bug36995DUnitTest extends DistributedTestCase
"createServerCache"));
Integer port3 = ((Integer)server3.invoke(Bug36995DUnitTest.class,
"createServerCache"));
- createClientCache(NetworkSupport.getServerHostName(server1.getHost()),
+ createClientCache(NetworkUtils.getServerHostName(server1.getHost()),
port1.intValue(), port2.intValue(), port3.intValue());
verifyDeadAndLiveServers(0, 3);
server2.invoke(Bug36995DUnitTest.class, "stopServer");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 fb9aa10..eddbda5 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,8 +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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.cache.client.*;
@@ -147,11 +147,11 @@ public class Bug37210DUnitTest extends DistributedTestCase
*/
public void testHAStatsCleanup() throws Exception
{
- LogWriterSupport.getLogWriter().info("testHAStatsCleanup : BEGIN");
+ LogWriterUtils.getLogWriter().info("testHAStatsCleanup : BEGIN");
IgnoredException.addIgnoredException("java.net.SocketException");
IgnoredException.addIgnoredException("Unexpected IOException");
client.invoke(Bug37210DUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT) });
+ new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) });
server.invoke(Bug37210DUnitTest.class, "doEntryOperations");
server.invoke(Bug37210DUnitTest.class,
@@ -161,7 +161,7 @@ public class Bug37210DUnitTest extends DistributedTestCase
Thread.currentThread().sleep(1000);
server.invoke(Bug37210DUnitTest.class,
"closeCacheClientProxyAndVerifyStats2");
- LogWriterSupport.getLogWriter().info("testHAStatsCleanup : END");
+ LogWriterUtils.getLogWriter().info("testHAStatsCleanup : END");
}
/**
@@ -190,7 +190,7 @@ public class Bug37210DUnitTest extends DistributedTestCase
server.setSocketBufferSize(32768);
server.setMaximumTimeBetweenPings(1000000);
server.start();
- LogWriterSupport.getLogWriter().info("Server started at PORT = " + port);
+ LogWriterUtils.getLogWriter().info("Server started at PORT = " + port);
return new Integer(server.getPort());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 68b5166..b135e61 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,7 +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.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
/**
@@ -85,7 +85,7 @@ public class Bug37805DUnitTest extends DistributedTestCase{
this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
new Object[] {
- getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
+ getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
regionName,
getDurableClientDistributedSystemProperties(durableClientId,
durableClientTimeout), Boolean.TRUE });
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 78050cc..4a3cf5f 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,9 +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.DistributedTestUtils;
import com.gemstone.gemfire.test.dunit.IgnoredException;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
/**
*
* @author Yogesh Mahajan
@@ -226,7 +226,7 @@ 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", LogWriterSupport.getDUnitLogLevel());
+ ccf.set("log-level", LogWriterUtils.getDUnitLogLevel());
cache = (Cache)ccf.create();
expected = IgnoredException.addIgnoredException("java.net.ConnectionException||java.net.SocketException");
pool = (PoolImpl)PoolManager.find(poolName);
@@ -258,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["+DistributedTestSupport.getDUnitLocatorPort()+"]");
+ ccf.set("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]");
ccf.set("log-file", "abs_server_system.log");
- ccf.set("log-level", LogWriterSupport.getDUnitLogLevel());
+ ccf.set("log-level", LogWriterUtils.getDUnitLogLevel());
}
catch (URISyntaxException e) {
throw new ExceptionInInitializerError(e);
@@ -275,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["+DistributedTestSupport.getDUnitLocatorPort()+"]");
+ ccf.set("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]");
}
catch (URISyntaxException e) {
throw new ExceptionInInitializerError(e);
@@ -330,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["+DistributedTestSupport.getDUnitLocatorPort()+"]");
+ props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]");
new CacheServerTestUtil("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -352,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["+DistributedTestSupport.getDUnitLocatorPort()+"]");
+ props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]");
new CacheServerTestUtil("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -373,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["+DistributedTestSupport.getDUnitLocatorPort()+"]");
+ props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]");
new CacheServerTestUtil("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 182c8df..18811ee 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,8 +39,8 @@ 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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -116,9 +116,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
{
Integer port1 = initServerCache(server1);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
Wait.pause(PAUSE);
server1.invoke(resetFlags());
@@ -153,9 +153,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
Wait.pause(PAUSE);
server1.invoke(resetFlags());
@@ -191,9 +191,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 });
Wait.pause(PAUSE);
server1.invoke(resetFlags());
@@ -227,9 +227,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
{
Integer port1 = initServerCache(server1);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
Wait.pause(PAUSE);
server1.invoke(resetFlags());
@@ -256,9 +256,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
Wait.pause(PAUSE);
server1.invoke(resetFlags());
@@ -288,9 +288,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 });
Wait.pause(PAUSE);
server1.invoke(resetFlags());
@@ -320,9 +320,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
{
Integer port1 = initServerCache(server1);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
Wait.pause(PAUSE);
server1.invoke(resetFlags());
@@ -349,9 +349,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
Wait.pause(PAUSE);
server1.invoke(resetFlags());
@@ -381,9 +381,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 });
Wait.pause(PAUSE);
server1.invoke(resetFlags());
@@ -414,9 +414,9 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port2 = ((Integer)server2.invoke(
CacheServerTransactionsDUnitTest.class, "createServerCache"));
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 });
client1.invoke(CacheServerTransactionsDUnitTest.class, "commitTransactionOnClient");
Wait.pause(PAUSE);
@@ -460,7 +460,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
assertNotNull(r1);
try {
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"vlaue for the key k1" + r1.getEntry(k1).getValue());
WaitCriterion ev = new WaitCriterion() {
public boolean done() {
@@ -570,7 +570,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
assertNotNull(r1);
try {
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"vlaue for the key k1" + r1.getEntry(k1).getValue());
// wait until
// condition is
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 3441259..626d9e2 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,8 +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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -106,9 +106,9 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
"createServerCache")).intValue();
client1.invoke(ClearPropagationDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
client2.invoke(ClearPropagationDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
CacheObserverHolder.setInstance(new CacheObserverAdapter());
@@ -163,7 +163,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
client1.invoke(ClearPropagationDUnitTest.class,
"acquireConnectionsAndClear",
- new Object[] { NetworkSupport.getServerHostName(client1.getHost())});
+ new Object[] { NetworkUtils.getServerHostName(client1.getHost())});
client1.invoke(checkSizeRegion(2, false/*Do not Block*/));
client2.invoke(checkSizeRegion(0, true /* block*/));
@@ -214,7 +214,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
client1.invoke(ClearPropagationDUnitTest.class,
"acquireConnectionsAndDestroyRegion",
- new Object[] { NetworkSupport.getServerHostName(client1.getHost())});
+ new Object[] { NetworkUtils.getServerHostName(client1.getHost())});
client1.invoke(checkSizeRegion(2, false/*Do not Block*/));
client2.invoke(checkDestroyRegion(true /* block*/));
@@ -266,7 +266,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
{
Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME);
assertNotNull(region);
- LogWriterSupport.getLogWriter().info("Size of the region " + region.size());
+ LogWriterUtils.getLogWriter().info("Size of the region " + region.size());
if (toBlock) {
synchronized (ClearPropagationDUnitTest.class) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 479d0c6..2cf340e 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,8 +42,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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -133,8 +133,8 @@ public class ClientConflationDUnitTest extends DistributedTestCase
}
private void performSteps(String conflation) throws Exception {
- createClientCacheFeeder(NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT));
- vm1.invoke(ClientConflationDUnitTest.class, "createClientCache", new Object[] { NetworkSupport.getServerHostName(vm1.getHost()), new Integer(PORT),
+ createClientCacheFeeder(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
+ vm1.invoke(ClientConflationDUnitTest.class, "createClientCache", new Object[] { NetworkUtils.getServerHostName(vm1.getHost()), new Integer(PORT),
conflation});
vm1.invoke(ClientConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm1.invoke(ClientConflationDUnitTest.class, "setAllCountersZero");
@@ -505,7 +505,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
public static void putEntries()
{
try {
- LogWriterSupport.getLogWriter().info("Putting entries...");
+ LogWriterUtils.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/c05f6798/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 146ee3b..404d47f 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,8 +42,8 @@ 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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -186,14 +186,14 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
// Create a feeder.
vm0.invoke(ClientInterestNotifyDUnitTest.class, "createClientCacheFeeder",
- new Object[] {NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)});
+ new Object[] {NetworkUtils.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[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn"});
+ new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn"});
/*
vm2.invoke(ClientInterestNotifyDUnitTest.class, "createClientCache",
new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT),
@@ -572,7 +572,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
public static void doEntryOps()
{
try {
- LogWriterSupport.getLogWriter().info("Putting entries...");
+ LogWriterUtils.getLogWriter().info("Putting entries...");
Cache cacheClient = GemFireCacheImpl.getInstance();
Region r1 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME1);
Region r2 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME2);
@@ -602,7 +602,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
public static void doFeed()
{
try {
- LogWriterSupport.getLogWriter().info("Putting entries...");
+ LogWriterUtils.getLogWriter().info("Putting entries...");
Cache cacheClient = GemFireCacheImpl.getInstance();
Region r1 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME1);
Region r2 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME2);
@@ -623,7 +623,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
public static void getEntries()
{
try {
- LogWriterSupport.getLogWriter().info("Getting entries...");
+ LogWriterUtils.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/c05f6798/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 c0300f2..0f40428 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
@@ -44,8 +44,8 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.dunit.Assert;
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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -147,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 = NetworkSupport.getServerHostName(Host.getHost(0));
+ String serverName = NetworkUtils.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});
- LogWriterSupport.getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
+ LogWriterUtils.getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
// TODO add verification in vm3
- LogWriterSupport.getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
+ LogWriterUtils.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
}
@@ -161,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 = NetworkSupport.getServerHostName(Host.getHost(0));
+ String serverName = NetworkUtils.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});
- LogWriterSupport.getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
+ LogWriterUtils.getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
// TODO add verification in vm3
- LogWriterSupport.getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
+ LogWriterUtils.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
}
@@ -379,7 +379,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(true);
- createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1);
+ createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1);
populateCache();
registerInterest();
server1.invoke(ClientServerMiscDUnitTest.class, "put");
@@ -412,7 +412,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(true);
- createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1);
+ createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1);
populateCache();
registerInterestInBothTheRegions();
closeRegion1();
@@ -435,7 +435,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(true);
- pool = (PoolImpl)createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)),PORT1);
+ pool = (PoolImpl)createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)),PORT1);
populateCache();
registerInterestInBothTheRegions();
closeBothRegions();
@@ -462,7 +462,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
public void testCCPDestroyOnLastDestroyRegion() throws Exception
{
PORT1 = initServerCache(true);
- PoolImpl pool = (PoolImpl)createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)),PORT1);
+ PoolImpl pool = (PoolImpl)createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)),PORT1);
destroyRegion1();
// pause(5000);
server1.invoke(ClientServerMiscDUnitTest.class,
@@ -499,7 +499,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(false);
- createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1);
+ createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1);
registerInterestForInvalidatesInBothTheRegions();
populateCache();
server1.invoke(ClientServerMiscDUnitTest.class, "put");
@@ -520,7 +520,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(false);
- createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1);
+ createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1);
registerInterestForInvalidatesInBothTheRegions();
Region region = static_cache.getRegion(REGION_NAME1);
populateCache();
@@ -566,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 = NetworkSupport.getServerHostName(server1.getHost());
+ String host = NetworkUtils.getServerHostName(server1.getHost());
PoolImpl p = (PoolImpl)PoolManager.createFactory()
.addServer(host, PORT1)
.setSubscriptionEnabled(true)
@@ -669,7 +669,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
ds.disconnect();
ds = getSystem(props);
PORT1 = initServerCache(true);
- String host = NetworkSupport.getServerHostName(server1.getHost());
+ String host = NetworkUtils.getServerHostName(server1.getHost());
Pool p = PoolManager.createFactory()
.addServer(host, PORT1)
.setSubscriptionEnabled(true)
@@ -720,7 +720,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
assertNotNull(ds);
PORT1 = initServerCache(true);
- String host = NetworkSupport.getServerHostName(server1.getHost());
+ String host = NetworkUtils.getServerHostName(server1.getHost());
Pool p = PoolManager.createFactory()
.addServer(host, PORT1)
.setSubscriptionEnabled(true)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/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 b6a64a3..26411b4 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,8 +43,8 @@ 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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -141,9 +141,9 @@ public class ConflationDUnitTest extends DistributedTestCase
{
try {
vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart");
- createClientCache1UniqueWriter ( NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT));
+ createClientCache1UniqueWriter ( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
vm2.invoke(ConflationDUnitTest.class, "createClientCache2UniqueWriter",
- new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)});
+ new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)});
vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
@@ -172,9 +172,9 @@ public class ConflationDUnitTest extends DistributedTestCase
{
try {
vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart");
- createClientCache1CommonWriter( NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT));
+ createClientCache1CommonWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
vm2.invoke(ConflationDUnitTest.class, "createClientCache2CommonWriter",
- new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)});
+ new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)});
vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
@@ -204,10 +204,10 @@ public class ConflationDUnitTest extends DistributedTestCase
{
try {
vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart");
- createClientCache1CommonWriterTest3(NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT));
+ createClientCache1CommonWriterTest3(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
vm2.invoke(ConflationDUnitTest.class,
"createClientCache2CommonWriterTest3", new Object[] {
- NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT) });
+ NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) });
vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
@@ -306,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) {
- LogWriterSupport.getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
String val = (String) event.getNewValue();
synchronized (ConflationDUnitTest.class) {
if (val.equals(MARKER)) {
@@ -322,7 +322,7 @@ public class ConflationDUnitTest extends DistributedTestCase
}
public void afterUpdate(EntryEvent event) {
- LogWriterSupport.getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (this) {
counterUpdate++;
}
@@ -330,7 +330,7 @@ public class ConflationDUnitTest extends DistributedTestCase
public void afterDestroy(EntryEvent event)
{
- LogWriterSupport.getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (this) {
if(!event.getKey().equals(MARKER)) {
counterDestroy++;
@@ -353,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) {
- LogWriterSupport.getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
String val = (String)event.getNewValue();
synchronized (ConflationDUnitTest.class) {
if (val.equals(MARKER)) {
@@ -369,14 +369,14 @@ public class ConflationDUnitTest extends DistributedTestCase
}
public void afterUpdate(EntryEvent event) {
- LogWriterSupport.getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (this) {
counterUpdate++;
}
}
public void afterDestroy(EntryEvent event) {
- LogWriterSupport.getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (this) {
if (!event.getKey().equals(MARKER)) {
counterDestroy++;
@@ -426,7 +426,7 @@ public class ConflationDUnitTest extends DistributedTestCase
public void afterCreate(EntryEvent event)
{
String val = (String) event.getNewValue();
- LogWriterSupport.getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (ConflationDUnitTest.class) {
if (val.equals(MARKER)) {
count++;
@@ -820,7 +820,7 @@ public class ConflationDUnitTest extends DistributedTestCase
HARegionQueue haRegionQueue = HAHelper.getRegionQueue(region);
statMap.put("eventsConflated", new Long(HAHelper.getRegionQueueStats(
haRegionQueue).getEventsConflated()));
- LogWriterSupport.getLogWriter().info("new Stats Map : " + statMap.toString());
+ LogWriterUtils.getLogWriter().info("new Stats Map : " + statMap.toString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
index 51d7c9b..27359a6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
@@ -49,9 +49,9 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl;
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.DistributedTestSupport;
+import com.gemstone.gemfire.test.dunit.DistributedTestUtils;
import com.gemstone.gemfire.test.dunit.IgnoredException;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.StoppableWaitCriterion;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
@@ -174,7 +174,8 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
}
finally {
- DistributedTestSupport.unregisterAllDataSerializersFromAllVms();
+ DataSerializerPropogationDUnitTest.successfullyLoadedTestDataSerializer = false;
+ DistributedTestUtils.unregisterAllDataSerializersFromAllVms();
}
}
@@ -415,7 +416,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
// wait for client2 to come online
Wait.pause(3000);
@@ -473,10 +474,10 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
// wait for client2 to come online
Wait.pause(2000);
@@ -505,10 +506,10 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
// wait for client2 to come online
Wait.pause(2000);
@@ -537,10 +538,10 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
// wait for client2 to come online
Wait.pause(2000);
@@ -594,10 +595,10 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
// wait for client2 to come online
Wait.pause(2000);
@@ -627,10 +628,10 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
PORT2 = initServerCache(server2);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
client1.invoke(DataSerializerPropogationDUnitTest.class,
"registerDSObject7");
@@ -697,11 +698,11 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) });
- createClientCache(NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT2));
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ createClientCache(NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2));
// wait for client2 to come online
Wait.pause(2000);
@@ -735,12 +736,12 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
PORT1 = initServerCache(server1, 1);
PORT2 = initServerCache(server2, 2);
- createClientCache(NetworkSupport.getServerHostName(server1.getHost()),
+ createClientCache(NetworkUtils.getServerHostName(server1.getHost()),
new Integer(PORT1));
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
setClientServerObserver1();
client2
.invoke(DataSerializerPropogationDUnitTest.class, "setClientServerObserver2");
@@ -763,10 +764,10 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) });
// wait for client2 to come online
Wait.pause(2000);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index fbe87c8..dfe2fe3 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -41,8 +41,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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -105,9 +105,9 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
PORT2 = ((Integer)vm1.invoke(DestroyEntryPropagationDUnitTest.class, "createServerCache" )).intValue();
vm2.invoke(DestroyEntryPropagationDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)});
+ new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)});
vm3.invoke(DestroyEntryPropagationDUnitTest.class, "createClientCache",
- new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)});
+ new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)});
}
@@ -301,10 +301,10 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
{
try {
Iterator iter = cache.getCacheServers().iterator();
- LogWriterSupport.getLogWriter().fine ("Asif: servers running = "+cache.getCacheServers().size());
+ LogWriterUtils.getLogWriter().fine ("Asif: servers running = "+cache.getCacheServers().size());
if (iter.hasNext()) {
CacheServer server = (CacheServer)iter.next();
- LogWriterSupport.getLogWriter().fine("asif : server running on port="+server.getPort()+ " asked to kill serevre onport="+port);
+ LogWriterUtils.getLogWriter().fine("asif : server running on port="+server.getPort()+ " asked to kill serevre onport="+port);
if(port.intValue() == server.getPort()){
server.stop();
}
@@ -452,7 +452,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setPoolName(p.getName());
- factory.setCacheListener(new CertifiableTestCacheListener(LogWriterSupport.getLogWriter()));
+ factory.setCacheListener(new CertifiableTestCacheListener(LogWriterUtils.getLogWriter()));
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
@@ -464,7 +464,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setDataPolicy(DataPolicy.REPLICATE);
- factory.setCacheListener(new CertifiableTestCacheListener(LogWriterSupport.getLogWriter()));
+ factory.setCacheListener(new CertifiableTestCacheListener(LogWriterUtils.getLogWriter()));
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
index 94fe536..fb8fb3e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -51,7 +51,7 @@ public class DurableClientBug39997DUnitTest extends CacheTestCase {
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
- final String hostName = NetworkSupport.getServerHostName(host);
+ final String hostName = NetworkUtils.getServerHostName(host);
final int port = AvailablePortHelper.getRandomAvailableTCPPort();
vm0.invoke(new SerializableRunnable("create cache") {
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index 75beaa4..b00c536 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestSupport;
+import com.gemstone.gemfire.test.dunit.DistributedTestUtils;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.VM;
@@ -277,7 +277,7 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase {
public static Integer createCacheServer(Integer serverPort)
throws Exception {
Properties props = new Properties();
- props.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]");
+ props.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]");
// props.setProperty("log-level", "fine");
// props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
// props.setProperty("statistic-archive-file", "server_" + OSProcess.getId()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
index 664d5ca..f9e7d87 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
@@ -19,9 +19,9 @@ package com.gemstone.gemfire.internal.cache.tier.sockets;
import com.gemstone.gemfire.cache.client.PoolFactory;
import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestSupport;
+import com.gemstone.gemfire.test.dunit.DistributedTestUtils;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
/**
* @author dsmith
@@ -52,7 +52,7 @@ public class DurableClientReconnectAutoDUnitTest extends
protected PoolFactory getPoolFactory() {
Host host = Host.getHost(0);
PoolFactory factory = PoolManager.createFactory()
- .addLocator(NetworkSupport.getServerHostName(host), DistributedTestSupport.getDUnitLocatorPort());
+ .addLocator(NetworkUtils.getServerHostName(host), DistributedTestUtils.getDUnitLocatorPort());
return factory;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index 45c74d2..f642733 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -46,8 +46,8 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.IgnoredException;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -110,10 +110,10 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
PORT2 = ((Integer) server2.invoke(DurableClientReconnectDUnitTest.class, "createServerCache"));
PORT3 = ((Integer) server3.invoke(DurableClientReconnectDUnitTest.class, "createServerCache"));
PORT4 = ((Integer) server4.invoke(DurableClientReconnectDUnitTest.class, "createServerCache"));
- SERVER1 = NetworkSupport.getServerHostName(host)+PORT1;
- SERVER2 = NetworkSupport.getServerHostName(host)+PORT2;
- SERVER3 = NetworkSupport.getServerHostName(host)+PORT3;
- SERVER4 = NetworkSupport.getServerHostName(host)+PORT4;
+ SERVER1 = NetworkUtils.getServerHostName(host)+PORT1;
+ SERVER2 = NetworkUtils.getServerHostName(host)+PORT2;
+ SERVER3 = NetworkUtils.getServerHostName(host)+PORT3;
+ SERVER4 = NetworkUtils.getServerHostName(host)+PORT4;
//CacheServerTestUtil.disableShufflingOfEndpoints();
System.setProperty("gemfire.bridge.disableShufflingOfEndpoints", "false");
@@ -121,7 +121,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
}
public void testDurableReconnectSingleServer() throws Exception
{
- createCacheClientAndConnectToSingleServer(NetworkSupport.getServerHostName(Host.getHost(0)), 0);
+ createCacheClientAndConnectToSingleServer(NetworkUtils.getServerHostName(Host.getHost(0)), 0);
List redundantServers = pool.getRedundantNames();
String primaryName = pool.getPrimaryName();
assertTrue(redundantServers.isEmpty());
@@ -131,7 +131,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
//temporary fix for bug 38345.
Wait.pause(2000);
- createCacheClientAndConnectToSingleServer(NetworkSupport.getServerHostName(Host.getHost(0)), 0);
+ createCacheClientAndConnectToSingleServer(NetworkUtils.getServerHostName(Host.getHost(0)), 0);
List redundantServers2 = pool.getRedundantNames();
String primaryName2 = pool.getPrimaryName();
assertTrue(redundantServers2.isEmpty());
@@ -139,13 +139,13 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
}
public void testDurableReconnectSingleServerWithZeroConnPerServer() throws Exception
{
- createCacheClientAndConnectToSingleServerWithZeroConnPerServer(NetworkSupport.getServerHostName(Host.getHost(0)), 0);
+ createCacheClientAndConnectToSingleServerWithZeroConnPerServer(NetworkUtils.getServerHostName(Host.getHost(0)), 0);
List redundantServers = pool.getRedundantNames();
String primaryName = pool.getPrimaryName();
assertTrue(redundantServers.isEmpty());
closeCache(true);
- createCacheClientAndConnectToSingleServerWithZeroConnPerServer(NetworkSupport.getServerHostName(Host.getHost(0)), 0);
+ createCacheClientAndConnectToSingleServerWithZeroConnPerServer(NetworkUtils.getServerHostName(Host.getHost(0)), 0);
List redundantServers2 = pool.getRedundantNames();
String primaryName2 = pool.getPrimaryName();
assertTrue(redundantServers2.isEmpty());
@@ -382,51 +382,51 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
instance.determineAndVerfiyRedundantServers(redundantServers);
instance.determineAndVerfiyNonRedundantServers(redundantServers);
- LogWriterSupport.getLogWriter().info("TEST - Durable client initialially has servers " + redundantServers);
+ LogWriterUtils.getLogWriter().info("TEST - Durable client initialially has servers " + redundantServers);
- LogWriterSupport.getLogWriter().info("TEST - Closing durable client for the first time");
+ LogWriterUtils.getLogWriter().info("TEST - Closing durable client for the first time");
// Stop the durable client
closeCache(true);
- LogWriterSupport.getLogWriter().info("TEST - Durable client closed for the first time");
+ LogWriterUtils.getLogWriter().info("TEST - Durable client closed for the first time");
//Wait for server to cleanup client resources
//temporary fix for bug 38345.
Wait.pause(2000);
- LogWriterSupport.getLogWriter().info("TEST - Creating the durable client with one fewer servers");
+ LogWriterUtils.getLogWriter().info("TEST - Creating the durable client with one fewer servers");
//We recreate the durable client, but this
//Time we won't have it create any queues
createCacheClient(2, 20, false);
HashSet redundantServers2 = new HashSet(pool.getRedundantNames());
redundantServers2.add(pool.getPrimaryName());
- LogWriterSupport.getLogWriter().info("TEST - Durable client created again, now with servers " + redundantServers2);
+ LogWriterUtils.getLogWriter().info("TEST - Durable client created again, now with servers " + redundantServers2);
Host host = Host.getHost(0);
//Make sure we create client to server connections to all of the servers
- pool.acquireConnection(new ServerLocation(NetworkSupport.getServerHostName(host), PORT1.intValue()));
- pool.acquireConnection(new ServerLocation(NetworkSupport.getServerHostName(host), PORT2.intValue()));
- pool.acquireConnection(new ServerLocation(NetworkSupport.getServerHostName(host), PORT3.intValue()));
- pool.acquireConnection(new ServerLocation(NetworkSupport.getServerHostName(host), PORT4.intValue()));
+ pool.acquireConnection(new ServerLocation(NetworkUtils.getServerHostName(host), PORT1.intValue()));
+ pool.acquireConnection(new ServerLocation(NetworkUtils.getServerHostName(host), PORT2.intValue()));
+ pool.acquireConnection(new ServerLocation(NetworkUtils.getServerHostName(host), PORT3.intValue()));
+ pool.acquireConnection(new ServerLocation(NetworkUtils.getServerHostName(host), PORT4.intValue()));
- LogWriterSupport.getLogWriter().info("TEST - All pool connections are now aquired");
+ LogWriterUtils.getLogWriter().info("TEST - All pool connections are now aquired");
closeCache(true);
- LogWriterSupport.getLogWriter().info("TEST - closed durable client for the second time");
+ LogWriterUtils.getLogWriter().info("TEST - closed durable client for the second time");
//Wait for server to cleanup client resources
//temporary fix for bug 38345.
Wait.pause(2000);
- LogWriterSupport.getLogWriter().info("TEST - creating durable client for the third time");
+ LogWriterUtils.getLogWriter().info("TEST - creating durable client for the third time");
//Now we should connect to all of the servers we were originally connected to
createCacheClient(2, 20);
HashSet redundantServersAfterReconnect = new HashSet(pool.getRedundantNames());
redundantServersAfterReconnect.add(pool.getPrimaryName());
- LogWriterSupport.getLogWriter().info("TEST - durable client created for the third time, now with servers " + redundantServersAfterReconnect);
+ LogWriterUtils.getLogWriter().info("TEST - durable client created for the third time, now with servers " + redundantServersAfterReconnect);
instance.determineAndVerfiyRedundantServers(redundantServersAfterReconnect);
instance.determineAndVerfiyNonRedundantServers(redundantServersAfterReconnect);
@@ -436,7 +436,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
//Now we wait to make sure the durable client expiration task isn't fired.
Wait.pause(25000);
- LogWriterSupport.getLogWriter().info("TEST - Finished waiting for durable client expiration task");
+ LogWriterUtils.getLogWriter().info("TEST - Finished waiting for durable client expiration task");
redundantServersAfterReconnect = new HashSet(pool.getRedundantNames());
redundantServersAfterReconnect.add(pool.getPrimaryName());
@@ -603,10 +603,10 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
protected PoolFactory getPoolFactory() {
Host host = Host.getHost(0);
PoolFactory factory = PoolManager.createFactory()
- .addServer(NetworkSupport.getServerHostName(host), PORT1.intValue())
- .addServer(NetworkSupport.getServerHostName(host), PORT2.intValue())
- .addServer(NetworkSupport.getServerHostName(host), PORT3.intValue())
- .addServer(NetworkSupport.getServerHostName(host), PORT4.intValue());
+ .addServer(NetworkUtils.getServerHostName(host), PORT1.intValue())
+ .addServer(NetworkUtils.getServerHostName(host), PORT2.intValue())
+ .addServer(NetworkUtils.getServerHostName(host), PORT3.intValue())
+ .addServer(NetworkUtils.getServerHostName(host), PORT4.intValue());
return factory;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
index 9eb0dcd..d491513 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
@@ -33,7 +33,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.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -181,7 +181,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase {
this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
new Object[] {
- getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
+ getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
regionName,
getDurableClientDistributedSystemProperties(durableClientId,
durableClientTimeout), Boolean.TRUE });
@@ -206,7 +206,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase {
this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
new Object[] {
- getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
+ getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
regionName,
getNonDurableClientDistributedSystemProperties(durableClientId,
durableClientTimeout), Boolean.TRUE });
@@ -231,7 +231,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase {
this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
new Object[] {
- getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
+ getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
regionName,
getDurableClientDistributedSystemProperties(durableClientId,
durableClientTimeout), Boolean.TRUE });
@@ -255,7 +255,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase {
this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
new Object[] {
- getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
+ getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0),
regionName,
getNonDurableClientDistributedSystemProperties(durableClientId,
durableClientTimeout), Boolean.TRUE });