http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java index dba995e..d1e42d3 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java @@ -50,11 +50,11 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier; import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.DistributedTestSupport; +import com.gemstone.gemfire.test.dunit.DistributedTestUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.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; @@ -127,7 +127,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { PoolFactory cpf = PoolManager.createFactory(); cpf.setSubscriptionEnabled(subscriptionEnabled); 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]); } @@ -170,7 +170,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -196,7 +196,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; // Create client pool. @@ -307,7 +307,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -332,7 +332,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; @@ -439,7 +439,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -572,7 +572,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { Properties config = new Properties(); @@ -603,7 +603,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { } catch (Exception e) { Assert.fail("Failed executing " + queryString, e); } - LogWriterSupport.getLogWriter().fine("size: " + results.size()); + LogWriterUtils.getLogWriter().fine("size: " + results.size()); //assertEquals(numberOfEntries, results.size()); assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType()); } @@ -635,7 +635,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -661,7 +661,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; @@ -842,7 +842,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -867,7 +867,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { for (int i=0; i < queryString.length; i++){ try { - LogWriterSupport.getLogWriter().info("### Executing Query :" + queryString[i]); + LogWriterUtils.getLogWriter().info("### Executing Query :" + queryString[i]); Query query = qService.newQuery(queryString[i]); results = (SelectResults)query.execute(params[i]); } catch (Exception e) { @@ -900,7 +900,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { for (int x=0; x < useMaintainedCompiledQueries; x++){ for (int i=0; i < queryString.length; i++){ try { - LogWriterSupport.getLogWriter().info("### Executing Query :" + queryString[i]); + LogWriterUtils.getLogWriter().info("### Executing Query :" + queryString[i]); Query query = qService.newQuery(queryString[i]); results = (SelectResults)query.execute(params[i]); } catch (Exception e) { @@ -1001,7 +1001,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { final int port0 = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); final int port1 = vm1.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -1026,7 +1026,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { for (int j=0; j < queryString.length; j++){ for (int i=0; i < queryString.length; i++){ try { - LogWriterSupport.getLogWriter().info("### Executing Query :" + queryString[i]); + LogWriterUtils.getLogWriter().info("### Executing Query :" + queryString[i]); Query query = qService.newQuery(queryString[i]); results = (SelectResults)query.execute(params[i]); } catch (Exception e) { @@ -1152,7 +1152,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -1243,7 +1243,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -1363,7 +1363,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -1509,7 +1509,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { // Create client region final int port0 = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -1535,7 +1535,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { for (int j=0; j < 5; j++){ for (int i=0; i < 2; i++){ try { - LogWriterSupport.getLogWriter().info("### Executing Query :" + queryString[i]); + LogWriterUtils.getLogWriter().info("### Executing Query :" + queryString[i]); Query query = qService.newQuery(queryString[i]); rs[0][0] = (SelectResults)query.execute(params[i]); Query query2 = qService.newQuery(querys[i]); @@ -1544,9 +1544,9 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { } catch (Exception e) { Assert.fail("Failed executing " + queryString[i], e); } - LogWriterSupport.getLogWriter().info("### Comparing results for Query :" + ((i+1) * (j+1)) + " : " + queryString[i]); + LogWriterUtils.getLogWriter().info("### Comparing results for Query :" + ((i+1) * (j+1)) + " : " + queryString[i]); compareQueryResultsWithoutAndWithIndexes(rs, 1); - LogWriterSupport.getLogWriter().info("### Done Comparing results for Query :" + ((i+1) * (j+1)) + " : " + queryString[i]); + LogWriterUtils.getLogWriter().info("### Done Comparing results for Query :" + ((i+1) * (j+1)) + " : " + queryString[i]); } } } @@ -1561,9 +1561,9 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { public void run2() throws CacheException { long compiledQueryUsedCount = -1; while (true) { - LogWriterSupport.getLogWriter().info("### CompiledQueryUsedCount :" + compiledQueryUsedCount); + LogWriterUtils.getLogWriter().info("### CompiledQueryUsedCount :" + compiledQueryUsedCount); if (compiledQueryUsedCount == CacheClientNotifier.getInstance().getStats().getCompiledQueryUsedCount()) { - LogWriterSupport.getLogWriter().info("### previous and current CompiledQueryUsedCounts are same :" + compiledQueryUsedCount); + LogWriterUtils.getLogWriter().info("### previous and current CompiledQueryUsedCounts are same :" + compiledQueryUsedCount); break; } else { compiledQueryUsedCount = CacheClientNotifier.getInstance().getStats().getCompiledQueryUsedCount(); @@ -1595,7 +1595,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { for (int j=0; j < queryString.length; j++){ for (int i=0; i < queryString.length; i++){ try { - LogWriterSupport.getLogWriter().info("### Executing Query :" + queryString[i]); + LogWriterUtils.getLogWriter().info("### Executing Query :" + queryString[i]); Query query = qService.newQuery(queryString[i]); rs[0][0] = (SelectResults)query.execute(params[i]); Query query2 = qService.newQuery(querys[i]); @@ -1619,9 +1619,9 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { public void run2() throws CacheException { long compiledQueryUsedCount = -1; while (true) { - LogWriterSupport.getLogWriter().info("### previous CompiledQueryUsedCount :" + compiledQueryUsedCount); + LogWriterUtils.getLogWriter().info("### previous CompiledQueryUsedCount :" + compiledQueryUsedCount); if (compiledQueryUsedCount == CacheClientNotifier.getInstance().getStats().getCompiledQueryUsedCount()) { - LogWriterSupport.getLogWriter().info("### previous and current CompiledQueryUsedCounts are same :" + compiledQueryUsedCount); + LogWriterUtils.getLogWriter().info("### previous and current CompiledQueryUsedCounts are same :" + compiledQueryUsedCount); break; } else { compiledQueryUsedCount = CacheClientNotifier.getInstance().getStats().getCompiledQueryUsedCount(); @@ -1665,7 +1665,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1696,7 +1696,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName1 = "/" + rootRegionName + "/" + name+"1"; final String regionName2 = "/" + rootRegionName + "/" + name+"2"; @@ -1768,7 +1768,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1793,7 +1793,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; @@ -1906,7 +1906,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); Wait.pause(1000); @@ -1941,7 +1941,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName1 = "/" + rootRegionName + "/" + name; final String regionName2 = "/" + rootRegionName + "/" + name + "_2"; @@ -2002,7 +2002,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -2036,7 +2036,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; @@ -2160,7 +2160,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); Wait.pause(1000); @@ -2187,7 +2187,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName1 = "/" + rootRegionName + "/" + name; // final String regionName2 = "/" + rootRegionName + "/" + name + "_2"; @@ -2305,16 +2305,16 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { type1 = ((SelectResults)r[j][0]).getCollectionType().getElementType(); type2 = ((SelectResults)r[j][1]).getCollectionType().getElementType(); if ((type1.getClass().getName()).equals(type2.getClass().getName())) { - LogWriterSupport.getLogWriter().info("Both SelectResults are of the same Type i.e.--> " + LogWriterUtils.getLogWriter().info("Both SelectResults are of the same Type i.e.--> " + ((SelectResults)r[j][0]).getCollectionType().getElementType()); } else { - LogWriterSupport.getLogWriter().info("Classes are : " + type1.getClass().getName() + " " + LogWriterUtils.getLogWriter().info("Classes are : " + type1.getClass().getName() + " " + type2.getClass().getName()); fail("FAILED:Select result Type is different in both the cases"); } if (((SelectResults)r[j][0]).size() == ((SelectResults)r[j][1]).size()) { - LogWriterSupport.getLogWriter().info("Both SelectResults are of Same Size i.e. Size= " + LogWriterUtils.getLogWriter().info("Both SelectResults are of Same Size i.e. Size= " + ((SelectResults)r[j][1]).size()); } else { @@ -2325,7 +2325,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { set2 = (((SelectResults)r[j][1]).asSet()); set1 = (((SelectResults)r[j][0]).asSet()); - LogWriterSupport.getLogWriter().info(" SIZE1 = " + set1.size() + " SIZE2 = " + set2.size()); + LogWriterUtils.getLogWriter().info(" SIZE1 = " + set1.size() + " SIZE2 = " + set2.size()); // boolean pass = true; itert1 = set1.iterator(); @@ -2335,10 +2335,10 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { boolean exactMatch = false; while (itert2.hasNext()) { - LogWriterSupport.getLogWriter().info("### Comparing results.."); + LogWriterUtils.getLogWriter().info("### Comparing results.."); Object p2 = itert2.next(); if (p1 instanceof Struct) { - LogWriterSupport.getLogWriter().info("ITS a Set"); + LogWriterUtils.getLogWriter().info("ITS a Set"); Object[] values1 = ((Struct)p1).getFieldValues(); Object[] values2 = ((Struct)p2).getFieldValues(); assertEquals(values1.length, values2.length); @@ -2351,32 +2351,32 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { exactMatch = elementEqual; } else { - LogWriterSupport.getLogWriter().info("Not a Set p2:" + p2 + " p1: " + p1); + LogWriterUtils.getLogWriter().info("Not a Set p2:" + p2 + " p1: " + p1); if (p2 instanceof TestObject) { - LogWriterSupport.getLogWriter().info("An instance of TestObject"); + LogWriterUtils.getLogWriter().info("An instance of TestObject"); exactMatch = p2.equals(p1); } else { - LogWriterSupport.getLogWriter().info("Not an instance of TestObject" + p2.getClass().getCanonicalName()); + LogWriterUtils.getLogWriter().info("Not an instance of TestObject" + p2.getClass().getCanonicalName()); exactMatch = p2.equals(p1); } } if (exactMatch) { - LogWriterSupport.getLogWriter().info("Exact MATCH"); + LogWriterUtils.getLogWriter().info("Exact MATCH"); break; } } if (!exactMatch) { - LogWriterSupport.getLogWriter().info("NOT A MATCH"); + LogWriterUtils.getLogWriter().info("NOT A MATCH"); fail("Atleast one element in the pair of SelectResults supposedly identical, is not equal "); } } - LogWriterSupport.getLogWriter().info("### Done Comparing results.."); + LogWriterUtils.getLogWriter().info("### Done Comparing results.."); } } protected void configAndStartBridgeServer() { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -2403,7 +2403,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { for (int i=0; i < queryString.length; i++){ try { - LogWriterSupport.getLogWriter().info("### Executing Query :" + queryString[i]); + LogWriterUtils.getLogWriter().info("### Executing Query :" + queryString[i]); Query query = qService.newQuery(queryString[i]); results = (SelectResults)query.execute(params[i]); } catch (Exception e) { @@ -2442,11 +2442,11 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase { SerializableRunnable closeCache = new CacheSerializableRunnable("Close Client") { public void run2() throws CacheException { - LogWriterSupport.getLogWriter().info("### Close Client. ###"); + LogWriterUtils.getLogWriter().info("### Close Client. ###"); try { closeCache(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("### Failed to get close client. ###"); + LogWriterUtils.getLogWriter().info("### Failed to get close client. ###"); } } };
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java index 4be7218..fc79893 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java @@ -43,10 +43,10 @@ import com.gemstone.gemfire.cache30.ClientServerTestCase; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.test.dunit.Assert; -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.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -98,7 +98,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -124,7 +124,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { Properties config = new Properties(); @@ -241,7 +241,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -267,7 +267,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { Properties config = new Properties(); @@ -369,7 +369,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -395,7 +395,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { Properties config = new Properties(); @@ -495,7 +495,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -628,7 +628,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { Properties config = new Properties(); @@ -659,7 +659,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { } catch (Exception e) { Assert.fail("Failed executing " + queryString, e); } - LogWriterSupport.getLogWriter().fine("size: " + results.size()); + LogWriterUtils.getLogWriter().fine("size: " + results.size()); //assertEquals(numberOfEntries, results.size()); assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType()); } @@ -689,7 +689,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -715,7 +715,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { Properties config = new Properties(); @@ -854,7 +854,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -885,7 +885,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { Properties config = new Properties(); @@ -955,7 +955,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -979,7 +979,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Create client region in VM1 vm1.invoke(new CacheSerializableRunnable("Create region") { @@ -1114,7 +1114,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1138,7 +1138,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Create client region in VM1 vm1.invoke(new CacheSerializableRunnable("Create region") { @@ -1218,7 +1218,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); system = (InternalDistributedSystem) DistributedSystem.connect(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1249,7 +1249,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase { }); final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Create client region in VM1 vm1.invoke(new CacheSerializableRunnable("Create region") { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java index f889d21..85ae9aa 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java @@ -66,14 +66,13 @@ import com.gemstone.gemfire.internal.cache.control.ResourceListener; import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; 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.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.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; public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCase { @@ -727,7 +726,7 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa //unless otherwise configured releaseHook(server); - Threads.join(queryExecution, 60000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(queryExecution, 60000); //Make sure no exceptions were thrown during query testing try { assertEquals(0, queryExecution.getResult()); @@ -1024,7 +1023,7 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa getSystem(props); final ClientCacheFactory ccf = new ClientCacheFactory(props); - ccf.addPoolServer(NetworkSupport.getServerHostName(server.getHost()), port); + ccf.addPoolServer(NetworkUtils.getServerHostName(server.getHost()), port); ClientCache cache = (ClientCache)getClientCache(ccf); } }); @@ -1039,7 +1038,7 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa getSystem(props); PoolFactory pf = PoolManager.createFactory(); - pf.addServer(NetworkSupport.getServerHostName(server.getHost()), port); + pf.addServer(NetworkUtils.getServerHostName(server.getHost()), port); pf.create("pool1"); AttributesFactory af = new AttributesFactory(); @@ -1061,7 +1060,7 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa protected Properties getServerProperties(boolean disableQueryMonitorForMemory, int queryTimeout) { Properties p = new Properties(); - p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); return p; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java index 92d8e97..90ee7f7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java @@ -42,8 +42,8 @@ import com.gemstone.gemfire.internal.cache.VMCachedDeserializable; import com.gemstone.gemfire.pdx.PdxInstance; 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.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; @@ -119,9 +119,9 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory(); - cf.addPoolServer(NetworkSupport.getServerHostName(server1.getHost()), port1); - cf.addPoolServer(NetworkSupport.getServerHostName(server2.getHost()), port2); - cf.addPoolServer(NetworkSupport.getServerHostName(server3.getHost()), port3); + cf.addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port1); + cf.addPoolServer(NetworkUtils.getServerHostName(server2.getHost()), port2); + cf.addPoolServer(NetworkUtils.getServerHostName(server3.getHost()), port3); ClientCache cache = getClientCache(cf); cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) .create(regName); @@ -145,7 +145,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { client.invoke(new SerializableCallable("Query") { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().info("Querying remotely from client"); + LogWriterUtils.getLogWriter().info("Querying remotely from client"); QueryService localQS = null; QueryService remoteQS = null; try { @@ -291,7 +291,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory(); - cf.addPoolServer(NetworkSupport.getServerHostName(server1.getHost()), port1); + cf.addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port1); ClientCache cache = getClientCache(cf); cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) .create(regName); @@ -319,7 +319,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { client.invoke(new SerializableCallable("Query") { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().info("Querying remotely from client"); + LogWriterUtils.getLogWriter().info("Querying remotely from client"); QueryService localQS = null; QueryService remoteQS = null; try { @@ -491,7 +491,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory(); - cf.addPoolServer(NetworkSupport.getServerHostName(server1.getHost()), port); + cf.addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port); ClientCache cache = getClientCache(cf); cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) .create(regName); @@ -515,7 +515,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { client.invoke(new SerializableCallable("Query") { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().info("Querying remotely from client"); + LogWriterUtils.getLogWriter().info("Querying remotely from client"); QueryService localQS = null; QueryService remoteQS = null; try { @@ -664,9 +664,9 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory(); - cf.addPoolServer(NetworkSupport.getServerHostName(server1.getHost()), port1); - cf.addPoolServer(NetworkSupport.getServerHostName(server2.getHost()), port2); - cf.addPoolServer(NetworkSupport.getServerHostName(server3.getHost()), port3); + cf.addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port1); + cf.addPoolServer(NetworkUtils.getServerHostName(server2.getHost()), port2); + cf.addPoolServer(NetworkUtils.getServerHostName(server3.getHost()), port3); ClientCache cache = getClientCache(cf); cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) .create(regName); @@ -690,7 +690,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { client.invoke(new SerializableCallable("Query") { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().info("Querying remotely from client"); + LogWriterUtils.getLogWriter().info("Querying remotely from client"); QueryService localQS = null; QueryService remoteQS = null; try { @@ -820,7 +820,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory(); - cf.addPoolServer(NetworkSupport.getServerHostName(server1.getHost()), port1); + cf.addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port1); ClientCache cache = getClientCache(cf); cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) .create(regName); @@ -864,7 +864,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { client.invoke(new SerializableCallable("Query") { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().info("Querying remotely from client"); + LogWriterUtils.getLogWriter().info("Querying remotely from client"); QueryService localQS = null; QueryService remoteQS = null; try { @@ -940,7 +940,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { client.invoke(new SerializableCallable("Query") { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().info("Querying remotely from client"); + LogWriterUtils.getLogWriter().info("Querying remotely from client"); QueryService localQS = null; QueryService remoteQS = null; try { @@ -1022,7 +1022,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory(); - cf.addPoolServer(NetworkSupport.getServerHostName(server1.getHost()), port1); + cf.addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port1); ClientCache cache = getClientCache(cf); cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) .create(regName); @@ -1046,7 +1046,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { client.invoke(new SerializableCallable("Query") { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().info("Querying remotely from client"); + LogWriterUtils.getLogWriter().info("Querying remotely from client"); QueryService localQS = null; QueryService remoteQS = null; try { @@ -1243,7 +1243,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory(); - cf.addPoolServer(NetworkSupport.getServerHostName(server1.getHost()), port1); + cf.addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port1); ClientCache cache = getClientCache(cf); cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) .create(regName); @@ -1267,7 +1267,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { client.invoke(new SerializableCallable("Query") { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().info("Querying remotely from client"); + LogWriterUtils.getLogWriter().info("Querying remotely from client"); QueryService localQS = null; QueryService remoteQS = null; try { @@ -1470,7 +1470,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { @Override public Object call() throws Exception { ClientCacheFactory cf = new ClientCacheFactory(); - cf.addPoolServer(NetworkSupport.getServerHostName(server1.getHost()), port); + cf.addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port); ClientCache cache = getClientCache(cf); cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) .create(regName); @@ -1486,7 +1486,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { client.invoke(new SerializableCallable("Query") { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().info("Querying remotely from client"); + LogWriterUtils.getLogWriter().info("Querying remotely from client"); QueryService localQS = null; QueryService remoteQS = null; try { @@ -1605,10 +1605,10 @@ public class SelectStarQueryDUnitTest extends CacheTestCase { public void beforeIterationEvaluation(CompiledValue executer, Object currentObject) { if (currentObject instanceof VMCachedDeserializable) { - LogWriterSupport.getLogWriter().fine("currentObject is serialized object"); + LogWriterUtils.getLogWriter().fine("currentObject is serialized object"); isObjectSerialized = true; } else { - LogWriterSupport.getLogWriter().fine("currentObject is deserialized object"); + LogWriterUtils.getLogWriter().fine("currentObject is deserialized object"); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java index d3c2925..57846a8 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java @@ -46,7 +46,7 @@ import com.gemstone.gemfire.cache.query.IndexType; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.util.CacheWriterAdapter; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -190,7 +190,7 @@ public class IndexCreationDeadLockJUnitTest Thread th = new IndexCreationDeadLockJUnitTest.PutThread("put thread"); th.start(); - Threads.join(th, 60 * 1000, null); + ThreadUtils.join(th, 60 * 1000); } /** @@ -294,7 +294,7 @@ public class IndexCreationDeadLockJUnitTest Thread indxCreationThread = new HelperThread("index creator thread"); indxCreationThread.start(); try { - Threads.join(indxCreationThread, 30 * 1000, null); + ThreadUtils.join(indxCreationThread, 30 * 1000); } catch (Exception e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java index 97918db..0bfad5e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java @@ -57,7 +57,7 @@ import com.gemstone.gemfire.cache.query.internal.ResultsCollectionWrapper; import com.gemstone.gemfire.cache.query.internal.index.IndexManager; import com.gemstone.gemfire.cache.query.internal.index.IndexManager.TestHook; import com.gemstone.gemfire.cache.query.internal.types.ObjectTypeImpl; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -2054,7 +2054,7 @@ public class LikePredicateJUnitTest { assertEquals(5, rs[0][0].size()); // wait for remove to complete - Threads.join(LikeQueryIndexTestHook.th, 60 * 1000, null); + ThreadUtils.join(LikeQueryIndexTestHook.th, 60 * 1000); // The index should have been removed by now assertEquals(0, cache.getQueryService().getIndexes().size()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java index 4a767c7..41d6d62 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java @@ -44,7 +44,7 @@ import com.gemstone.gemfire.cache.query.SelectResults; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.data.Position; import com.gemstone.gemfire.internal.cache.InternalCache; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -368,7 +368,7 @@ public class ExecutionContextJUnitTest { for (int i =0; i < th.length ;++i) { try { - Threads.join(th[i], 30 * 1000, null); + ThreadUtils.join(th[i], 30 * 1000); }catch(Exception e) { fail(e.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java index 4de8559..eeaa36c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.query.CacheUtils; import com.gemstone.gemfire.cache.query.IndexType; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.cache.query.data.Portfolio; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -248,7 +248,7 @@ public class AsynchIndexMaintenanceJUnitTest { } try { for (int i = 0; i < TOTAL_THREADS; ++i) { - Threads.join(threads[i], 30 * 1000, null); + ThreadUtils.join(threads[i], 30 * 1000); } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java index 1a1a1e1..5528299 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java @@ -47,9 +47,9 @@ import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl; 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.Threads; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -116,7 +116,7 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase RegionFactory regionFactory = cache.createRegionFactory(attr.create()); partitionRegion = regionFactory.create(name); } catch (IllegalStateException ex) { - LogWriterSupport.getLogWriter().warning("Creation caught IllegalStateException", ex); + LogWriterUtils.getLogWriter().warning("Creation caught IllegalStateException", ex); } assertNotNull("Region " + name + " not in cache", cache.getRegion(name)); assertNotNull("Region ref null", partitionRegion); @@ -184,10 +184,8 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase }); // If we take more than 30 seconds then its a deadlock. - Threads.join(asyncInv2, 30 * 1000, PRQHelp.getCache() - .getLogger()); - Threads.join(asyncInv1, 30 * 1000, PRQHelp.getCache() - .getLogger()); + ThreadUtils.join(asyncInv2, 30 * 1000); + ThreadUtils.join(asyncInv1, 30 * 1000); } /** @@ -236,7 +234,7 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase RegionFactory regionFactory = cache.createRegionFactory(attr.create()); partitionRegion = regionFactory.create(name); } catch (IllegalStateException ex) { - LogWriterSupport.getLogWriter().warning("Creation caught IllegalStateException", ex); + LogWriterUtils.getLogWriter().warning("Creation caught IllegalStateException", ex); } catch (IOException e) { e.printStackTrace(); } @@ -258,7 +256,7 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase final int port = vm0.invokeInt(ConcurrentIndexInitOnOverflowRegionDUnitTest.class, "getCacheServerPort"); - final String host0 = NetworkSupport.getServerHostName(vm0.getHost()); + final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Start changing the value in Region which should turn into a deadlock if // the fix is not there @@ -327,10 +325,8 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase }); // If we take more than 30 seconds then its a deadlock. - Threads.join(asyncInv2, 30 * 1000, PRQHelp.getCache() - .getLogger()); - Threads.join(asyncInv1, 30 * 1000, PRQHelp.getCache() - .getLogger()); + ThreadUtils.join(asyncInv2, 30 * 1000); + ThreadUtils.join(asyncInv1, 30 * 1000); vm0.invoke(new CacheSerializableRunnable("Set Test Hook") { @@ -435,8 +431,7 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase }); // Kill asynch thread - Threads.join(indexUpdateAsysnch, 20000, PRQHelp.getCache() - .getLogger()); + ThreadUtils.join(indexUpdateAsysnch, 20000); //Verify region size which must be 50 vm0.invoke(new CacheSerializableRunnable("Check region size") { @@ -457,7 +452,7 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase switch (spot) { case 6: // Before Index update and after region entry lock. hooked = true; - LogWriterSupport.getLogWriter().fine("IndexManagerTestHook is hooked."); + LogWriterUtils.getLogWriter().fine("IndexManagerTestHook is hooked."); Wait.pause(10000); hooked = false; break; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java index 3a70271..81482b4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java @@ -46,8 +46,8 @@ import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegionQueryEvaluator.TestHook; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -117,7 +117,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends RegionFactory regionFactory = cache.createRegionFactory(attr.create()); partitionRegion = regionFactory.create(name); } catch (IllegalStateException ex) { - LogWriterSupport.getLogWriter().warning("Creation caught IllegalStateException", ex); + LogWriterUtils.getLogWriter().warning("Creation caught IllegalStateException", ex); } assertNotNull("Region " + name + " not in cache", cache.getRegion(name)); assertNotNull("Region ref null", partitionRegion); @@ -182,8 +182,8 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends }); //If we take more than 30 seconds then its a deadlock. - Threads.join(asyncInv2, 30*1000, PRQHelp.getCache().getLogger()); - Threads.join(asyncInv1, 30*1000, PRQHelp.getCache().getLogger()); + ThreadUtils.join(asyncInv2, 30*1000); + ThreadUtils.join(asyncInv1, 30*1000); } /** @@ -219,7 +219,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends RegionFactory regionFactory = cache.createRegionFactory(attr.create()); partitionRegion = regionFactory.create(name); } catch (IllegalStateException ex) { - LogWriterSupport.getLogWriter().warning("Creation caught IllegalStateException", ex); + LogWriterUtils.getLogWriter().warning("Creation caught IllegalStateException", ex); } assertNotNull("Region " + name + " not in cache", cache.getRegion(name)); assertNotNull("Region ref null", partitionRegion); @@ -284,8 +284,8 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends }); //If we take more than 30 seconds then its a deadlock. - Threads.join(asyncInv2, 30*1000, PRQHelp.getCache().getLogger()); - Threads.join(asyncInv1, 30*1000, PRQHelp.getCache().getLogger()); + ThreadUtils.join(asyncInv2, 30*1000); + ThreadUtils.join(asyncInv1, 30*1000); } /** @@ -324,7 +324,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends RegionFactory regionFactory = cache.createRegionFactory(attr.create()); partitionRegion = regionFactory.create(name); } catch (IllegalStateException ex) { - LogWriterSupport.getLogWriter().warning("Creation caught IllegalStateException", ex); + LogWriterUtils.getLogWriter().warning("Creation caught IllegalStateException", ex); } assertNotNull("Region " + name + " not in cache", cache.getRegion(name)); assertNotNull("Region ref null", partitionRegion); @@ -393,10 +393,8 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends }); // If we take more than 30 seconds then its a deadlock. - Threads.join(asyncInv2, 30 * 1000, PRQHelp.getCache() - .getLogger()); - Threads.join(asyncInv1, 30 * 1000, PRQHelp.getCache() - .getLogger()); + ThreadUtils.join(asyncInv2, 30 * 1000); + ThreadUtils.join(asyncInv1, 30 * 1000); } /** @@ -435,7 +433,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends RegionFactory regionFactory = cache.createRegionFactory(attr.create()); partitionRegion = regionFactory.create(name); } catch (IllegalStateException ex) { - LogWriterSupport.getLogWriter().warning("Creation caught IllegalStateException", ex); + LogWriterUtils.getLogWriter().warning("Creation caught IllegalStateException", ex); } assertNotNull("Region " + name + " not in cache", cache.getRegion(name)); assertNotNull("Region ref null", partitionRegion); @@ -504,10 +502,8 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends }); // If we take more than 30 seconds then its a deadlock. - Threads.join(asyncInv2, 30 * 1000, PRQHelp.getCache() - .getLogger()); - Threads.join(asyncInv1, 30 * 1000, PRQHelp.getCache() - .getLogger()); + ThreadUtils.join(asyncInv2, 30 * 1000); + ThreadUtils.join(asyncInv1, 30 * 1000); } /** @@ -534,7 +530,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends RegionFactory regionFactory = cache.createRegionFactory(attr.create()); partitionRegion = regionFactory.create(name); } catch (IllegalStateException ex) { - LogWriterSupport.getLogWriter().warning("Creation caught IllegalStateException", ex); + LogWriterUtils.getLogWriter().warning("Creation caught IllegalStateException", ex); } assertNotNull("Region " + name + " not in cache", cache.getRegion(name)); assertNotNull("Region ref null", partitionRegion); @@ -599,8 +595,8 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends }); //If we take more than 30 seconds then its a deadlock. - Threads.join(asyncInv2, 30*1000, PRQHelp.getCache().getLogger()); - Threads.join(asyncInv1, 30*1000, PRQHelp.getCache().getLogger()); + ThreadUtils.join(asyncInv2, 30*1000); + ThreadUtils.join(asyncInv1, 30*1000); } /** @@ -627,7 +623,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends RegionFactory regionFactory = cache.createRegionFactory(attr.create()); partitionRegion = regionFactory.create(name); } catch (IllegalStateException ex) { - LogWriterSupport.getLogWriter().warning("Creation caught IllegalStateException", ex); + LogWriterUtils.getLogWriter().warning("Creation caught IllegalStateException", ex); } assertNotNull("Region " + name + " not in cache", cache.getRegion(name)); assertNotNull("Region ref null", partitionRegion); @@ -692,8 +688,8 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends }); //If we take more than 30 seconds then its a deadlock. - Threads.join(asyncInv2, 30*1000, PRQHelp.getCache().getLogger()); - Threads.join(asyncInv1, 30*1000, PRQHelp.getCache().getLogger()); + ThreadUtils.join(asyncInv2, 30*1000); + ThreadUtils.join(asyncInv1, 30*1000); } public class IndexManagerTestHook implements com.gemstone.gemfire.cache.query.internal.index.IndexManager.TestHook{ @@ -701,7 +697,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends switch (spot) { case 5: //Before Index update and after region entry lock. hooked = true; - LogWriterSupport.getLogWriter().fine("IndexManagerTestHook is hooked."); + LogWriterUtils.getLogWriter().fine("IndexManagerTestHook is hooked."); Wait.pause(10000); //hooked = false; break; @@ -715,7 +711,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends switch (spot) { case 5: //Before Index update and after region entry lock. hooked = true; - LogWriterSupport.getLogWriter().fine("IndexManagerTestHook is hooked."); + LogWriterUtils.getLogWriter().fine("IndexManagerTestHook is hooked."); Wait.pause(100); // hooked = false; break; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java index 0b3b194..4c83562 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java @@ -46,10 +46,10 @@ import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; /** * This test is similar to {@link ConcurrentIndexUpdateWithoutWLDUnitTest} except @@ -149,7 +149,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends asyncInvs[1] = vm0.invokeAsync(helper.getCacheSerializableRunnableForPRRandomOps(regionName, 0, stepSize)); for (AsyncInvocation inv : asyncInvs) { - Threads.join(inv, 30*000, helper.getCache().getLogger()); + ThreadUtils.join(inv, 30*000); } for (AsyncInvocation inv : asyncInvs) { @@ -194,7 +194,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends asyncInvs[1] = vm0.invokeAsync(helper.getCacheSerializableRunnableForPRRandomOps(regionName, 0, totalDataSize)); for (AsyncInvocation inv : asyncInvs) { - Threads.join(inv, 30*000, helper.getCache().getLogger()); + ThreadUtils.join(inv, 30*000); } for (AsyncInvocation inv : asyncInvs) { if (inv.exceptionOccurred()) { @@ -252,7 +252,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends asyncInvs[11] = vm3.invokeAsync(helper.getCacheSerializableRunnableForPRRandomOps(regionName, (3 * (stepSize)), totalDataSize )); for (AsyncInvocation inv : asyncInvs) { - Threads.join(inv, 60*000, helper.getCache().getLogger()); + ThreadUtils.join(inv, 60*000); } for (AsyncInvocation inv : asyncInvs) { @@ -315,7 +315,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends asyncInvs[11] = vm3.invokeAsync(helper.getCacheSerializableRunnableForPRRandomOps(regionName, (3 * (stepSize)), totalDataSize )); for (AsyncInvocation inv : asyncInvs) { - Threads.join(inv, 60*000, helper.getCache().getLogger()); + ThreadUtils.join(inv, 60*000); } for (AsyncInvocation inv : asyncInvs) { if (inv.exceptionOccurred()) { @@ -394,7 +394,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends if (index instanceof CompactRangeIndex) { // Ignore invalid values. if (value != Token.INVALID && value != Token.TOMBSTONE) { - LogWriterSupport.getLogWriter().info("Portfolio: "+ ((Portfolio)value)); + LogWriterUtils.getLogWriter().info("Portfolio: "+ ((Portfolio)value)); Integer ID = ((Portfolio) value).getID(); assertTrue("Did not find index key for REgionEntry [key: " @@ -432,7 +432,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends expectedNullEntries++; } } else { - LogWriterSupport.getLogWriter().info(internalEntry.getKey()+""); + LogWriterUtils.getLogWriter().info(internalEntry.getKey()+""); expectedUndefinedEntries++; } } @@ -444,7 +444,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends Collection<Position> positions = ((Portfolio)value).positions.values(); for (Position pos : positions) { if (pos != null) { - LogWriterSupport.getLogWriter().info("Portfolio: "+ ((Portfolio)value) + "Position: " + pos); + LogWriterUtils.getLogWriter().info("Portfolio: "+ ((Portfolio)value) + "Position: " + pos); String secId = pos.secId; assertTrue("Did not find index key for REgionEntry [key: " + internalEntry.getKey() + " , value: " + value @@ -527,21 +527,21 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends .toArray()) { getLogWriter().info(((RegionEntry) obj).getKey() + ""); } -*/ LogWriterSupport.getLogWriter().info( +*/ LogWriterUtils.getLogWriter().info( " Expected Size of Index is: " + expectedIndexSize + " Undefined size is: " + expectedUndefinedEntries + " And NULL size is: " + expectedNullEntries); assertEquals("No of index keys NOT equals the no shown in statistics for index:" + index.getName(), ((CompactRangeIndex) index).getIndexStorage().size(), stats.getNumberOfKeys()); } else { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " Actual Size of Index is: " + actualSize + " Undefined size is: " + ((RangeIndex) index).undefinedMappedEntries.getNumEntries() + " And NULL size is: " + ((RangeIndex) index).nullMappedEntries.getNumEntries()); for (Object obj : ((RangeIndex) index).undefinedMappedEntries.map.keySet()) { - LogWriterSupport.getLogWriter().info(((RegionEntry) obj).getKey() + ""); + LogWriterUtils.getLogWriter().info(((RegionEntry) obj).getKey() + ""); } - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " Expected Size of Index is: " + expectedIndexSize + " Undefined size is: " + expectedUndefinedEntries + " And NULL size is: " + expectedNullEntries); @@ -587,7 +587,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends if (index instanceof CompactRangeIndex) { // Ignore invalid values. if (value != Token.INVALID && value != Token.TOMBSTONE) { - LogWriterSupport.getLogWriter().info("Portfolio: "+ ((Portfolio)value)); + LogWriterUtils.getLogWriter().info("Portfolio: "+ ((Portfolio)value)); Integer ID = ((Portfolio) value).getID(); assertTrue("Did not find index key for REgionEntry [key: " @@ -635,7 +635,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends Collection<Position> positions = ((Portfolio)value).positions.values(); for (Position pos : positions) { if (pos != null) { - LogWriterSupport.getLogWriter().info("Portfolio: "+ ((Portfolio)value) + "Position: " + pos); + LogWriterUtils.getLogWriter().info("Portfolio: "+ ((Portfolio)value) + "Position: " + pos); String secId = pos.secId; assertTrue("Did not find index key for REgionEntry [key: " + internalEntry.getKey() + " , value: " + value
