http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java index b8a271b..4a7a17e 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java @@ -44,8 +44,8 @@ import com.gemstone.gemfire.internal.AvailablePort; 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.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; @@ -334,7 +334,7 @@ public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTes else cq1.execute(); } catch (Exception ex){ - LogWriterSupport.getLogWriter().info("CqService is :" + cqService); + LogWriterUtils.getLogWriter().info("CqService is :" + cqService); ex.printStackTrace(); AssertionError err = new AssertionError("Failed to create CQ " + cqName1 + " . "); err.initCause(ex); @@ -375,7 +375,7 @@ public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTes else cq1.execute(); } catch (Exception ex){ - LogWriterSupport.getLogWriter().info("CqService is :" + cqService); + LogWriterUtils.getLogWriter().info("CqService is :" + cqService); ex.printStackTrace(); AssertionError err = new AssertionError("Failed to create CQ " + cqName1 + " . "); err.initCause(ex); @@ -670,7 +670,7 @@ public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTes "createServerCache")).intValue(); client .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server.getHost()), + new Object[] { NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1) }); } @@ -682,7 +682,7 @@ public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTes "createServerCache")).intValue(); client .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCacheWithNoRegion", - new Object[] { NetworkSupport.getServerHostName(server.getHost()), + new Object[] { NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1) }); } /* @@ -705,8 +705,8 @@ public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTes "createServerCache")).intValue(); primary = (Integer)client2.invoke( DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCache2", - new Object[] { NetworkSupport.getServerHostName(server.getHost()), - NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT1), + new Object[] { NetworkUtils.getServerHostName(server.getHost()), + NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT1), new Integer(PORT2) }); } @@ -721,8 +721,8 @@ public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTes "createServerCache")).intValue(); primary = (Integer)client2.invoke( DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCache3", - new Object[] { NetworkSupport.getServerHostName(server.getHost()), - NetworkSupport.getServerHostName(server2.getHost()), new Integer(PORT1), + new Object[] { NetworkUtils.getServerHostName(server.getHost()), + NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT1), new Integer(PORT2) }); }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java index bd351c5..ed0e565 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java @@ -46,8 +46,8 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; 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.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -70,7 +70,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // normally final String durableClientId = getName() + "_client"; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -93,7 +93,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); // Publish some entries final int numberOfEntries = 10; @@ -152,7 +152,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { final String regionName1 = regionName + "1"; final String regionName2 = regionName + "2"; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClients", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName1, regionName2, getClientDistributedSystemProperties(durableClientId)}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName1, regionName2, getClientDistributedSystemProperties(durableClientId)}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -218,7 +218,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // stops normally final String durableClientId = getName() + "_client"; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -244,7 +244,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { public void run2() throws CacheException { getSystem(getClientDistributedSystemProperties(durableClientId)); PoolFactoryImpl pf = (PoolFactoryImpl)PoolManager.createFactory(); - pf.init(getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), serverPort, true)); + pf.init(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, true)); try { pf.create("uncreatablePool"); fail("Should not have been able to create the pool"); @@ -274,7 +274,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); // Publish some entries final int numberOfEntries = 10; @@ -330,7 +330,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // stops normally final String durableClientId = getName() + "_client"; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -344,7 +344,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { VM durableClient2VM = this.publisherClientVM; final String durableClientId2 = getName() + "_client2"; durableClient2VM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2)}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2)}); // Send clientReady message durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -412,7 +412,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { final int durableClientTimeout = 60; // keep the client alive for 60 seconds //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -450,7 +450,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName}); // Publish some entries final int numberOfEntries = 10; @@ -519,7 +519,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Re-start the durable client this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -582,7 +582,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { final int durableClientTimeout = 60; // keep the client alive for 60 seconds //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -608,7 +608,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { VM durableClient2VM = this.server2VM; final String durableClientId2 = getName() + "_client2"; durableClient2VM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2, durableClientTimeout), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2, durableClientTimeout), Boolean.TRUE}); // Send clientReady message durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -657,7 +657,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); // Publish some entries final int numberOfEntries = 10; @@ -783,7 +783,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Re-start durable client 1 this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -794,7 +794,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Re-start durable client 2 durableClient2VM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2), Boolean.TRUE}); // Send clientReady message durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -874,7 +874,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { final int durableClientTimeout = 60; // keep the client alive for 60 seconds //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -934,7 +934,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName}); // Publish some entries final int numberOfEntries = 10; @@ -974,7 +974,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Re-start the durable client that is kept alive on the server when it stops // normally this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -1061,7 +1061,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { final String durableClientId = getName() + "_client"; // make the client use ClientCacheFactory so it will have a default pool this.durableClientVM.invoke(CacheServerTestUtil.class, "createClientCache", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)}); // verify that readyForEvents has not yet been called on the client's default pool this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") { @@ -1192,7 +1192,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); // Publish some entries final int numberOfEntries = 10; @@ -1358,7 +1358,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { ClientServerObserver origObserver = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() { public void beforeSendingClientAck() { - LogWriterSupport.getLogWriter().info("beforeSendingClientAck invoked"); + LogWriterUtils.getLogWriter().info("beforeSendingClientAck invoked"); } }); @@ -1435,7 +1435,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); // Publish some entries final int numberOfEntries = 10; @@ -3286,7 +3286,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally final String durableClientId = getName() + "_client"; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -3351,7 +3351,7 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase { // Start up the client again. This time initialize it so that it is not kept // alive on the servers when it stops normally. this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java index 26650bf..c0aba3c 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java @@ -65,7 +65,7 @@ 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.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; @@ -126,7 +126,7 @@ public class DurableClientTestCase extends DistributedTestCase { // stops normally final String durableClientId = getName() + "_client"; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -182,7 +182,7 @@ public class DurableClientTestCase extends DistributedTestCase { final String durableClientId = getName() + "_client"; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), new Boolean(false), jp }); + new Object[] { getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), new Boolean(false), jp }); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -315,7 +315,7 @@ public class DurableClientTestCase extends DistributedTestCase { final int durableClientTimeout = 60; // keep the client alive for 60 seconds //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -354,7 +354,7 @@ public class DurableClientTestCase extends DistributedTestCase { // Re-start the durable client this.restartDurableClient(new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()),serverPort, true), + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()),serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout) }); @@ -398,7 +398,7 @@ public class DurableClientTestCase extends DistributedTestCase { final int durableClientTimeout = 60; // keep the client alive for 60 seconds //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)}); // // Send clientReady message // this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -447,7 +447,7 @@ public class DurableClientTestCase extends DistributedTestCase { // Re-start the durable client (this is necessary so the //netDown test will set the appropriate system properties. this.restartDurableClient(new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout) }); @@ -487,7 +487,7 @@ public class DurableClientTestCase extends DistributedTestCase { final int durableClientTimeout = 5; // keep the client alive for 5 seconds //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -543,7 +543,7 @@ public class DurableClientTestCase extends DistributedTestCase { }); this.restartDurableClient(new Object[] { - getClientPool(NetworkSupport.getServerHostName(Host.getHost(0)), serverPort, true), + getClientPool(NetworkUtils.getServerHostName(Host.getHost(0)), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout) }); @@ -570,7 +570,7 @@ public class DurableClientTestCase extends DistributedTestCase { final int durableClientTimeout = 120; // keep the client alive for 60 seconds //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -593,7 +593,7 @@ public class DurableClientTestCase extends DistributedTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); // Publish some entries final int numberOfEntries = 1; @@ -696,7 +696,7 @@ public class DurableClientTestCase extends DistributedTestCase { // Re-start the durable client this.restartDurableClient(new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE }); // Verify durable client on server @@ -741,7 +741,7 @@ public class DurableClientTestCase extends DistributedTestCase { final int durableClientTimeout = 60; // keep the client alive for 60 seconds //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -764,7 +764,7 @@ public class DurableClientTestCase extends DistributedTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); // Publish some entries final int numberOfEntries = 1; @@ -852,7 +852,7 @@ public class DurableClientTestCase extends DistributedTestCase { // Re-start the durable client this.restartDurableClient(new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE }); // Verify durable client on server @@ -956,7 +956,7 @@ public class DurableClientTestCase extends DistributedTestCase { // stops normally final String durableClientId = getName() + "_client"; this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE}); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -1022,7 +1022,7 @@ public class DurableClientTestCase extends DistributedTestCase { // Start a publisher this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName}); // Publish some messages // Publish some entries @@ -1107,10 +1107,10 @@ public class DurableClientTestCase extends DistributedTestCase { final int durableClientTimeout = 60; // keep the client alive for 60 seconds Pool clientPool; if (redundancyLevel == 1) { - clientPool = getClientPool(NetworkSupport.getServerHostName(Host.getHost(0)), server1Port, server2Port, true); + clientPool = getClientPool(NetworkUtils.getServerHostName(Host.getHost(0)), server1Port, server2Port, true); } else { - clientPool = getClientPool(NetworkSupport.getServerHostName(Host.getHost(0)), server1Port, server2Port, true, 0); + clientPool = getClientPool(NetworkUtils.getServerHostName(Host.getHost(0)), server1Port, server2Port, true, 0); } this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints"); @@ -1144,7 +1144,7 @@ public class DurableClientTestCase extends DistributedTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName}); // Publish some entries final int numberOfEntries = 1; @@ -1301,10 +1301,10 @@ public class DurableClientTestCase extends DistributedTestCase { final int durableClientTimeout = 60; // keep the client alive for 60 seconds Pool clientPool; if (redundancyLevel == 1) { - clientPool = getClientPool(NetworkSupport.getServerHostName(Host.getHost(0)), server1Port, server2Port, true); + clientPool = getClientPool(NetworkUtils.getServerHostName(Host.getHost(0)), server1Port, server2Port, true); } else { - clientPool = getClientPool(NetworkSupport.getServerHostName(Host.getHost(0)), server1Port, server2Port, true, 0); + clientPool = getClientPool(NetworkUtils.getServerHostName(Host.getHost(0)), server1Port, server2Port, true, 0); } this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints"); @@ -1333,7 +1333,7 @@ public class DurableClientTestCase extends DistributedTestCase { // Start normal publisher client this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] {getClientPool(NetworkSupport.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName}); + new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName}); // Publish some entries final int numberOfEntries = 1; @@ -2010,7 +2010,7 @@ public class DurableClientTestCase extends DistributedTestCase { CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort1, true), regionName, getClientDistributedSystemProperties(durableClientId, durableTimeoutInSeconds), Boolean.TRUE }); @@ -2021,7 +2021,7 @@ public class DurableClientTestCase extends DistributedTestCase { CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(durableClientVM.getHost()), + getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort1, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE }); @@ -2032,7 +2032,7 @@ public class DurableClientTestCase extends DistributedTestCase { CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(vm.getHost()), + getClientPool(NetworkUtils.getServerHostName(vm.getHost()), serverPort1, serverPort2, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE }); @@ -2043,7 +2043,7 @@ public class DurableClientTestCase extends DistributedTestCase { CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(vm.getHost()), + getClientPool(NetworkUtils.getServerHostName(vm.getHost()), serverPort1, false), regionName }); } @@ -2052,7 +2052,7 @@ public class DurableClientTestCase extends DistributedTestCase { CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkSupport.getServerHostName(vm.getHost()), + getClientPool(NetworkUtils.getServerHostName(vm.getHost()), serverPort1, serverPort2, false), regionName }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java index a5b3dd8..a66da0b 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java @@ -51,8 +51,8 @@ import com.gemstone.gemfire.management.internal.MBeanJMXAdapter; import com.gemstone.gemfire.management.internal.SystemManagementService; import com.gemstone.gemfire.test.dunit.Assert; 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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -122,7 +122,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); // Create client. cqDUnitTest.createClient(client, port, host0); @@ -178,7 +178,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); startLocatorInVM(locator, locatorPort, ""); - String locators = NetworkSupport.getServerHostName(locator.getHost())+ "[" + locatorPort + "]"; + String locators = NetworkUtils.getServerHostName(locator.getHost())+ "[" + locatorPort + "]"; int serverPort = startBridgeServerInVM(server, null, locators); @@ -186,7 +186,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { addClientNotifListener(server,serverPort); // Start a client and make sure that proper notification is received - startBridgeClientInVM(client, null, NetworkSupport.getServerHostName(locator.getHost()), locatorPort); + startBridgeClientInVM(client, null, NetworkUtils.getServerHostName(locator.getHost()), locatorPort); //stop the client and make sure the bridge server notifies stopBridgeMemberVM(client); @@ -215,7 +215,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { final int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); startLocator(locator, locatorPort, ""); - String locators = NetworkSupport.getServerHostName(locator.getHost())+ "[" + locatorPort + "]"; + String locators = NetworkUtils.getServerHostName(locator.getHost())+ "[" + locatorPort + "]"; //Step 2: int serverPort = startBridgeServerInVM(server, null, locators); @@ -279,7 +279,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { Properties props = new Properties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, String.valueOf(0)); props.setProperty(DistributionConfig.LOCATORS_NAME, otherLocators); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0"); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); try { @@ -287,7 +287,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { + ".log"); InetAddress bindAddr = null; try { - bindAddr = InetAddress.getByName(NetworkSupport.getServerHostName(vm.getHost())); + bindAddr = InetAddress.getByName(NetworkUtils.getServerHostName(vm.getHost())); } catch (UnknownHostException uhe) { Assert.fail("While resolving bind address ", uhe); } @@ -400,7 +400,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { CacheServerMXBean bean = service .getLocalCacheServerMXBean(serverPort); assertEquals(bean.getIndexCount(), 1); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Index is " + bean.getIndexList()[0] + "</ExpectedString> "); try { @@ -491,7 +491,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { .getMessageTimeToLive()); assertEquals(CacheServer.DEFAULT_LOAD_POLL_INTERVAL, bean .getLoadPollInterval()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> LoadProbe of the Server is " + bean.fetchLoadProbe().toString() + "</ExpectedString> "); } @@ -518,14 +518,14 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { String clientId = bean.getClientIds()[0]; assertNotNull(clientId); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> ClientId of the Server is " + clientId + "</ExpectedString> "); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Active Query Count " + bean.getActiveCQCount() + "</ExpectedString> "); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Registered Query Count " + bean.getRegisteredCQCount() + "</ExpectedString> "); @@ -567,7 +567,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { @Override public void handleNotification(Notification notification, Object handback) { assertNotNull(notification); - LogWriterSupport.getLogWriter().info("Expected String :" + notification.toString()); + LogWriterUtils.getLogWriter().info("Expected String :" + notification.toString()); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java index b4cb4f1..c77ab2b 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java @@ -63,9 +63,9 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData; import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.SectionResultData; -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; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -984,7 +984,7 @@ public void verifyClientStats(CommandResult commandResultForClient, String serve getSystem(props); final ClientCacheFactory ccf = new ClientCacheFactory(props); - ccf.addPoolServer(NetworkSupport.getServerHostName(server.getHost()), port); + ccf.addPoolServer(NetworkUtils.getServerHostName(server.getHost()), port); ccf.setPoolSubscriptionEnabled(true); ccf.setPoolPingInterval(1); ccf.setPoolStatisticInterval(1); @@ -1004,7 +1004,7 @@ public void verifyClientStats(CommandResult commandResultForClient, String serve }else{ String poolName = "new_pool_" + System.currentTimeMillis(); try{ - PoolImpl p = (PoolImpl) PoolManager.createFactory().addServer(NetworkSupport.getServerHostName(server.getHost()), port) + PoolImpl p = (PoolImpl) PoolManager.createFactory().addServer(NetworkUtils.getServerHostName(server.getHost()), port) .setThreadLocalConnections(true) .setMinConnections(1) .setSubscriptionEnabled(true) @@ -1057,7 +1057,7 @@ public void verifyClientStats(CommandResult commandResultForClient, String serve protected Properties getServerProperties() { Properties p = new Properties(); - p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); return p; } @@ -1397,7 +1397,7 @@ private void setUpNonSubscribedClient() throws Exception { getSystem(props); final ClientCacheFactory ccf = new ClientCacheFactory(props); - ccf.addPoolServer(NetworkSupport.getServerHostName(server.getHost()), port); + ccf.addPoolServer(NetworkUtils.getServerHostName(server.getHost()), port); ccf.setPoolSubscriptionEnabled(false); ccf.setPoolPingInterval(1); ccf.setPoolStatisticInterval(1); @@ -1417,7 +1417,7 @@ private void setUpNonSubscribedClient() throws Exception { }else{ String poolName = "new_pool_" + System.currentTimeMillis(); try{ - PoolImpl p = (PoolImpl) PoolManager.createFactory().addServer(NetworkSupport.getServerHostName(server.getHost()), port) + PoolImpl p = (PoolImpl) PoolManager.createFactory().addServer(NetworkUtils.getServerHostName(server.getHost()), port) .setThreadLocalConnections(true) .setMinConnections(1) .setSubscriptionEnabled(false) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java index 3bce205..d8e65d9 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java @@ -44,10 +44,10 @@ import com.gemstone.gemfire.management.cli.Result.Status; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; -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.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.VM; @@ -250,7 +250,7 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase { } private void writeToLog(String text, String resultAsString) { - LogWriterSupport.getLogWriter().info(getUniqueName() + ": " + text + "\n" + resultAsString); + LogWriterUtils.getLogWriter().info(getUniqueName() + ": " + text + "\n" + resultAsString); } private void setupSystem() throws Exception { @@ -360,7 +360,7 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase { getSystem(props); final ClientCacheFactory ccf = new ClientCacheFactory(props); - ccf.addPoolServer(NetworkSupport.getServerHostName(server.getHost()), port); + ccf.addPoolServer(NetworkUtils.getServerHostName(server.getHost()), port); ccf.setPoolSubscriptionEnabled(true); ClientCache cache = (ClientCache)getClientCache(ccf); @@ -423,7 +423,7 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase { protected Properties getServerProperties() { Properties p = new Properties(); - p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); return p; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java index 75a41b6..03f19c3 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java @@ -21,8 +21,8 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.management.DistributedSystemMXBean; import com.gemstone.gemfire.management.ManagementService; import com.gemstone.gemfire.management.ManagementTestBase; -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; @@ -83,12 +83,12 @@ public class TestCQDUnitTest extends ManagementTestBase { public void testNumOfCQ() throws Exception { initManagement(false); - LogWriterSupport.getLogWriter().info("started testNumOfCQ"); + LogWriterUtils.getLogWriter().info("started testNumOfCQ"); VM server = managedNodeList.get(1); VM client = managedNodeList.get(2); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); int serverPort = AvailablePortHelper.getRandomAvailableTCPPort(); cqDUnitTest.createServer(server, serverPort); @@ -132,7 +132,7 @@ public class TestCQDUnitTest extends ManagementTestBase { long numOfCQ = ((Number) managingNode.invoke(TestCQDUnitTest.class, "getNumOfCQ")).intValue(); - LogWriterSupport.getLogWriter().info("testNumOfCQ numOfCQ= " + numOfCQ); + LogWriterUtils.getLogWriter().info("testNumOfCQ numOfCQ= " + numOfCQ); cqDUnitTest.closeClient(client); cqDUnitTest.closeServer(server); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java index 0e23900..9cfec67 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java @@ -21,8 +21,8 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.management.DistributedSystemMXBean; import com.gemstone.gemfire.management.ManagementService; import com.gemstone.gemfire.management.ManagementTestBase; -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; @@ -91,11 +91,11 @@ public class TestClientsDUnitTest extends ManagementTestBase { cqDUnitTest.createServer(server, serverPort); final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); cqDUnitTest.createClient(client, port, host0); Integer numOfClients = (Integer) managingNode.invoke( TestClientsDUnitTest.class, "getNumOfClients"); - LogWriterSupport.getLogWriter().info("testNumOfClients numOfClients = " + numOfClients); + LogWriterUtils.getLogWriter().info("testNumOfClients numOfClients = " + numOfClients); cqDUnitTest.closeClient(client); cqDUnitTest.closeServer(server); assertEquals(1, numOfClients.intValue()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java index fce6d91..9d880a7 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java @@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.management.DistributedSystemMXBean; import com.gemstone.gemfire.management.ManagementService; import com.gemstone.gemfire.management.ManagementTestBase; -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; @@ -86,7 +86,7 @@ public class TestServerDUnitTest extends ManagementTestBase { cqDUnitTest.createServer(server, serverPort); int serverCount = ((Number) managingNode.invoke(TestServerDUnitTest.class, "getNumOfServersFromMBean")).intValue(); - LogWriterSupport.getLogWriter().info("TestServerDUnitTest serverCount =" + serverCount); + LogWriterUtils.getLogWriter().info("TestServerDUnitTest serverCount =" + serverCount); cqDUnitTest.closeServer(server); assertEquals(1, serverCount); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java index b34b4a2..020c37b 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java @@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.security.ObjectWithAuthz; 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.SerializableRunnable; /** @@ -339,15 +339,15 @@ public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestBase { String authInit = gen.getAuthInit(); String authenticator = gen.getAuthenticator(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testPutsGetsObjectModWithFailover: Using authinit: " + authInit); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testPutsGetsObjectModWithFailover: Using authenticator: " + authenticator); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testPutsGetsObjectModWithFailover: Using pre-operation accessor: " + preAccessor); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testPutsGetsObjectModWithFailover: Using post-operation accessor: " + postAccessor); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java index 510b134..bf6eec4 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java @@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.logging.InternalLogWriter; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -304,7 +304,7 @@ public class ClientCQPostAuthorizationDUnitTest extends + SecurityTestUtil.proxyCaches[i].getRegion(regionName).getFullPath(); // Create CQ Attributes. CqAttributesFactory cqf = new CqAttributesFactory(); - CqListener[] cqListeners = {new CqQueryTestListener(LogWriterSupport.getLogWriter())}; + CqListener[] cqListeners = {new CqQueryTestListener(LogWriterUtils.getLogWriter())}; ((CqQueryTestListener)cqListeners[0]).cqName = cqName; cqf.initCqListeners(cqListeners); @@ -318,7 +318,7 @@ public class ClientCQPostAuthorizationDUnitTest extends AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . "); err.initCause(ex); - LogWriterSupport.getLogWriter().info("CqService is :" + cqService, err); + LogWriterUtils.getLogWriter().info("CqService is :" + cqService, err); throw err; } } @@ -346,16 +346,16 @@ public class ClientCQPostAuthorizationDUnitTest extends try { cq1 = cqService.getCq(cqName); if (cq1 == null) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Failed to get CqQuery object for CQ name: " + cqName); fail("Failed to get CQ " + cqName); } else { - LogWriterSupport.getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName()); + LogWriterUtils.getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName()); assertTrue("newCq() state mismatch", cq1.getState().isStopped()); } } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("CqService is :" + cqService); - LogWriterSupport.getLogWriter().error(ex); + LogWriterUtils.getLogWriter().info("CqService is :" + cqService); + LogWriterUtils.getLogWriter().error(ex); AssertionError err = new AssertionError("Failed to execute CQ " + cqName); err.initCause(ex); @@ -369,9 +369,9 @@ public class ClientCQPostAuthorizationDUnitTest extends cqResults = cq1.executeWithInitialResults(); } catch (CqException ce) { if (ce.getCause() instanceof NotAuthorizedException && !postAuthzAllowed[i]) { - LogWriterSupport.getLogWriter().info("Got expected exception for CQ " + cqName); + LogWriterUtils.getLogWriter().info("Got expected exception for CQ " + cqName); } else { - LogWriterSupport.getLogWriter().info("CqService is: " + cqService); + LogWriterUtils.getLogWriter().info("CqService is: " + cqService); ce.printStackTrace(); AssertionError err = new AssertionError("Failed to execute CQ " + cqName); @@ -379,14 +379,14 @@ public class ClientCQPostAuthorizationDUnitTest extends throw err; } } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("CqService is: " + cqService); + LogWriterUtils.getLogWriter().info("CqService is: " + cqService); ex.printStackTrace(); AssertionError err = new AssertionError("Failed to execute CQ " + cqName); err.initCause(ex); throw err; } - LogWriterSupport.getLogWriter().info("initial result size = " + cqResults.size()); + LogWriterUtils.getLogWriter().info("initial result size = " + cqResults.size()); assertTrue("executeWithInitialResults() state mismatch", cq1 .getState().isRunning()); if (expectedResultsSize >= 0) { @@ -398,9 +398,9 @@ public class ClientCQPostAuthorizationDUnitTest extends cq1.execute(); } catch (CqException ce) { if (ce.getCause() instanceof NotAuthorizedException && !postAuthzAllowed[i]) { - LogWriterSupport.getLogWriter().info("Got expected exception for CQ " + cqName); + LogWriterUtils.getLogWriter().info("Got expected exception for CQ " + cqName); } else { - LogWriterSupport.getLogWriter().info("CqService is: " + cqService); + LogWriterUtils.getLogWriter().info("CqService is: " + cqService); ce.printStackTrace(); AssertionError err = new AssertionError("Failed to execute CQ " + cqName); @@ -412,7 +412,7 @@ public class ClientCQPostAuthorizationDUnitTest extends + cqName); err.initCause(ex); if (expectedErr == null) { - LogWriterSupport.getLogWriter().info("CqService is: " + cqService, err); + LogWriterUtils.getLogWriter().info("CqService is: " + cqService, err); } throw err; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java index b304885..3cb3443 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java @@ -27,7 +27,7 @@ import security.CredentialGenerator; import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; /** * Tests for authorization from client to server. This tests for authorization @@ -127,10 +127,10 @@ public class ClientPostAuthorizationDUnitTest extends String accessor = gen.getAuthorizationCallback(); TestAuthzCredentialGenerator tgen = new TestAuthzCredentialGenerator(gen); - LogWriterSupport.getLogWriter().info("testAllPostOps: Using authinit: " + authInit); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info("testAllPostOps: Using authinit: " + authInit); + LogWriterUtils.getLogWriter().info( "testAllPostOps: Using authenticator: " + authenticator); - LogWriterSupport.getLogWriter().info("testAllPostOps: Using accessor: " + accessor); + LogWriterUtils.getLogWriter().info("testAllPostOps: Using accessor: " + accessor); // Start servers with all required properties Properties serverProps = buildProperties(authenticator, accessor, true, @@ -316,7 +316,7 @@ public class ClientPostAuthorizationDUnitTest extends OperationWithAction.OPBLOCK_NO_FAILOVER }; AuthzCredentialGenerator gen = getXmlAuthzGenerator(); - LogWriterSupport.getLogWriter().info("Executing opblocks with credential generator " + gen); + LogWriterUtils.getLogWriter().info("Executing opblocks with credential generator " + gen); CredentialGenerator cGen = gen.getCredentialGenerator(); Properties extraAuthProps = cGen.getSystemProperties(); Properties javaProps = cGen.getJavaProperties(); @@ -326,11 +326,11 @@ public class ClientPostAuthorizationDUnitTest extends String accessor = gen.getAuthorizationCallback(); TestAuthzCredentialGenerator tgen = new TestAuthzCredentialGenerator(gen); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testAllOpsNotifications: Using authinit: " + authInit); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testAllOpsNotifications: Using authenticator: " + authenticator); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testAllOpsNotifications: Using accessor: " + accessor); // Start servers with all required properties http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java index b13da33..ec85a1e 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java @@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PoolManagerImpl; import com.gemstone.gemfire.test.dunit.Assert; 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 security.DummyCredentialGenerator; @@ -138,11 +138,11 @@ public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase { String authenticator = gen.getAuthenticator(); String authInit = gen.getAuthInit(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testValidCredentials: Using scheme: " + gen.classCode()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testValidCredentials: Using authenticator: " + authenticator); - LogWriterSupport.getLogWriter().info("testValidCredentials: Using authinit: " + authInit); + LogWriterUtils.getLogWriter().info("testValidCredentials: Using authinit: " + authInit); // Start the servers Integer locPort1 = SecurityTestUtil.getLocatorPort(); @@ -158,12 +158,12 @@ public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase { // Start the clients with valid credentials Properties credentials1 = gen.getValidCredentials(1); Properties javaProps1 = gen.getJavaProperties(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testValidCredentials: For first client credentials: " + credentials1 + " : " + javaProps1); Properties credentials2 = gen.getValidCredentials(2); Properties javaProps2 = gen.getJavaProperties(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testValidCredentials: For second client credentials: " + credentials2 + " : " + javaProps2); client1.invoke(MultiuserAPIDUnitTest.class, "createCacheClient", http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java index 082d352..23f496d 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java @@ -40,7 +40,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.logging.InternalLogWriter; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; /** @@ -320,7 +320,7 @@ public class MultiuserDurableCQAuthzDUnitTest extends + SecurityTestUtil.proxyCaches[i].getRegion(regionName).getFullPath(); // Create CQ Attributes. CqAttributesFactory cqf = new CqAttributesFactory(); - CqListener[] cqListeners = {new CqQueryTestListener(LogWriterSupport.getLogWriter())}; + CqListener[] cqListeners = {new CqQueryTestListener(LogWriterUtils.getLogWriter())}; ((CqQueryTestListener)cqListeners[0]).cqName = cqName; cqf.initCqListeners(cqListeners); @@ -334,7 +334,7 @@ public class MultiuserDurableCQAuthzDUnitTest extends AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . "); err.initCause(ex); - LogWriterSupport.getLogWriter().info("CqService is :" + cqService, err); + LogWriterUtils.getLogWriter().info("CqService is :" + cqService, err); throw err; } } @@ -362,16 +362,16 @@ public class MultiuserDurableCQAuthzDUnitTest extends try { cq1 = cqService.getCq(cqName); if (cq1 == null) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Failed to get CqQuery object for CQ name: " + cqName); fail("Failed to get CQ " + cqName); } else { - LogWriterSupport.getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName()); + LogWriterUtils.getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName()); assertTrue("newCq() state mismatch", cq1.getState().isStopped()); } } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("CqService is :" + cqService); - LogWriterSupport.getLogWriter().error(ex); + LogWriterUtils.getLogWriter().info("CqService is :" + cqService); + LogWriterUtils.getLogWriter().error(ex); AssertionError err = new AssertionError("Failed to execute CQ " + cqName); err.initCause(ex); @@ -384,14 +384,14 @@ public class MultiuserDurableCQAuthzDUnitTest extends try { cqResults = cq1.executeWithInitialResults(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("CqService is: " + cqService); + LogWriterUtils.getLogWriter().info("CqService is: " + cqService); ex.printStackTrace(); AssertionError err = new AssertionError("Failed to execute CQ " + cqName); err.initCause(ex); throw err; } - LogWriterSupport.getLogWriter().info("initial result size = " + cqResults.size()); + LogWriterUtils.getLogWriter().info("initial result size = " + cqResults.size()); assertTrue("executeWithInitialResults() state mismatch", cq1 .getState().isRunning()); if (expectedResultsSize >= 0) { @@ -406,7 +406,7 @@ public class MultiuserDurableCQAuthzDUnitTest extends + cqName); err.initCause(ex); if (expectedErr == null) { - LogWriterSupport.getLogWriter().info("CqService is: " + cqService, err); + LogWriterUtils.getLogWriter().info("CqService is: " + cqService, err); } throw err; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java index 5b2dda1..8c329ef 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java @@ -56,7 +56,7 @@ import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.IgnoredException; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; @@ -189,7 +189,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { throw new RuntimeException("unexpected exception", e); } if (entry != null) { - LogWriterSupport.getLogWriter().info("found entry " + entry); + LogWriterUtils.getLogWriter().info("found entry " + entry); } return (entry != null); } @@ -453,7 +453,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { throw new RuntimeException("unexpected exception", e); } if (entry != null) { - LogWriterSupport.getLogWriter().info("found entry " + entry); + LogWriterUtils.getLogWriter().info("found entry " + entry); } return (entry != null); } @@ -592,7 +592,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { throw new RuntimeException("unexpected exception", e); } if (entry != null) { - LogWriterSupport.getLogWriter().info("found entry " + entry); + LogWriterUtils.getLogWriter().info("found entry " + entry); } return (entry != null); } @@ -655,7 +655,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { Properties props = new Properties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false"); InternalDistributedSystem ds = test.getSystem(props);
