http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java index 12ff8a1..2f317f2 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java @@ -70,8 +70,8 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.IgnoredException; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -208,7 +208,7 @@ public class CqQueryUsingPoolDUnitTest 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); @@ -251,7 +251,7 @@ public class CqQueryUsingPoolDUnitTest 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); @@ -270,7 +270,7 @@ public class CqQueryUsingPoolDUnitTest 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); } try { startBridgeServer(port, true); @@ -290,7 +290,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { public void closeServer(VM server) { server.invoke(new SerializableRunnable("Close CacheServer") { public void run() { - LogWriterSupport.getLogWriter().info("### Close CacheServer. ###"); + LogWriterUtils.getLogWriter().info("### Close CacheServer. ###"); stopBridgeServer(getCache()); } }); @@ -308,7 +308,7 @@ public class CqQueryUsingPoolDUnitTest 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 { @@ -332,7 +332,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { } for (int i=0; i < regions.length; i++) { createRegion(regions[i], regionFactory.createRegionAttributes()); - LogWriterSupport.getLogWriter().info("### Successfully Created Region on Client :" + regions[i]); + LogWriterUtils.getLogWriter().info("### Successfully Created Region on Client :" + regions[i]); //region1.getAttributesMutator().setCacheListener(new CqListener()); } } @@ -347,11 +347,11 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { SerializableRunnable closeCQService = new CacheSerializableRunnable("Close Client") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Close Client. ###"); + LogWriterUtils.getLogWriter().info("### Close Client. ###"); try { ((DefaultQueryService)getCache().getQueryService()).closeCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("### Failed to get CqService during ClientClose() ###"); + LogWriterUtils.getLogWriter().info("### Failed to get CqService during ClientClose() ###"); } } @@ -368,12 +368,12 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { try { qs = getCache().getQueryService(); }catch (Exception ex) { - LogWriterSupport.getLogWriter().info("### Failed to get CqService during ClientClose() ###"); + LogWriterUtils.getLogWriter().info("### Failed to get CqService during ClientClose() ###"); } try { qs.createIndex(indexName, IndexType.FUNCTIONAL, indexedExpression, fromClause); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("### Failed to create Index :" + indexName); + LogWriterUtils.getLogWriter().info("### Failed to create Index :" + indexName); } } }); @@ -387,7 +387,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { for (int i = 1; i <= size; i++) { region1.put(KEY+i, new Portfolio(i, i)); } - LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); + LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); } }); } @@ -402,7 +402,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { portfolio.createTime = System.currentTimeMillis(); region1.put(KEY+i, portfolio); } - LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); + LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size()); } }); } @@ -415,7 +415,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { for (int i = 1; i <= size; i++) { region1.destroy(KEY+i); } - LogWriterSupport.getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size()); + LogWriterUtils.getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size()); } }); @@ -431,7 +431,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { for (int i = 1; i <= size; i++) { region1.invalidate(KEY+i); } - LogWriterSupport.getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size()); + LogWriterUtils.getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size()); } }); @@ -461,7 +461,7 @@ public class CqQueryUsingPoolDUnitTest 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]); } @@ -478,7 +478,7 @@ public class CqQueryUsingPoolDUnitTest 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 qService = null; try { @@ -488,7 +488,7 @@ public class CqQueryUsingPoolDUnitTest 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); @@ -501,7 +501,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { } 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; } } @@ -516,7 +516,7 @@ public class CqQueryUsingPoolDUnitTest 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 qService = null; try { @@ -526,7 +526,7 @@ public class CqQueryUsingPoolDUnitTest 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); @@ -539,7 +539,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { } 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; } } @@ -551,10 +551,10 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { vm.invoke(new CacheSerializableRunnable("Create CQ with no name:" ) { public void run2() throws CacheException { //pause(60 * 1000); - LogWriterSupport.getLogWriter().info("### DEBUG CREATE CQ START ####"); + LogWriterUtils.getLogWriter().info("### DEBUG CREATE CQ START ####"); //pause(20 * 1000); - LogWriterSupport.getLogWriter().info("### Create CQ with no name. ###"); + LogWriterUtils.getLogWriter().info("### Create CQ with no name. ###"); // Get CQ Service. QueryService qService = null; CqQuery cq1 = null; @@ -570,7 +570,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { for (int i = 0; i < 20; ++i) { // Create CQ Attributes. CqAttributesFactory cqf = new CqAttributesFactory(); - CqListener[] cqListeners = {new CqQueryTestListener(LogWriterSupport.getLogWriter())}; + CqListener[] cqListeners = {new CqQueryTestListener(LogWriterUtils.getLogWriter())}; cqf.initCqListeners(cqListeners); CqAttributes cqa = cqf.create(); @@ -580,38 +580,38 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { cq1 = qService.newCq(queryStr, cqa); ((CqQueryTestListener)cqListeners[0]).cqName = cq1.getName(); } catch (Exception ex){ - LogWriterSupport.getLogWriter().info("CQService is :" + qService); + LogWriterUtils.getLogWriter().info("CQService is :" + qService); Assert.fail("Failed to create CQ with no name" + " . ", ex); } if (cq1 == null) { - LogWriterSupport.getLogWriter().info("Failed to get CqQuery object for CQ with no name."); + LogWriterUtils.getLogWriter().info("Failed to get CqQuery object for CQ with no name."); } else { cqName = cq1.getName(); - LogWriterSupport.getLogWriter().info("Created CQ with no name, generated CQ name: " + cqName + " CQ state:" + cq1.getState()); + LogWriterUtils.getLogWriter().info("Created CQ with no name, generated CQ name: " + cqName + " CQ state:" + cq1.getState()); assertTrue("Create CQ with no name illegal state", cq1.getState().isStopped()); } if ( i%2 == 0) { try { cqResults = cq1.executeWithInitialResults(); } catch (Exception ex){ - LogWriterSupport.getLogWriter().info("CqService is :" + qService); + LogWriterUtils.getLogWriter().info("CqService is :" + qService); Assert.fail("Failed to execute CQ with initial results, cq name: " + cqName + " . ", ex); } - LogWriterSupport.getLogWriter().info("initial result size = " + cqResults.size()); - LogWriterSupport.getLogWriter().info("CQ state after execute with initial results = " + cq1.getState()); + LogWriterUtils.getLogWriter().info("initial result size = " + cqResults.size()); + LogWriterUtils.getLogWriter().info("CQ state after execute with initial results = " + cq1.getState()); assertTrue("executeWithInitialResults() state mismatch", cq1.getState().isRunning()); } else { try { cq1.execute(); } catch (Exception ex){ - LogWriterSupport.getLogWriter().info("CQService is :" + qService); + LogWriterUtils.getLogWriter().info("CQService is :" + qService); Assert.fail("Failed to execute CQ " + cqName + " . ", ex); } - LogWriterSupport.getLogWriter().info("CQ state after execute = " + cq1.getState()); + LogWriterUtils.getLogWriter().info("CQ state after execute = " + cq1.getState()); assertTrue("execute() state mismatch", cq1.getState().isRunning()); } @@ -619,7 +619,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { try { cq1.close(); } catch (Exception ex){ - LogWriterSupport.getLogWriter().info("CqService is :" + qService); + LogWriterUtils.getLogWriter().info("CqService is :" + qService); Assert.fail("Failed to close CQ " + cqName + " . ", ex); } assertTrue("closeCq() state mismatch", cq1.getState().isClosed()); @@ -648,7 +648,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { private void work() throws CacheException { //pause(60 * 1000); - LogWriterSupport.getLogWriter().info("### DEBUG EXECUTE CQ START ####"); + LogWriterUtils.getLogWriter().info("### DEBUG EXECUTE CQ START ####"); //pause(20 * 1000); // Get CQ Service. @@ -668,16 +668,16 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { try { cq1 = cqService.getCq(cqName); if (cq1 == null) { - LogWriterSupport.getLogWriter().info("Failed to get CqQuery object for CQ name: " + cqName); + 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); throw err; @@ -689,13 +689,13 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { 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) { assertEquals("Unexpected results size for CQ: " + cqName + @@ -725,7 +725,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { AssertionError err = new AssertionError("Failed to execute CQ " + cqName); err.initCause(ex); if (expectedErr == null) { - LogWriterSupport.getLogWriter().info("CqService is :" + cqService, err); + LogWriterUtils.getLogWriter().info("CqService is :" + cqService, err); } throw err; } @@ -755,7 +755,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { public void stopCQ(VM vm, final String cqName) throws Exception { vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Stop CQ. ###" + cqName); + LogWriterUtils.getLogWriter().info("### Stop CQ. ###" + cqName); // Get CQ Service. QueryService cqService = null; try { @@ -783,7 +783,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) { public void run2() throws CacheException { CqQuery cq1 = null; - LogWriterSupport.getLogWriter().info("### Stop and Exec CQ. ###" + cqName); + LogWriterUtils.getLogWriter().info("### Stop and Exec CQ. ###" + cqName); // Get CQ Service. QueryService cqService = null; try { @@ -807,8 +807,8 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { Assert.fail("Count = " + i + "Failed to stop CQ " + cqName + " . ", ex); } assertTrue("Stop CQ state mismatch, count = " + i, cq1.getState().isStopped()); - LogWriterSupport.getLogWriter().info("After stop in Stop and Execute loop, ran successfully, loop count: " + i); - LogWriterSupport.getLogWriter().info("CQ state: " + cq1.getState()); + LogWriterUtils.getLogWriter().info("After stop in Stop and Execute loop, ran successfully, loop count: " + i); + LogWriterUtils.getLogWriter().info("CQ state: " + cq1.getState()); // Re-execute CQ try { @@ -817,8 +817,8 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { Assert.fail("Count = " + i + "Failed to execute CQ " + cqName + " . ", ex); } assertTrue("Execute CQ state mismatch, count = " + i, cq1.getState().isRunning()); - LogWriterSupport.getLogWriter().info("After execute in Stop and Execute loop, ran successfully, loop count: " + i); - LogWriterSupport.getLogWriter().info("CQ state: " + cq1.getState()); + LogWriterUtils.getLogWriter().info("After execute in Stop and Execute loop, ran successfully, loop count: " + i); + LogWriterUtils.getLogWriter().info("CQ state: " + cq1.getState()); } } }); @@ -829,7 +829,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { public void closeCQ(VM vm, final String cqName) throws Exception { vm.invoke(new CacheSerializableRunnable("Close CQ :" + cqName) { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Close CQ. ###" + cqName); + LogWriterUtils.getLogWriter().info("### Close CQ. ###" + cqName); // Get CQ Service. QueryService cqService = null; try { @@ -860,7 +860,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { Region region = null; try { 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); @@ -919,7 +919,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { private void failIfCQExists(VM vm, final String cqName) { vm.invoke(new CacheSerializableRunnable("Fail if CQ exists") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Fail if CQ Exists. ### " + cqName); + LogWriterUtils.getLogWriter().info("### Fail if CQ Exists. ### " + cqName); // Get CQ Service. QueryService cqService = null; try { @@ -941,7 +941,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { 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 { @@ -990,7 +990,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { final int totalEvents) { 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 { @@ -1217,7 +1217,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { public void validateQuery(VM vm, final String query, final int resultSize) { 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); @@ -1225,7 +1225,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { Object r = q.execute(); if(r instanceof Collection){ int rSize = ((Collection)r).size(); - LogWriterSupport.getLogWriter().info("### Result Size is :" + rSize); + LogWriterUtils.getLogWriter().info("### Result Size is :" + rSize); assertEquals(rSize, resultSize); } } @@ -1276,7 +1276,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) { public void run2() throws CacheException { CqQuery cq1 = null; - LogWriterSupport.getLogWriter().info("### CQ attributes mutator for ###" + cqName); + LogWriterUtils.getLogWriter().info("### CQ attributes mutator for ###" + cqName); // Get CQ Service. QueryService cqService = null; try { @@ -1346,7 +1346,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { /* Init Server and Client */ createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testInterestListAndCQs"; createPool(client, poolName, host0, thePort); @@ -1538,7 +1538,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { /* Init Server and Client */ createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCQStopExecute"; createPool(client, poolName, host0, thePort); @@ -1625,7 +1625,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { /* Init Server and Client */ createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCQAttributesMutator"; createPool(client, poolName, host0, thePort); @@ -1723,7 +1723,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { /* Init Server and Client */ createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCQCreateClose"; System.out.println("##### Pool Name :" + poolName + " host :" + host0 + " port :" + thePort); @@ -1822,13 +1822,13 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { client.invoke(new CacheSerializableRunnable("CloseAll CQ :") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Close All CQ. ###"); + LogWriterUtils.getLogWriter().info("### Close All CQ. ###"); // Get CQ Service. QueryService cqService = null; try { cqService = getCache().getQueryService(); } catch (Exception cqe) { - LogWriterSupport.getLogWriter().info("Failed to getCQService.", cqe); + LogWriterUtils.getLogWriter().info("Failed to getCQService.", cqe); Assert.fail("Failed to getCQService.", cqe); } @@ -1836,7 +1836,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { try { cqService.closeCqs(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to close All CQ.", ex); + LogWriterUtils.getLogWriter().info("Failed to close All CQ.", ex); Assert.fail("Failed to close All CQ. ", ex); } } @@ -1856,7 +1856,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { // Call close all CQ. client.invoke(new CacheSerializableRunnable("CloseAll CQ 2 :") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Close All CQ 2. ###"); + LogWriterUtils.getLogWriter().info("### Close All CQ 2. ###"); // Get CQ Service. QueryService cqService = null; try { @@ -1892,7 +1892,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { /* Init Server and Client */ createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testRegionDestroy"; createPool(client, poolName, host0, thePort); @@ -1997,7 +1997,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { /* Create Server and Client */ createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName1 = "testCQWithMultipleClients1"; String poolName2 = "testCQWithMultipleClients2"; @@ -2150,7 +2150,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCQResultSet"; createPool(client, poolName, host0, thePort); @@ -2224,7 +2224,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCQEvents"; createPool(client, poolName, host0, thePort); @@ -2329,7 +2329,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCQEvents"; createPool(client, poolName, host0, thePort); @@ -2431,7 +2431,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testEnableDisableCQ"; createPool(client, poolName, host0, thePort); @@ -2572,7 +2572,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testQuery"; createPool(client, poolName, host0, thePort); @@ -2617,7 +2617,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server1); final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); // Create client. // Properties props = new Properties(); // Create client with redundancyLevel -1 @@ -2711,7 +2711,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server1); final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2); @@ -2811,7 +2811,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server1); final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1); @@ -2848,7 +2848,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { server2.invoke(new CacheSerializableRunnable("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); @@ -2943,7 +2943,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server2); final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); @@ -3003,7 +3003,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { createServer(server); final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); // Create client. // createClient(client, thePort, host0); @@ -3078,7 +3078,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testQueryWithNULLInWhereClause"; createPool(client, poolName, host0, thePort); @@ -3133,7 +3133,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { "Create Cache Server") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Create Cache Server. ###"); + LogWriterUtils.getLogWriter().info("### Create Cache Server. ###"); // Create region with Global scope AttributesFactory factory1 = new AttributesFactory(); @@ -3167,7 +3167,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); @@ -3234,14 +3234,14 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase { server.invoke(new CacheSerializableRunnable("Server Region Entries") { public void run2() throws CacheException { Region region = getRootRegion().getSubregion(regionName); - LogWriterSupport.getLogWriter().info("### Entries in Server :" + region.keys().size()); + LogWriterUtils.getLogWriter().info("### Entries in Server :" + region.keys().size()); } }); client.invoke(new CacheSerializableRunnable("Client Region Entries") { public void run2() throws CacheException { Region region = getRootRegion().getSubregion(regionName); - LogWriterSupport.getLogWriter().info("### Entries in Client :" + region.keys().size()); + LogWriterUtils.getLogWriter().info("### Entries in Client :" + region.keys().size()); } }); }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java index 7690f32..7104947 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java @@ -35,8 +35,8 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -161,7 +161,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCqResults"; cqDUnitTest.createPool(client, poolName, host0, port); @@ -216,7 +216,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCqResults"; cqDUnitTest.createPool(client, poolName, host0, port); @@ -261,7 +261,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCqResults"; cqDUnitTest.createPool(client, poolName, host0, port); @@ -320,7 +320,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testCqResults"; cqDUnitTest.createPool(client, poolName, host0, port); @@ -377,7 +377,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testCqResults"; cqDUnitTest.createPool(client, poolName, host0, port); @@ -426,7 +426,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testCqResults"; cqDUnitTest.createPool(client, poolName, host0, port); @@ -495,7 +495,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCqResults"; final String cqName = "testCqResultsP_0"; @@ -558,7 +558,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { try { cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex); + LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex); Assert.fail ("Failed to get the internal CqService.", ex); } @@ -581,7 +581,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { if (cqQuery.getName().equals(cqName)) { int size = cqQuery.getCqResultKeysSize(); if (size != totalObjects) { - LogWriterSupport.getLogWriter().info("The number of Cached events " + size + + LogWriterUtils.getLogWriter().info("The number of Cached events " + size + " is not equal to the expected size " + totalObjects); HashSet expectedKeys = new HashSet(); for (int i = 1; i < totalObjects; i++) { @@ -589,7 +589,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { } Set cachedKeys = cqQuery.getCqResultKeyCache(); expectedKeys.removeAll(cachedKeys); - LogWriterSupport.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); + LogWriterUtils.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); } assertEquals("The number of keys cached for cq " + cqName + " is wrong.", totalObjects, cqQuery.getCqResultKeysSize()); @@ -619,7 +619,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCqResults"; final String cqName1 = "testCqResultsP_0"; @@ -687,7 +687,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { try { cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex); + LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex); Assert.fail ("Failed to get the internal CqService.", ex); } @@ -709,7 +709,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { ServerCQImpl cqQuery = (ServerCQImpl)cq; int size = cqQuery.getCqResultKeysSize(); if (size != totalObjects) { - LogWriterSupport.getLogWriter().info("The number of Cached events " + size + + LogWriterUtils.getLogWriter().info("The number of Cached events " + size + " is not equal to the expected size " + totalObjects); HashSet expectedKeys = new HashSet(); for (int i = 1; i < totalObjects; i++) { @@ -717,7 +717,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { } Set cachedKeys = cqQuery.getCqResultKeyCache(); expectedKeys.removeAll(cachedKeys); - LogWriterSupport.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); + LogWriterUtils.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); } assertEquals("The number of keys cached for cq " + cqQuery.getName() + " is wrong.", totalObjects, cqQuery.getCqResultKeysSize()); @@ -748,7 +748,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testCqResults"; final String cqName = "testCqResultsP_0"; @@ -811,7 +811,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { try { cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex); + LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex); Assert.fail ("Failed to get the internal CqService.", ex); } @@ -861,7 +861,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); String poolName = "testCqResults"; final String cqName = "testCqResultsCachingForDestroyEventsOnPR_0"; @@ -922,7 +922,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { try { cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex); + LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex); Assert.fail ("Failed to get the internal CqService.", ex); } @@ -942,7 +942,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { try { cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex); + LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex); Assert.fail ("Failed to get the internal CqService.", ex); } @@ -978,7 +978,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { cqDUnitTest.createServer(server1); final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1); String poolName = "testCQFailOver"; @@ -1039,7 +1039,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { try { cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex); + LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex); Assert.fail ("Failed to get the internal CqService.", ex); } @@ -1062,7 +1062,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { if (cqQuery.getName().equals(cqName)) { int size = cqQuery.getCqResultKeysSize(); if (size != totalObjects) { - LogWriterSupport.getLogWriter().info("The number of Cached events " + size + + LogWriterUtils.getLogWriter().info("The number of Cached events " + size + " is not equal to the expected size " + totalObjects); HashSet expectedKeys = new HashSet(); for (int i = 1; i < totalObjects; i++) { @@ -1070,7 +1070,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { } Set cachedKeys = cqQuery.getCqResultKeyCache(); expectedKeys.removeAll(cachedKeys); - LogWriterSupport.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); + LogWriterUtils.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); } assertEquals("The number of keys cached for cq " + cqName + " is wrong.", totalObjects, cqQuery.getCqResultKeysSize()); @@ -1096,7 +1096,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { try { cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex); + LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex); Assert.fail ("Failed to get the internal CqService.", ex); } @@ -1119,7 +1119,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { if (cqQuery.getName().equals(cqName)) { int size = cqQuery.getCqResultKeysSize(); if (size != totalObjects) { - LogWriterSupport.getLogWriter().info("The number of Cached events " + size + + LogWriterUtils.getLogWriter().info("The number of Cached events " + size + " is not equal to the expected size " + totalObjects); HashSet expectedKeys = new HashSet(); for (int i = 1; i < totalObjects; i++) { @@ -1127,7 +1127,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase { } Set cachedKeys = cqQuery.getCqResultKeyCache(); expectedKeys.removeAll(cachedKeys); - LogWriterSupport.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); + LogWriterUtils.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); } assertEquals("The number of keys cached for cq " + cqName + " is wrong.", totalObjects, cqQuery.getCqResultKeysSize()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java index 430e18d..facb3d9 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java @@ -33,8 +33,8 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -80,7 +80,7 @@ public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUs cqDUnitTest.createServer(server1); final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1); String poolName = "testCQFailOver"; @@ -141,7 +141,7 @@ public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUs try { CqServiceImpl = (com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to get the internal CqServiceImpl.", ex); + LogWriterUtils.getLogWriter().info("Failed to get the internal CqServiceImpl.", ex); Assert.fail ("Failed to get the internal CqServiceImpl.", ex); } @@ -164,7 +164,7 @@ public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUs if (cqQuery.getName().equals(cqName)) { int size = cqQuery.getCqResultKeysSize(); if (size != totalObjects) { - LogWriterSupport.getLogWriter().info("The number of Cached events " + size + + LogWriterUtils.getLogWriter().info("The number of Cached events " + size + " is not equal to the expected size " + totalObjects); HashSet expectedKeys = new HashSet(); for (int i = 1; i < totalObjects; i++) { @@ -172,7 +172,7 @@ public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUs } Set cachedKeys = cqQuery.getCqResultKeyCache(); expectedKeys.removeAll(cachedKeys); - LogWriterSupport.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); + LogWriterUtils.getLogWriter().info("Missing keys from the Cache : " + expectedKeys); } assertEquals("The number of keys cached for cq " + cqName + " is wrong.", totalObjects, cqQuery.getCqResultKeysSize()); @@ -198,7 +198,7 @@ public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUs try { CqServiceImpl = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Failed to get the internal CqServiceImpl.", ex); + LogWriterUtils.getLogWriter().info("Failed to get the internal CqServiceImpl.", ex); Assert.fail ("Failed to get the internal CqServiceImpl.", ex); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java index d59f359..7c1e8f2 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java @@ -24,10 +24,9 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; 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.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -60,7 +59,7 @@ public class CqStateDUnitTest extends HelperTestCase { startCacheServer(serverA, ports[0], getAuthenticatedServerProperties()); createReplicatedRegion(serverA, regionName, null); - final String host0 = NetworkSupport.getServerHostName(serverA.getHost()); + final String host0 = NetworkUtils.getServerHostName(serverA.getHost()); startClient(client, new VM[]{ serverA, serverB }, ports, 1, getClientProperties()); createCQ(client, cqName, "select * from /"+ regionName, null); @@ -70,7 +69,7 @@ public class CqStateDUnitTest extends HelperTestCase { startCacheServers(serverB); AsyncInvocation async = executeCQ(client, cqName); - Threads.join(async, 10000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async, 10000); Boolean clientRunning = (Boolean) client.invoke(new SerializableCallable() { @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java index dcb5d25..a006f46 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java @@ -36,8 +36,8 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -78,7 +78,7 @@ public class CqStatsDUnitTest extends CacheTestCase { final int cqListenerInvocations) { vm.invoke(new CacheSerializableRunnable("Validate CQs") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Validating CQ Stats. ### " + cqName); + LogWriterUtils.getLogWriter().info("### Validating CQ Stats. ### " + cqName); // Get CQ Service. QueryService qService = null; try { @@ -161,7 +161,7 @@ public class CqStatsDUnitTest extends CacheTestCase { final int clientsWithCqs) { vm.invoke(new CacheSerializableRunnable("Validate CQ Service Stats") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Validating CQ Service Stats. ### "); + LogWriterUtils.getLogWriter().info("### Validating CQ Service Stats. ### "); // Get CQ Service. QueryService qService = null; try { @@ -249,7 +249,7 @@ public class CqStatsDUnitTest extends CacheTestCase { /* Init Server and Client */ cqDUnitTest.createServer(server); 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); /* Create CQs. */ @@ -340,7 +340,7 @@ public class CqStatsDUnitTest extends CacheTestCase { /* Init Server and Client */ cqDUnitTest.createServer(server); final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); cqDUnitTest.createClient(client1, port, host0); cqDUnitTest.createClient(client2, port, host0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java index 305b8e6..869ea81 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java @@ -36,8 +36,8 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -78,7 +78,7 @@ public class CqStatsUsingPoolDUnitTest extends CacheTestCase { final int cqListenerInvocations) { vm.invoke(new CacheSerializableRunnable("Validate CQs") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Validating CQ Stats. ### " + cqName); + LogWriterUtils.getLogWriter().info("### Validating CQ Stats. ### " + cqName); // Get CQ Service. QueryService qService = null; try { @@ -161,7 +161,7 @@ public class CqStatsUsingPoolDUnitTest extends CacheTestCase { final int clientsWithCqs) { vm.invoke(new CacheSerializableRunnable("Validate CQ Service Stats") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Validating CQ Service Stats. ### "); + LogWriterUtils.getLogWriter().info("### Validating CQ Service Stats. ### "); // Get CQ Service. QueryService qService = null; try { @@ -249,7 +249,7 @@ public class CqStatsUsingPoolDUnitTest extends CacheTestCase { /* Init Server and Client */ cqDUnitTest.createServer(server); final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName = "testCQStatistics"; cqDUnitTest.createPool(client, poolName, host0, port); @@ -344,7 +344,7 @@ public class CqStatsUsingPoolDUnitTest extends CacheTestCase { /* Init Server and Client */ cqDUnitTest.createServer(server); final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); String poolName1 = "testCQServiceStatistics1"; String poolName2 = "testCQServiceStatistics2"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java index 3585de2..c9aa564 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java @@ -48,8 +48,8 @@ import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.internal.cache.LocalRegion; 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; @@ -129,7 +129,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { // create client final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); createClient(client, port, host0); @@ -191,7 +191,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { // create client final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); createClient(client, port, host0); @@ -304,7 +304,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { // create client final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); createClient(client, port, host0); @@ -395,7 +395,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { // creating an accessor vm with Bridge Server installed. createServer(server1); final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); createClient(client, port, host0); @@ -493,7 +493,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { // create client final int port = server2.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server2.getHost()); + final String host0 = NetworkUtils.getServerHostName(server2.getHost()); createClient(client, port, host0); @@ -588,7 +588,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); createClient(client, port, host0); @@ -684,7 +684,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); createClient(client, port, host0); @@ -780,7 +780,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); createClient(client, port, host0); createClient(client2, port, host0); @@ -882,7 +882,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { Wait.pause(2000); final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); createClient(client, port, host0); createClient(client2, port, host0); @@ -1023,7 +1023,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); createClient(client, port, host0); createClient(client2, port, host0); @@ -1241,7 +1241,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { createServer(server2); final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server1.getHost()); + final String host0 = NetworkUtils.getServerHostName(server1.getHost()); // Initialize Client. createClient(client, port, host0); @@ -1374,7 +1374,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { createServerWithoutRootRegion(server, 0, false, 0); final int port = server.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); // Initialize Client. createCacheClient(client1, port, host0); @@ -1499,7 +1499,7 @@ public class PartitionedRegionCqQueryDUnitTest 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); @@ -1518,7 +1518,7 @@ public class PartitionedRegionCqQueryDUnitTest 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 { @@ -1548,7 +1548,7 @@ public class PartitionedRegionCqQueryDUnitTest 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); @@ -1567,7 +1567,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0); for (int i = 0; i < regions.length; i++) { Region r = createRegionWithoutRoot(regions[i], attr.create()); - LogWriterSupport.getLogWriter().info("Server created the region: "+r); + LogWriterUtils.getLogWriter().info("Server created the region: "+r); } // pause(2000); try { @@ -1618,8 +1618,8 @@ public class PartitionedRegionCqQueryDUnitTest 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; @@ -1642,7 +1642,7 @@ public class PartitionedRegionCqQueryDUnitTest 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()); } } @@ -1658,7 +1658,7 @@ public class PartitionedRegionCqQueryDUnitTest 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 { @@ -1669,7 +1669,7 @@ public class PartitionedRegionCqQueryDUnitTest 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); @@ -1679,11 +1679,11 @@ public class PartitionedRegionCqQueryDUnitTest 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; } } @@ -1722,7 +1722,7 @@ public class PartitionedRegionCqQueryDUnitTest 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()); } }); } @@ -1749,13 +1749,13 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { public void createCacheClient(VM vm, final String[] serverHosts, final int[] serverPorts, final String redundancyLevel) { vm.invoke(new CacheSerializableRunnable("createCacheClient") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Will connect to server at por: " + serverPorts[0] + " and at host : " + serverHosts[0]); ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer(serverHosts[0]/*getServerHostName(Host.getHost(0))*/, serverPorts[0]); ccf.setPoolSubscriptionEnabled(true); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); // Create Client Cache. getClientCache(ccf); @@ -1781,7 +1781,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { for (int i=0; i < regions.length; i++) { Region clientRegion = ((ClientCache)getCache()).createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) .create(regions[i]); - LogWriterSupport.getLogWriter().info("### Successfully Created Region on Client :" + clientRegion); + LogWriterUtils.getLogWriter().info("### Successfully Created Region on Client :" + clientRegion); //region1.getAttributesMutator().setCacheListener(new CqListener()); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java index 97cfd7c..659bf12 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java @@ -25,8 +25,8 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -68,7 +68,7 @@ public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends Partition final int thePort = server.invokeInt(PartitionedRegionCqQueryOptimizedExecuteDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); // Create client. createClient(client, thePort, host0); @@ -95,7 +95,7 @@ public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends Partition for (int i = numOfEntries+1; i <= numOfEntries*2; 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()); } }); @@ -166,7 +166,7 @@ public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends Partition final int thePort = server.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(server.getHost()); + final String host0 = NetworkUtils.getServerHostName(server.getHost()); // Create client. createClient(client, thePort, host0); @@ -194,7 +194,7 @@ public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends Partition for (int i = numOfEntries+1; i <= numOfEntries*2; 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()); } });
