http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java index de0f44a..132ab16 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java @@ -42,8 +42,8 @@ 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.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; @@ -129,7 +129,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { // seconds this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE }); @@ -202,7 +202,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { // Step 8: Re-start the Client this.durableClientVM .invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), + new Object[] { getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE }); @@ -281,7 +281,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { final int durableClientTimeout = 600; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout) }); @@ -354,7 +354,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { // Step 8: Re-start the Client this.durableClientVM .invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), + new Object[] { getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE }); @@ -472,7 +472,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { final int durableClientTimeout = 600; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout) }); @@ -507,7 +507,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { server2VM.invoke(new CacheSerializableRunnable("Verify Interests.") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Verifying interests registered by DurableClient. ###"); + LogWriterUtils.getLogWriter().info("### Verifying interests registered by DurableClient. ###"); CacheClientNotifier ccn = CacheClientNotifier.getInstance(); CacheClientProxy p = null; @@ -572,7 +572,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { final int durableClientTimeout = 600; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout) }); @@ -604,7 +604,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { //Re-start the Client this.durableClientVM .invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), + new Object[] { getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE }); @@ -628,7 +628,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { server2VM.invoke(new CacheSerializableRunnable("Verify Interests.") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Verifying interests registered by DurableClient. ###"); + LogWriterUtils.getLogWriter().info("### Verifying interests registered by DurableClient. ###"); CacheClientNotifier ccn = CacheClientNotifier.getInstance(); CacheClientProxy p = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java index 8edd412..4ee36bd 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java @@ -28,7 +28,7 @@ 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.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; @@ -71,7 +71,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase // start servers first PORT1 = ((Integer)server1.invoke(DurableResponseMatrixDUnitTest.class, "createServerCache")); - createCacheClient(NetworkSupport.getServerHostName(server1.getHost())); + createCacheClient(NetworkUtils.getServerHostName(server1.getHost())); //Disconnecting the client can cause this IgnoredException.addIgnoredException("Connection reset||Unexpected IOException"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java index 3c4efd8..61c6c78 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java @@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.cache.RegionEventImpl; 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; /** @@ -99,7 +99,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase //vm2.invoke(EventIDVerificationDUnitTest.class, "createClientCache", new // Object[] { new Integer(PORT1),new Integer(PORT2)}); - createClientCache(NetworkSupport.getServerHostName(host), new Integer(PORT1), new Integer(PORT2)); + createClientCache(NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2)); CacheObserverHolder.setInstance(new CacheObserverAdapter()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java index e13644f..9313ddd 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java @@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.Token; 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; @@ -345,7 +345,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase { Cache cache = getCache(); PoolFactory pf = PoolManager.createFactory(); - pf.addServer(NetworkSupport.getServerHostName(host), port); + pf.addServer(NetworkUtils.getServerHostName(host), port); pf.setSubscriptionEnabled(true); pf.create(name); RegionFactory rf = new RegionFactory(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java index 6b63b77..65d7a7c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -115,7 +115,7 @@ public class HABug36738DUnitTest extends DistributedTestCase while (itr.hasNext()) { Object key = itr.next(); ClientUpdateMessage value = (ClientUpdateMessage)region.get(key); - LogWriterSupport.getLogWriter().info("key : " + key + "Value " + value.getValue()); + LogWriterUtils.getLogWriter().info("key : " + key + "Value " + value.getValue()); } @@ -163,7 +163,7 @@ public class HABug36738DUnitTest extends DistributedTestCase new EventID(("memberID" + i).getBytes(), i, i)); haRegion.put(new Long(i), clientMessage); - LogWriterSupport.getLogWriter().info("Putting in the message Queue"); + LogWriterUtils.getLogWriter().info("Putting in the message Queue"); } } @@ -192,7 +192,7 @@ public class HABug36738DUnitTest extends DistributedTestCase HARegion region = (HARegion)cache.getRegion(Region.SEPARATOR + HAHelper.getRegionQueueName(HAREGION_NAME)); assertNotNull(region); - LogWriterSupport.getLogWriter().info("Size of the Queue : " + region.size()); + LogWriterUtils.getLogWriter().info("Size of the Queue : " + region.size()); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java index 3616f9b..fc9211d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java @@ -17,7 +17,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets; 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; @SuppressWarnings("serial") @@ -31,7 +31,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase { * Tests whether interest is registered or not on both primary and secondaries */ public void testInterestRegistrationOnBothPrimaryAndSecondary() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -48,7 +48,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase { * verify their responses */ public void testInterestRegistrationResponseOnBothPrimaryAndSecondary() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -62,7 +62,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase { * interest map */ public void testRERegistrationWillNotCreateDuplicateKeysOnServerInterstMaps() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -81,7 +81,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase { * registerInterest */ public void testPrimaryFailureInRegisterInterest() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -102,7 +102,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase { * list */ public void testSecondaryFailureInRegisterInterest() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -124,7 +124,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase { * registration on newly selected primary */ public void testBothPrimaryAndSecondaryFailureInRegisterInterest() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -148,7 +148,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase { * */ public void testProbablePrimaryFailureInRegisterInterest() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -171,7 +171,7 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase { IgnoredException.addIgnoredException("SocketException"); IgnoredException.addIgnoredException("Unexpected IOException"); - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); registerK1AndK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java index b955d38..647069f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java @@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.EntryDestroyedException; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.client.ServerConnectivityException; 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; @@ -37,7 +37,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase { * failover should pick new primary */ public void testPrimaryFailureInUNregisterInterest() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -63,7 +63,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase { * Ep list */ public void testSecondaryFailureInUNRegisterInterest() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -85,7 +85,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase { * detected live server as well */ public void testDSMDetectsServerLiveJustBeforeInterestRegistration() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -111,7 +111,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase { * detected live server as well */ public void testDSMDetectsServerLiveJustAfterInterestRegistration() throws Exception { - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); @@ -147,7 +147,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase { PORT1 = ((Integer) server1.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - createClientPoolCacheConnectionToSingleServer(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCacheConnectionToSingleServer(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); registerK1AndK2(); verifyRefreshedEntriesFromServer(); @@ -225,7 +225,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase { server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - createClientPoolCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); VM backup1 = getBackupVM(); VM backup2 = getBackupVM(backup1); @@ -250,7 +250,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase { public void testBug35945() throws Exception { PORT1 = ((Integer) server1.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - createClientPoolCacheConnectionToSingleServer(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCacheConnectionToSingleServer(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); registerK1AndK2(); verifyRefreshedEntriesFromServer(); @@ -320,7 +320,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase { server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); PORT2 = ((Integer) server2.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - createClientPoolCacheWithSmallRetryInterval(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientPoolCacheWithSmallRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); registerK1AndK2(); verifyRefreshedEntriesFromServer(); VM backup = getBackupVM(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java index 89be314..852a5bd 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java @@ -42,8 +42,7 @@ import com.gemstone.gemfire.internal.cache.tier.InterestType; 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.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -314,7 +313,7 @@ public class HAInterestTestCase extends DistributedTestCase { }; t.start(); try { - Threads.join(t, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(t, 30 * 1000); } catch (Exception ignore) { exceptionOccured = 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/HAStartupAndFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java index b82a085..5cc561c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java @@ -42,7 +42,7 @@ 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.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; @@ -103,7 +103,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase public void testPrimaryFailover() throws Exception { - createClientCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); // primary server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); @@ -151,7 +151,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase public void testExceptionWhileMakingPrimary()throws Exception { - createClientCacheWithIncorrectPrimary(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientCacheWithIncorrectPrimary(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); // failed primary due to incorect host name of the server // new primary @@ -180,7 +180,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase public void testTwoPrimaryFailedOneAfterTheAnother() throws Exception { - createClientCacheWithLargeRetryInterval(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); // primary server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); @@ -207,7 +207,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase */ public void testPrimaryShouldBeNullAndEPListShouldBeEmptyWhenAllServersAreDead() throws Exception { - createClientCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); verifyPrimaryShouldNotBeNullAndEPListShouldNotBeEmpty(); server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); @@ -221,7 +221,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase */ public void testCacheClientUpdatersInitiatesFailoverOnPrimaryFailure() throws Exception { - createClientCacheWithLargeRetryInterval(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); @@ -239,7 +239,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase */ public void testCacheClientUpdaterInitiatesFailoverOnSecondaryFailure() throws Exception { - createClientCacheWithLargeRetryInterval(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); @@ -258,7 +258,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase public void testCacheClientUpdaterInitiatesFailoverOnBothPrimaryAndSecondaryFailure() throws Exception { - createClientCacheWithLargeRetryInterval(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); @@ -276,7 +276,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase public void testCacheClientUpdaterInitiatesFailoverOnBothPrimaryAndSecondaryFailureWithServerMonitors() throws Exception { - createClientCache(this.getName(), NetworkSupport.getServerHostName(server1.getHost())); + createClientCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); @@ -295,7 +295,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase // create a client with large retry interval for server monitors and no client updater thread // so that only cache operation can detect a server failure and should initiate failover createClientCacheWithLargeRetryIntervalAndWithoutCallbackConnection(this.getName() - , NetworkSupport.getServerHostName(server1.getHost())); + , NetworkUtils.getServerHostName(server1.getHost())); server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); put(); verifyDeadAndLiveServers(1,2); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java index 514a724..11482e5 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java @@ -16,7 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.tier.sockets; -import static com.gemstone.gemfire.test.dunit.DistributedTestSupport.*; +import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*; import java.io.DataInput; import java.io.DataOutput; @@ -51,7 +51,7 @@ 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.Invoke; -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; @@ -482,7 +482,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { client1 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); // // wait for client2 to come online @@ -547,11 +547,11 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { client1 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); client2 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) }); unregisterInstantiatorsInAllVMs(); @@ -591,11 +591,11 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { client1 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); client2 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) }); unregisterInstantiatorsInAllVMs(); @@ -646,11 +646,11 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { client1 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); client2 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) }); unregisterInstantiatorsInAllVMs(); @@ -690,11 +690,11 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { PORT2 = initServerCache(server2); client1 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); client2 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) }); unregisterInstantiatorsInAllVMs(); @@ -758,13 +758,13 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { client1 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); client2 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); - createClientCache(NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT2)); + createClientCache(NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2)); unregisterInstantiatorsInAllVMs(); // wait for client2 to come online @@ -817,13 +817,13 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { PORT1 = initServerCache(server1, 1); PORT2 = initServerCache(server2, 2); - createClientCache_EventId(NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1)); + createClientCache_EventId(NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1)); unregisterInstantiatorsInAllVMs(); client2.invoke(InstantiatorPropagationDUnitTest.class, "createClientCache_EventId", new Object[] { - NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT2) }); + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) }); setClientServerObserver1(); client2.invoke(InstantiatorPropagationDUnitTest.class, "setClientServerObserver2"); @@ -850,12 +850,12 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { Wait.pause(3000); - createClientCache(NetworkSupport.getServerHostName(server1.getHost()), + createClientCache(NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1)); client2 .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] {NetworkSupport.getServerHostName(server2.getHost()), + new Object[] {NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2)}); Wait.pause(3000); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java index 189ebd6..252916e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java @@ -51,8 +51,8 @@ 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.Invoke; -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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -167,9 +167,9 @@ public class InterestListDUnitTest extends DistributedTestCase { vm1.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), new Integer(PORT1)}); + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); vm2.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), new Integer(PORT1)}); + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); @@ -232,9 +232,9 @@ public class InterestListDUnitTest extends DistributedTestCase // Initialization vm1.invoke(InterestListDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT1)}); + new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1)}); vm2.invoke(InterestListDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT1)}); + new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1)}); vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); @@ -290,9 +290,9 @@ public class InterestListDUnitTest extends DistributedTestCase { vm1.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), new Integer(PORT1)}); + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); vm2.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), new Integer(PORT1)}); + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); @@ -320,9 +320,9 @@ public class InterestListDUnitTest extends DistributedTestCase Wait.pause(1000); // create clients to connect to that server vm1.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), new Integer(PORT1)}); + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); vm2.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), new Integer(PORT1)}); + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); // register interest vm1.invoke(InterestListDUnitTest.class, "registerKeys"); @@ -358,10 +358,10 @@ public class InterestListDUnitTest extends DistributedTestCase DistributedMember c1 = (DistributedMember)vm1 .invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), PORT1}); + NetworkUtils.getServerHostName(vm0.getHost()), PORT1}); DistributedMember c2 = (DistributedMember)vm2 .invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), PORT1}); + NetworkUtils.getServerHostName(vm0.getHost()), PORT1}); vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); @@ -428,17 +428,17 @@ public class InterestListDUnitTest extends DistributedTestCase // servers are set up, now do the clients DistributedMember c1 = (DistributedMember)vm1 .invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), PORT1, port2}); + NetworkUtils.getServerHostName(vm0.getHost()), PORT1, port2}); DistributedMember c2 = (DistributedMember)vm2 .invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), PORT1, port2}); + NetworkUtils.getServerHostName(vm0.getHost()), PORT1, port2}); vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); // interest registration from clients should cause listeners to be invoked // in both servers - LogWriterSupport.getLogWriter().info("test phase 1"); + LogWriterUtils.getLogWriter().info("test phase 1"); vm1.invoke(InterestListDUnitTest.class, "registerKey", new Object[] { key1 }); vm2.invoke(InterestListDUnitTest.class, "registerKey", @@ -452,7 +452,7 @@ public class InterestListDUnitTest extends DistributedTestCase new Object[]{ two, zero }); // unregistration from clients should invoke listeners on both servers - LogWriterSupport.getLogWriter().info("test phase 2"); + LogWriterUtils.getLogWriter().info("test phase 2"); vm1.invoke(InterestListDUnitTest.class, "unregisterKey", new Object[] { key1 }); vm2.invoke(InterestListDUnitTest.class, "unregisterKey", @@ -463,7 +463,7 @@ public class InterestListDUnitTest extends DistributedTestCase new Object[]{ zero, two }); // now the primary server for eache client will register and unregister - LogWriterSupport.getLogWriter().info("test phase 3"); + LogWriterUtils.getLogWriter().info("test phase 3"); registerKeyForClient(c1, key1); vm0.invoke(InterestListDUnitTest.class, "registerKeyForClient", new Object[] { c1, key1 }); @@ -475,7 +475,7 @@ public class InterestListDUnitTest extends DistributedTestCase vm0.invoke(InterestListDUnitTest.class, "verifyCountsAndClear", new Object[]{ two, zero }); - LogWriterSupport.getLogWriter().info("test phase 4"); + LogWriterUtils.getLogWriter().info("test phase 4"); unregisterKeyForClient(c1, key1); vm0.invoke(InterestListDUnitTest.class, "unregisterKeyForClient", new Object[] { c1, key1 }); @@ -496,7 +496,7 @@ public class InterestListDUnitTest extends DistributedTestCase // Register interest in key1. vm1.invoke(InterestListDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(vm0.getHost()), new Integer(PORT1) }); + new Object[] { NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1) }); vm1.invoke(InterestListDUnitTest.class, "registerKey", new Object[] { key1 }); @@ -535,7 +535,7 @@ public class InterestListDUnitTest extends DistributedTestCase // Create client cache vm1.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkSupport.getServerHostName(vm0.getHost()), port1, port2}); + NetworkUtils.getServerHostName(vm0.getHost()), port1, port2}); // Register interest in all keys vm1.invoke(InterestListDUnitTest.class, "registerALL_KEYS"); @@ -795,7 +795,7 @@ public class InterestListDUnitTest extends DistributedTestCase } catch (NoSubscriptionServersAvailableException ex) { // expected an exception - LogWriterSupport.getLogWriter().info("Got expected exception in registerKey: "); + LogWriterUtils.getLogWriter().info("Got expected exception in registerKey: "); } } @@ -1104,7 +1104,7 @@ public class InterestListDUnitTest extends DistributedTestCase * @see com.gemstone.gemfire.cache.InterestRegistrationListener#afterRegisterInterest(com.gemstone.gemfire.cache.InterestRegistrationEvent) */ public void afterRegisterInterest(InterestRegistrationEvent event) { - LogWriterSupport.getLogWriter().info("InterestListener.afterRegisterInterest invoked with this event: " + event); + LogWriterUtils.getLogWriter().info("InterestListener.afterRegisterInterest invoked with this event: " + event); registrationCount++; } @@ -1112,7 +1112,7 @@ public class InterestListDUnitTest extends DistributedTestCase * @see com.gemstone.gemfire.cache.InterestRegistrationListener#afterUnregisterInterest(com.gemstone.gemfire.cache.InterestRegistrationEvent) */ public void afterUnregisterInterest(InterestRegistrationEvent event) { - LogWriterSupport.getLogWriter().info("InterestListener.afterUnregisterInterest invoked with this event: " + event); + LogWriterUtils.getLogWriter().info("InterestListener.afterUnregisterInterest invoked with this event: " + event); unregistrationCount++; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java index 5ad9aaa..c0494d3 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java @@ -47,7 +47,7 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -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; @@ -111,7 +111,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase // then create client Wait.pause(5000); // [bruce] avoid ConnectException client1.invoke(impl.getClass(), "createClientCache", new Object[] { - NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)}); + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)}); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java index be28fd8..a3ec211 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java @@ -28,7 +28,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; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -99,9 +99,9 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase vm1.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints"); vm2.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints"); vm1.invoke(CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(host),redundancyLevel), REGION_NAME }); + getClientPool(NetworkUtils.getServerHostName(host),redundancyLevel), REGION_NAME }); vm2.invoke(CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(host),0), REGION_NAME }); + getClientPool(NetworkUtils.getServerHostName(host),0), REGION_NAME }); } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java index cdc0c2b..5785baf 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java @@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.cache.LocalRegion; 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; @@ -100,10 +100,10 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase PORT1 = ((Integer)server1.invoke(InterestListRecoveryDUnitTest.class, "createServerCache" )).intValue(); PORT2 = ((Integer)server2.invoke(InterestListRecoveryDUnitTest.class, "createServerCache" )).intValue(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("server1 port is " + String.valueOf(PORT1)); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("server2 port is " + String.valueOf(PORT2)); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("server1 port is " + String.valueOf(PORT1)); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("server2 port is " + String.valueOf(PORT2)); - createClientCache(NetworkSupport.getServerHostName(host), new Integer(PORT1), new Integer(PORT2)); + createClientCache(NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2)); } // this test fails because of bug# 35352 , hence commented the bug is Deferred to: Danube http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java index 001ed8f..f122fe6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java @@ -40,7 +40,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.AvailablePortHelper; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -139,7 +139,7 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { } private void doExpressInterestOnServer(boolean isDurable) { - LogWriterSupport.getLogWriter().info("Total ClientSessions " + cacheServer.getAllClientSessions().size()); + LogWriterUtils.getLogWriter().info("Total ClientSessions " + cacheServer.getAllClientSessions().size()); for(ClientSession c : this.cacheServer.getAllClientSessions()) { c.registerInterestRegex("/serverRegion", ".*", isDurable); } @@ -158,7 +158,7 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { intCount = count.intValue(); intCount++; InterestRegrListenerDUnitTest.this.listnerMap.put(UNREGISTER_INTEREST, intCount); - LogWriterSupport.getLogWriter().info("InterestRegistrationListener afterUnregisterInterest for " + LogWriterUtils.getLogWriter().info("InterestRegistrationListener afterUnregisterInterest for " + event.getRegionName() + " keys " + event.getKeysOfInterest() + "Count " + intCount + " Client : " + event.getClientSession().toString()); } @@ -170,11 +170,11 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { intCount = count.intValue(); intCount++; InterestRegrListenerDUnitTest.this.listnerMap.put(REGISTER_INTEREST, intCount); - LogWriterSupport.getLogWriter().info("InterestRegistrationListener afterRegisterInterest for " + LogWriterUtils.getLogWriter().info("InterestRegistrationListener afterRegisterInterest for " + event.getRegionName() + " keys " + event.getKeysOfInterest() + "Count " + intCount + " Client : " + event.getClientSession().toString()); } }; - LogWriterSupport.getLogWriter().info("Registered InterestRegistationLister"); + LogWriterUtils.getLogWriter().info("Registered InterestRegistationLister"); this.cacheServer.registerInterestRegistrationListener(listener); } @@ -192,7 +192,7 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { ClientRegionFactory<String,String> regionFactory = clientCache.createClientRegionFactory(ClientRegionShortcut.PROXY); Region<String, String> region = regionFactory.create("serverRegion"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Client Cache is created in this vm connected to cacheServer " + host + ":" + port + " durable? " + isDurable + " with VMID=" + vmID + " region " + region.getFullPath() + " regionSize " + region.size()); assertNotNull(clientCache); @@ -269,15 +269,15 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { params[1] = port; params[2] = true; params[3] = "VM_1"; - LogWriterSupport.getLogWriter().info("Starting client1 with server endpoint <" + hostName + ">:" + port); + LogWriterUtils.getLogWriter().info("Starting client1 with server endpoint <" + hostName + ">:" + port); clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "setUpClientVMTask", params); params[3] = "VM_2"; - LogWriterSupport.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); + LogWriterUtils.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "setUpClientVMTask", params); params[3] = "VM_3"; - LogWriterSupport.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); + LogWriterUtils.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "setUpClientVMTask", params); @@ -299,15 +299,15 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{true}); Thread.sleep(2); Map<String,Integer> listnerMap = (Map<String, Integer>) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); - LogWriterSupport.getLogWriter().info("Listener Map " + listnerMap); + LogWriterUtils.getLogWriter().info("Listener Map " + listnerMap); int registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); int unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); assertEquals(3, registerCount); assertEquals(0, unregisterCount); - LogWriterSupport.getLogWriter().info("Sleeping till durable client queue are expired and unregister event is called on to listener"); + LogWriterUtils.getLogWriter().info("Sleeping till durable client queue are expired and unregister event is called on to listener"); Thread.sleep((DURABLE_CLIENT_TIMEOUT+5)*1000); listnerMap = (Map<String, Integer>) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); - LogWriterSupport.getLogWriter().info("Listener Map after sleeping " + listnerMap); + LogWriterUtils.getLogWriter().info("Listener Map after sleeping " + listnerMap); registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); assertEquals(3, registerCount); @@ -334,15 +334,15 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { params[1] = port; params[2] = true; params[3] = "VM_1"; - LogWriterSupport.getLogWriter().info("Starting client1 with server endpoint <" + hostName + ">:" + port); + LogWriterUtils.getLogWriter().info("Starting client1 with server endpoint <" + hostName + ">:" + port); clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "setUpClientVMTask", params); params[3] = "VM_2"; - LogWriterSupport.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); + LogWriterUtils.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "setUpClientVMTask", params); params[3] = "VM_3"; - LogWriterSupport.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); + LogWriterUtils.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "setUpClientVMTask", params); @@ -361,15 +361,15 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{true}); Thread.sleep(2); Map<String,Integer> listnerMap = (Map<String, Integer>) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); - LogWriterSupport.getLogWriter().info("Listener Map " + listnerMap); + LogWriterUtils.getLogWriter().info("Listener Map " + listnerMap); int registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); int unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); assertEquals(3, registerCount); assertEquals(0, unregisterCount); - LogWriterSupport.getLogWriter().info("Sleeping till durable client queue are expired and unregister event is called on to listener"); + LogWriterUtils.getLogWriter().info("Sleeping till durable client queue are expired and unregister event is called on to listener"); Thread.sleep((DURABLE_CLIENT_TIMEOUT+5)*1000); listnerMap = (Map<String, Integer>) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); - LogWriterSupport.getLogWriter().info("Listener Map after sleeping " + listnerMap); + LogWriterUtils.getLogWriter().info("Listener Map after sleeping " + listnerMap); registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); assertEquals(3, registerCount); @@ -398,15 +398,15 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { params[1] = port; params[2] = true; params[3] = "VM_1"; - LogWriterSupport.getLogWriter().info("Starting client1 with server endpoint <" + hostName + ">:" + port); + LogWriterUtils.getLogWriter().info("Starting client1 with server endpoint <" + hostName + ">:" + port); clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "setUpClientVMTask", params); params[3] = "VM_2"; - LogWriterSupport.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); + LogWriterUtils.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "setUpClientVMTask", params); params[3] = "VM_3"; - LogWriterSupport.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); + LogWriterUtils.getLogWriter().info("Starting client2 with server endpoint <" + hostName + ">:" + port); clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "setUpClientVMTask", params); @@ -434,13 +434,13 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { @Override public boolean done() { Map<String,Integer> listnerMap = (Map<String, Integer>) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); - LogWriterSupport.getLogWriter().info("Listener Map " + listnerMap); + LogWriterUtils.getLogWriter().info("Listener Map " + listnerMap); registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); if (registerCount == 3 && unregisterCount == 3) { return true; } - LogWriterSupport.getLogWriter().info("Waiting for counts to each reach 3. Current registerCount="+registerCount+"; unregisterCount="+unregisterCount); + LogWriterUtils.getLogWriter().info("Waiting for counts to each reach 3. Current registerCount="+registerCount+"; unregisterCount="+unregisterCount); return false; } @@ -452,7 +452,7 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase { Wait.waitForCriterion(wc, 20000, 500, true); - LogWriterSupport.getLogWriter().info("Sleeping till durable client queue are expired and unregister event is called on to listener"); + LogWriterUtils.getLogWriter().info("Sleeping till durable client queue are expired and unregister event is called on to listener"); Thread.sleep((DURABLE_CLIENT_TIMEOUT+5)*1000); serverVM.invoke(InterestRegrListenerDUnitTest.class, "closeCacheTask"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java index bd15080..85c6727 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java @@ -36,7 +36,7 @@ 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.IgnoredException; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +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; @@ -128,7 +128,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase objArr[0] = InterestResultPolicy.NONE; objArr[1] = new Integer(PREPOPULATED_ENTRIES); vm1.invoke(InterestResultPolicyDUnitTest.class, "createClientCache", new Object[] { - NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)}); + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)}); vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr); vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr); logger.fine("testPolicyNone END"); @@ -150,7 +150,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase objArr[0] = InterestResultPolicy.KEYS; objArr[1] = new Integer(PREPOPULATED_ENTRIES); vm1.invoke(InterestResultPolicyDUnitTest.class, "createClientCache", new Object[] { - NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)});; + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)});; vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr); vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr); logger.fine("testPolicyKeys END"); @@ -172,7 +172,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase objArr[0] = InterestResultPolicy.KEYS_VALUES; objArr[1] = new Integer(PREPOPULATED_ENTRIES); vm1.invoke(InterestResultPolicyDUnitTest.class, "createClientCache", new Object[] { - NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)}); + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)}); vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr); vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr); logger.fine("testPolicyKeyValues END"); @@ -197,7 +197,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase /* registering for 5 extra keys */ objArr[1] = new Integer(PREPOPULATED_ENTRIES + 5); vm1.invoke(InterestResultPolicyDUnitTest.class, "createClientCache", new Object[] { - NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT)}); + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)}); vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr); vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr); Integer cnt = (Integer)vm0.invoke(InterestResultPolicyDUnitTest.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/RedundancyLevelPart1DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java index 5c2292e..704a82a 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java @@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets; 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.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -60,7 +60,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase public void testRedundancyNotSpecifiedNonPrimaryServerFail() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 0); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 0); verifyOrderOfEndpoints(); server2.invoke(RedundancyLevelTestBase.class, "stopServer"); //pause(5000); @@ -108,7 +108,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase //Asif: Increased the socket read timeout to 3000 sec becoz the registering // of keys was timing out sometimes causing fail over to EP4 cozing // below assertion to fail - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 0, 3000, 100); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 0, 3000, 100); assertTrue(pool.getPrimaryName().equals(SERVER1)); verifyOrderOfEndpoints(); server0.invoke(RedundancyLevelTestBase.class, "stopServer"); @@ -149,7 +149,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedNonFailoverEPFails() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); //assertTrue(pool.getRedundantNames().contains(SERVER1)); @@ -188,7 +188,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase try { FailOverDetectionByCCU = true; - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1, 250, 500); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1, 250, 500); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); // assertTrue(pool.getRedundantNames() @@ -225,7 +225,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase public void _testRedundancySpecifiedNonFailoverEPFailsDetectionByRegisterInterest() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250, 500); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250, 500); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); // assertTrue(pool.getRedundantNames() @@ -265,7 +265,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase public void _testRedundancySpecifiedNonFailoverEPFailsDetectionByUnregisterInterest() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250,500); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250,500); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); // assertTrue(pool.getRedundantNames() @@ -303,7 +303,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedNonFailoverEPFailsDetectionByPut() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,500,1000); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,500,1000); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); // assertTrue(pool.getRedundantNames() @@ -343,7 +343,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedNonPrimaryEPFails() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); assertTrue(pool.getPrimaryName().equals(SERVER1)); @@ -384,7 +384,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase try { FailOverDetectionByCCU = true; - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1, 250, 500); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1, 250, 500); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); assertTrue(pool.getPrimaryName().equals(SERVER1)); @@ -423,7 +423,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByRegisterInterest() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250, 500); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250, 500); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); assertTrue(pool.getPrimaryName().equals(SERVER1)); @@ -464,7 +464,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByUnregisterInterest() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250,500); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250,500); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); assertTrue(pool.getPrimaryName().equals(SERVER1)); @@ -504,7 +504,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByPut() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250,500); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,250,500); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); assertTrue(pool.getPrimaryName().equals(SERVER1)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java index 5b70314..6f31d3b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java @@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets; 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.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -62,7 +62,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedPrimaryEPFails() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1); waitConnectedServers(4); assertTrue(pool.getPrimaryName().equals(SERVER1)); assertTrue(pool.getRedundantNames().contains(SERVER2)); @@ -104,7 +104,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase try { FailOverDetectionByCCU = true; - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000,100); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000,100); waitConnectedServers(4); assertTrue(pool.getPrimaryName().equals(SERVER1)); assertTrue(pool.getRedundantNames().contains(SERVER2)); @@ -143,7 +143,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedPrimaryEPFailsDetectionByRegisterInterest() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000, 100); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000, 100); waitConnectedServers(4); assertTrue(pool.getPrimaryName().equals(SERVER1)); assertTrue(pool.getRedundantNames().contains(SERVER2)); @@ -184,7 +184,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedPrimaryEPFailsDetectionByUnregisterInterest() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000,100); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000,100); waitConnectedServers(4); assertTrue(pool.getPrimaryName().equals(SERVER1)); assertTrue(pool.getRedundantNames().contains(SERVER2)); @@ -224,7 +224,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedPrimaryEPFailsDetectionByPut() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000, 100); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1,3000, 100); waitConnectedServers(4); assertTrue(pool.getPrimaryName().equals(SERVER1)); assertTrue(pool.getRedundantNames().contains(SERVER2)); @@ -260,7 +260,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedPrimarySecondaryEPFails() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 1); waitConnectedServers(4); assertEquals(1, pool.getRedundantNames().size()); assertTrue(pool.getPrimaryName().equals(SERVER1)); @@ -301,7 +301,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedEPFails() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 2); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 2); waitConnectedServers(4); assertEquals(2, pool.getRedundantNames().size()); assertTrue(pool.getPrimaryName().equals(SERVER1)); @@ -362,7 +362,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase // make sure that the client connects to only two servers and // redundancyLevel // unsatisfied with one - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 2); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 2); // let the client connect to servers //pause(10000); verifyLiveAndRedundantServers(2, 1); @@ -417,7 +417,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase try { // TODO: Yogesh server1.invoke(RedundancyLevelTestBase.class, "stopServer"); - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 2); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 2); // let the client connect to servers //pause(10000); verifyLiveAndRedundantServers(3, 2); @@ -457,7 +457,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase try { // TODO: Yogesh server2.invoke(RedundancyLevelTestBase.class, "stopServer"); - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, -1/* not specified */); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, -1/* not specified */); // let the client connect to servers //pause(10000); verifyLiveAndRedundantServers(3, 2); @@ -522,7 +522,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase public void testRedundancySpecifiedMoreThanEPs() { try { - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 5); + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 5); assertEquals(3, pool.getRedundantNames().size()); server0.invoke(RedundancyLevelTestBase.class, "verifyCCP"); server1.invoke(RedundancyLevelTestBase.class, "verifyCCP");
