http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java index 95dc532..273380d 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java @@ -42,8 +42,8 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.ClientServerTestCase; 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; @@ -121,7 +121,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { // create client final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); //createClient(client, port, host0); String poolName = "testCQAndPartitionedRegion"; @@ -236,7 +236,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { // create client final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testPartitionedCqOnAccessorBridgeServer"; createPool(client, poolName, host0, port); @@ -330,7 +330,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { // creating an accessor vm with Bridge Server installed. createServer(server1); final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testPartitionedCqOnSingleBridgeServer"; createPool(client, poolName, host0, port); @@ -430,7 +430,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { // create client final int port = server2.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server2.getHost()); + final String host0 = NetworkUtils.getServerHostName(server2.getHost()); String poolName = "testPRCqOnSingleBridgeServerUpdatesOriginatingAtAccessor"; createPool(client, poolName, host0, port); @@ -528,7 +528,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testPRCqWithInvalidatesOnBridgeServer"; createPool(client, poolName, host0, port); @@ -628,7 +628,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testPRCqWithInvalidatesOnAccessorBridgeServer"; createPool(client, poolName, host0, port); @@ -729,7 +729,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName1 = "testPRCqWithUpdatesFromClients1"; createPool(client, poolName1, host0, port); @@ -838,7 +838,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { Wait.pause(2000); final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName1 = "testPRCqWithMultipleRegionsOnServer1"; createPool(client, poolName1, host0, port); @@ -984,7 +984,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { Wait.pause(2000); final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName1 = "testPRWithCQsAndProfileUpdates1"; createPool(client, poolName1, host0, port); @@ -1203,7 +1203,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { createServer(server2); final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName1 = "testEventsDuringQueryExecution"; createPool(client, poolName1, host0, port); @@ -1337,7 +1337,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { final int size = 100; final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testCQsWithPutalls"; createPool(client, poolName, new String[]{host0}, new int[]{port}); @@ -1431,7 +1431,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { final int size = 100; final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testCQsWithPutalls"; createPool(client, poolName, new String[]{host0}, new int[]{port}); @@ -1533,7 +1533,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { final int size = 100; final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testCQsWithPutallsTx"; createPool(client, poolName, new String[]{host0}, new int[]{port}); @@ -1655,7 +1655,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { final int size = 100; final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testCQsWithPutallsTx"; createPool(client, poolName, new String[]{host0}, new int[]{port}); @@ -1808,7 +1808,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { "Create Cache Server") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Create Cache Server. ###"); + LogWriterUtils.getLogWriter().info("### Create Cache Server. ###"); //AttributesFactory factory = new AttributesFactory(); //factory.setScope(Scope.DISTRIBUTED_ACK); //factory.setMirrorType(MirrorType.KEYS_VALUES); @@ -1827,7 +1827,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0); for (int i = 0; i < regions.length; i++) { Region r = createRegion(regions[i], attr.create()); - LogWriterSupport.getLogWriter().info("Server created the region: "+r); + LogWriterUtils.getLogWriter().info("Server created the region: "+r); } // pause(2000); try { @@ -1885,7 +1885,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { } for (int i=0; i < servers.length; i++){ - LogWriterSupport.getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]); + LogWriterUtils.getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]); cpf.addServer(servers[i], ports[i]); } @@ -1906,8 +1906,8 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { SerializableRunnable createQService = new CacheSerializableRunnable("Create Client") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Create Client. ###"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info("### Create Client. ###"); + LogWriterUtils.getLogWriter().info( "Will connect to server at por: " + serverPorts[0] + " and at host : " + serverHost); //Region region1 = null; @@ -1930,7 +1930,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { for (int i=0; i < regions.length; i++) { Region clientRegion = createRegion(regions[i], regionFactory.createRegionAttributes()); - LogWriterSupport.getLogWriter().info("### Successfully Created Region on Client :" + clientRegion); + LogWriterUtils.getLogWriter().info("### Successfully Created Region on Client :" + clientRegion); //region1.getAttributesMutator().setCacheListener(new CqListener()); } } @@ -1946,7 +1946,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { //getLogWriter().info("### DEBUG CREATE CQ START ####"); //pause(20 * 1000); - LogWriterSupport.getLogWriter().info("### Create CQ. ###" + cqName); + LogWriterUtils.getLogWriter().info("### Create CQ. ###" + cqName); // Get CQ Service. QueryService cqService = null; try { @@ -1957,7 +1957,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { } // 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); @@ -1967,11 +1967,11 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { try { CqQuery cq1 = cqService.newCq(cqName, queryStr, cqa); assertTrue("newCq() state mismatch", cq1.getState().isStopped()); - LogWriterSupport.getLogWriter().info("Created a new CqQuery : "+cq1); + LogWriterUtils.getLogWriter().info("Created a new CqQuery : "+cq1); } catch (Exception ex){ 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; } } @@ -1991,7 +1991,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { for (int i = 1; i <= size; i++) { region1.put(KEY+i, new Portfolio(i)); } - LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); + LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); } }); } @@ -2005,7 +2005,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase { m.put(KEY+i, new Portfolio(i)); } region1.putAll(m); - LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); + LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); } }); }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java index eb81ce2..49a1252 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java @@ -36,8 +36,8 @@ import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener; import com.gemstone.gemfire.cache.query.dunit.PdxQueryCQTestBase.TestObject; import com.gemstone.gemfire.cache30.ClientServerTestCase; 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; @@ -88,7 +88,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { final int port0 = vm0.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort"); final int port1 = vm1.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Create client pool. final String poolName = "testCqPool"; @@ -99,7 +99,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { // Execute CQ SerializableRunnable executeCq = new CacheSerializableRunnable("Execute queries") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Create CQ. ###" + cqName); + LogWriterUtils.getLogWriter().info("### Create CQ. ###" + cqName); // Get CQ Service. QueryService qService = null; try { @@ -109,7 +109,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { } // 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); @@ -129,7 +129,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { } catch (Exception ex){ AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . "); err.initCause(ex); - LogWriterSupport.getLogWriter().info("QueryService is :" + qService, err); + LogWriterUtils.getLogWriter().info("QueryService is :" + qService, err); throw err; } } @@ -168,7 +168,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { SerializableRunnable validateCq = new CacheSerializableRunnable("Validate CQs") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Validating CQ. ### " + cqName); + LogWriterUtils.getLogWriter().info("### Validating CQ. ### " + cqName); // Get CQ Service. QueryService cqService = null; try { @@ -269,7 +269,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { final int port0 = vm0.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort"); final int port1 = vm1.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Create client pool. final String poolName = "testCqPool"; @@ -318,7 +318,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { } region.registerInterest(list); - LogWriterSupport.getLogWriter().info("### Create CQ. ###" + cqName); + LogWriterUtils.getLogWriter().info("### Create CQ. ###" + cqName); // Get CQ Service. QueryService qService = null; try { @@ -329,7 +329,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { // Create CQ Attributes. for (int i=0; i < queries.length; i++) { CqAttributesFactory cqf = new CqAttributesFactory(); - CqListener[] cqListeners = {new CqQueryTestListener(LogWriterSupport.getLogWriter())}; + CqListener[] cqListeners = {new CqQueryTestListener(LogWriterUtils.getLogWriter())}; ((CqQueryTestListener)cqListeners[0]).cqName = (cqName + i); cqf.initCqListeners(cqListeners); @@ -349,7 +349,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { } catch (Exception ex){ AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . "); err.initCause(ex); - LogWriterSupport.getLogWriter().info("QueryService is :" + qService, err); + LogWriterUtils.getLogWriter().info("QueryService is :" + qService, err); throw err; } } @@ -473,7 +473,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { final int port1 = vm1.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort"); final int port2 = vm2.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Create client pool. final String poolName = "testCqPool"; @@ -509,7 +509,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { } region.registerInterest(list); - LogWriterSupport.getLogWriter().info("### Create CQ. ###" + cqName); + LogWriterUtils.getLogWriter().info("### Create CQ. ###" + cqName); // Get CQ Service. QueryService qService = null; try { @@ -520,7 +520,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { // Create CQ Attributes. for (int i=0; i < queries.length; i++) { CqAttributesFactory cqf = new CqAttributesFactory(); - CqListener[] cqListeners = {new CqQueryTestListener(LogWriterSupport.getLogWriter())}; + CqListener[] cqListeners = {new CqQueryTestListener(LogWriterUtils.getLogWriter())}; ((CqQueryTestListener)cqListeners[0]).cqName = (cqName + i); cqf.initCqListeners(cqListeners); @@ -540,7 +540,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { } catch (Exception ex){ AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . "); err.initCause(ex); - LogWriterSupport.getLogWriter().info("QueryService is :" + qService, err); + LogWriterUtils.getLogWriter().info("QueryService is :" + qService, err); throw err; } } @@ -658,7 +658,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase { final int updateEvents) { vm.invoke(new CacheSerializableRunnable("Validate CQs") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Validating CQ. ### " + cqName); + LogWriterUtils.getLogWriter().info("### Validating CQ. ### " + cqName); // Get CQ Service. QueryService cqService = null; try { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java index 947a4ac..f99a316 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java @@ -131,7 +131,7 @@ public abstract class PdxQueryCQTestBase extends CacheTestCase { cpf.setSubscriptionEnabled(subscriptionEnabled); cpf.setSubscriptionRedundancy(redundancy); for (int i=0; i < servers.length; i++){ - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]); cpf.addServer(servers[i], ports[i]); } cpf.create(poolName); @@ -157,14 +157,14 @@ public abstract class PdxQueryCQTestBase extends CacheTestCase { } try { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("### Executing Query on server:" + queryStr); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("### Executing Query on server:" + queryStr); Query query = remoteQueryService.newQuery(queryStr); rs[0][0] = (SelectResults)query.execute(); //printResults (rs[0][0], " ### Remote Query Results : ####"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("### Executing Query locally:" + queryStr); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("### Executing Query locally:" + queryStr); query = localQueryService.newQuery(queryStr); rs[0][1] = (SelectResults)query.execute(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("### Remote Query rs size: " + (rs[0][0]).size() + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("### Remote Query rs size: " + (rs[0][0]).size() + "Local Query rs size: " + (rs[0][1]).size()); //printResults (rs[0][1], " ### Local Query Results : ####"); // Compare local and remote query results. @@ -255,7 +255,7 @@ public abstract class PdxQueryCQTestBase extends CacheTestCase { for (int i=0; i < queryString.length; i++){ try { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("### Executing Query :" + queryString[i]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("### Executing Query :" + queryString[i]); Query query = qService.newQuery(queryString[i]); results = (SelectResults)query.execute(params[i]); } catch (Exception e) { @@ -294,12 +294,12 @@ public abstract class PdxQueryCQTestBase extends CacheTestCase { SerializableRunnable closeCache = new CacheSerializableRunnable("Close Client") { public void run2() throws CacheException { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("### Close Client. ###"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("### Close Client. ###"); try { closeCache(); disconnectFromDS(); } catch (Exception ex) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("### Failed to get close client. ###"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("### Failed to get close client. ###"); } } }; @@ -334,13 +334,13 @@ public abstract class PdxQueryCQTestBase extends CacheTestCase { @Override public boolean equals(Object o){ - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("In TestObject2.equals() this: " + this + " other :" + o); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("In TestObject2.equals() this: " + this + " other :" + o); GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.equals() this: " + this + " other :" + o); TestObject2 other = (TestObject2)o; if (_id == other._id) { return true; } else { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("NOT EQUALS"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("NOT EQUALS"); return false; } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java index e1208da..6e4de65 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java @@ -42,8 +42,8 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.ClientServerTestCase; 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; @@ -98,7 +98,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); // Init values at server. final int size = 10; @@ -144,7 +144,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testClientIndexUpdateWithRegisterInterest"; cqDUnitTest.createPool(client, poolName, host0, port); @@ -195,7 +195,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); //Init values at server. final int size = 10; @@ -236,7 +236,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); //Init values at server. final int size = 10; @@ -283,7 +283,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); //Init values at server. final int size = 1000; @@ -340,7 +340,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); // Init values at server. final int size = 10; @@ -381,7 +381,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); // Init values at server. final int size = 10; @@ -422,7 +422,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); // Init values at server. final int size = 10; @@ -469,7 +469,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ } else { region = getRootRegion().getSubregion(regionName); } - region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(LogWriterSupport.getLogWriter())); + region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(LogWriterUtils.getLogWriter())); } catch (Exception cqe) { AssertionError err = new AssertionError("Failed to get Region."); err.initCause(cqe); @@ -512,7 +512,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ } else { region = getRootRegion().getSubregion(regionName); } - region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(LogWriterSupport.getLogWriter())); + region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(LogWriterUtils.getLogWriter())); } catch (Exception cqe) { AssertionError err = new AssertionError("Failed to get Region."); err.initCause(cqe); @@ -548,7 +548,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ "Create Cache Server") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Create Cache Server. ###"); + LogWriterUtils.getLogWriter().info("### Create Cache Server. ###"); AttributesFactory factory = new AttributesFactory(); factory.setMirrorType(MirrorType.KEYS_VALUES); @@ -624,7 +624,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ // getLogWriter().info("### puting '"+KEY+i+"' in region " + region1); region1.put(KEY+i, new Portfolio((start != 0 ? start : 1) * i, i)); } - LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); + LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); } }); } @@ -646,7 +646,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ SerializableRunnable createQService = new CacheSerializableRunnable("Create Client") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Create Client. ###"); + LogWriterUtils.getLogWriter().info("### Create Client. ###"); //Region region1 = null; // Initialize CQ Service. try { @@ -669,7 +669,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ } createRootRegion(regionFactory.createRegionAttributes()); - LogWriterSupport.getLogWriter().info("### Successfully Created Root Region on Client"); + LogWriterUtils.getLogWriter().info("### Successfully Created Root Region on Client"); } }; @@ -690,7 +690,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ public void validateQueryOnIndexWithRegion(VM vm, final String query, final int resultSize, final String region) { vm.invoke(new CacheSerializableRunnable("Validate Query") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Validating Query. ###"); + LogWriterUtils.getLogWriter().info("### Validating Query. ###"); QueryService qs = getCache().getQueryService(); Query q = qs.newQuery(query); @@ -701,7 +701,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ Object r = q.execute(); if(r instanceof SelectResults){ int rSize = ((SelectResults)r).asSet().size(); - LogWriterSupport.getLogWriter().info("### Result Size is :" + rSize); + LogWriterUtils.getLogWriter().info("### Result Size is :" + rSize); if(region == null) { assertEquals(resultSize, rSize); @@ -731,7 +731,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ public void asyncClearRegion(VM vm, final String regionName){ vm.invokeAsync(new CacheSerializableRunnable("Destroy entries") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Clearing Region. ###"); + LogWriterUtils.getLogWriter().info("### Clearing Region. ###"); Region region1; if(!"root".equals(regionName)){ region1 = getRootRegion().getSubregion(regionName); @@ -739,7 +739,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ region1 = getRootRegion(); } region1.clear(); - LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); + LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); } }); } @@ -747,7 +747,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ private SerializableRunnable getSRClearRegion(final String regionName) { SerializableRunnable sr = new CacheSerializableRunnable("Destroy entries") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Clearing Region. ###"); + LogWriterUtils.getLogWriter().info("### Clearing Region. ###"); Region region1; if(!"root".equals(regionName)){ region1 = getRootRegion().getSubregion(regionName); @@ -755,7 +755,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ region1 = getRootRegion(); } region1.clear(); - LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); + LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); } }; return sr; @@ -774,7 +774,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{ } else { region = getRootRegion().getSubregion(regionName); } - region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(LogWriterSupport.getLogWriter())); + region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(LogWriterUtils.getLogWriter())); } catch (Exception cqe) { AssertionError err = new AssertionError("Failed to get Region."); err.initCause(cqe); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java index 68f0bfa..febe78e 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java @@ -50,12 +50,12 @@ import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; -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.SerializableRunnable; -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; @@ -160,7 +160,7 @@ public class QueryMonitorDUnitTest extends CacheTestCase { r = new SerializableRunnable("getClientSystem") { public void run() { - Properties props = DistributedTestSupport.getAllDistributedSystemProperties(new Properties()); + Properties props = DistributedTestUtils.getAllDistributedSystemProperties(new Properties()); props.put(DistributionConfigImpl.LOCATORS_NAME, ""); getSystem(props); } @@ -264,7 +264,7 @@ public class QueryMonitorDUnitTest extends CacheTestCase { for (int i=0; i < server.length; i++){ port[i] = server[i].invokeInt(QueryMonitorDUnitTest.class, "getCacheServerPort"); } - final String host0 = NetworkSupport.getServerHostName(server[0].getHost()); + final String host0 = NetworkUtils.getServerHostName(server[0].getHost()); SerializableRunnable initClient = new CacheSerializableRunnable("Init client") { public void run2() throws CacheException { @@ -1020,7 +1020,7 @@ public class QueryMonitorDUnitTest extends CacheTestCase { cqDUnitTest.createServer(server, 0, true); 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); @@ -1137,7 +1137,7 @@ public class QueryMonitorDUnitTest extends CacheTestCase { exampleRegion.put(""+i, new Portfolio(i)); } } - LogWriterSupport.getLogWriter().info("### Completed updates in server1 in testCacheOpAfterQueryCancel"); + LogWriterUtils.getLogWriter().info("### Completed updates in server1 in testCacheOpAfterQueryCancel"); } }); @@ -1150,7 +1150,7 @@ public class QueryMonitorDUnitTest extends CacheTestCase { exampleRegion.put(""+i, new Portfolio(i)); } } - LogWriterSupport.getLogWriter().info("### Completed updates in server2 in testCacheOpAfterQueryCancel"); + LogWriterUtils.getLogWriter().info("### Completed updates in server2 in testCacheOpAfterQueryCancel"); } }); @@ -1171,17 +1171,17 @@ public class QueryMonitorDUnitTest extends CacheTestCase { Query query = queryService.newQuery(qStr); query.execute(); } catch (QueryExecutionTimeoutException qet) { - LogWriterSupport.getLogWriter().info("### Got Expected QueryExecutionTimeout exception. " + + LogWriterUtils.getLogWriter().info("### Got Expected QueryExecutionTimeout exception. " + qet.getMessage()); if (qet.getMessage().contains("cancelled after exceeding max execution")){ - LogWriterSupport.getLogWriter().info("### Doing a put operation"); + LogWriterUtils.getLogWriter().info("### Doing a put operation"); exampleRegion.put(""+i, new Portfolio(i)); } } catch (Exception e){ fail("Exception executing query." + e.getMessage()); } } - LogWriterSupport.getLogWriter().info("### Completed Executing queries in testCacheOpAfterQueryCancel"); + LogWriterUtils.getLogWriter().info("### Completed Executing queries in testCacheOpAfterQueryCancel"); } catch (Exception ex){ Assert.fail("Exception creating the query service", ex); } @@ -1191,23 +1191,23 @@ public class QueryMonitorDUnitTest extends CacheTestCase { AsyncInvocation ai3 = server3.invokeAsync(executeQuery); AsyncInvocation ai4 = server4.invokeAsync(executeQuery); - LogWriterSupport.getLogWriter().info("### Waiting for async threads to join in testCacheOpAfterQueryCancel"); + LogWriterUtils.getLogWriter().info("### Waiting for async threads to join in testCacheOpAfterQueryCancel"); try { - Threads.join(ai1, 5 * 60 * 1000, null); - Threads.join(ai2, 5 * 60 * 1000, null); - Threads.join(ai3, 5 * 60 * 1000, null); - Threads.join(ai4, 5 * 60 * 1000, null); + ThreadUtils.join(ai1, 5 * 60 * 1000); + ThreadUtils.join(ai2, 5 * 60 * 1000); + ThreadUtils.join(ai3, 5 * 60 * 1000); + ThreadUtils.join(ai4, 5 * 60 * 1000); } catch (Exception ex) { fail("Async thread join failure"); } - LogWriterSupport.getLogWriter().info("### DONE Waiting for async threads to join in testCacheOpAfterQueryCancel"); + LogWriterUtils.getLogWriter().info("### DONE Waiting for async threads to join in testCacheOpAfterQueryCancel"); validateQueryMonitorThreadCnt(server1, 0, 1000); validateQueryMonitorThreadCnt(server2, 0, 1000); validateQueryMonitorThreadCnt(server3, 0, 1000); validateQueryMonitorThreadCnt(server4, 0, 1000); - LogWriterSupport.getLogWriter().info("### DONE validating query monitor threads testCacheOpAfterQueryCancel"); + LogWriterUtils.getLogWriter().info("### DONE validating query monitor threads testCacheOpAfterQueryCancel"); stopServer(server1); stopServer(server2); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java index 19c0ae7..540b37b 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java @@ -41,8 +41,8 @@ import com.gemstone.gemfire.cache.util.CqListenerAdapter; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.internal.AvailablePortHelper; 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; public class ClientSnapshotDUnitTest extends CacheTestCase { @@ -255,9 +255,9 @@ public class ClientSnapshotDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory() - .set("log-level", LogWriterSupport.getDUnitLogLevel()) + .set("log-level", LogWriterUtils.getDUnitLogLevel()) .setPdxSerializer(new MyPdxSerializer()) - .addPoolServer(NetworkSupport.getServerHostName(host), port) + .addPoolServer(NetworkUtils.getServerHostName(host), port) .setPoolSubscriptionEnabled(true) .setPoolPRSingleHopEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java index 7327e94..7dcd120 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java @@ -59,7 +59,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -824,7 +824,7 @@ public class PRDeltaPropagationDUnitTest extends DistributedTestCase { assertNotNull(cache); deltaPR = cache.createRegion(partitionedRegionName, attr.create()); assertNotNull(deltaPR); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + deltaPR); }
