http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java index 0cbede3..d5badab 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java @@ -47,10 +47,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; /** * @@ -125,7 +125,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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) { @@ -166,7 +166,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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) { @@ -210,7 +210,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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()) { @@ -268,7 +268,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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) { @@ -330,7 +330,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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()) { @@ -402,7 +402,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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) { @@ -481,7 +481,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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: " @@ -517,7 +517,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends expectedNullEntries++; } } else { - LogWriterSupport.getLogWriter().info(internalEntry.getKey()+""); + LogWriterUtils.getLogWriter().info(internalEntry.getKey()+""); expectedUndefinedEntries++; } } @@ -529,7 +529,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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 @@ -603,7 +603,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends IndexStatistics stats = index.getStatistics(); if (index instanceof CompactRangeIndex) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " Actual Size of Index is: " + actualSize); /* getLogWriter().info( " Actual Size of Index is: " + actualSize + " Undefined size is: " @@ -615,21 +615,21 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends 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); @@ -674,7 +674,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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: " @@ -722,7 +722,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest 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 @@ -769,7 +769,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends try { iter = ((CompactRangeIndex) index).getIndexStorage().iterator(null); while (iter.hasNext()) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Index Values : " + iter.next().getDeserializedValue()); actualValueSize++; }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java index ab10a18..d44c7f6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java @@ -43,10 +43,10 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegion; 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.Invoke; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -613,7 +613,7 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase { getSystem(props); final ClientCacheFactory ccf = new ClientCacheFactory(props); - ccf.addPoolServer(NetworkSupport.getServerHostName(server.getHost()), port); + ccf.addPoolServer(NetworkUtils.getServerHostName(server.getHost()), port); ccf.setPoolSubscriptionEnabled(true); ClientCache cache = (ClientCache)getClientCache(ccf); @@ -630,7 +630,7 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase { protected Properties getServerProperties() { Properties p = new Properties(); - p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); return p; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexCreationInternalsJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexCreationInternalsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexCreationInternalsJUnitTest.java index 4f2724c..7df9a5b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexCreationInternalsJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexCreationInternalsJUnitTest.java @@ -45,7 +45,7 @@ import com.gemstone.gemfire.cache.query.internal.CompiledRegion; import com.gemstone.gemfire.cache.query.internal.QCompiler; import com.gemstone.gemfire.cache.query.internal.types.TypeUtils; import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -199,8 +199,8 @@ public class IndexCreationInternalsJUnitTest { th1.start(); th2.start(); name = imgr.putCanonicalizedIteratorNameIfAbsent("index_iter1.coll1"); - Threads.join(th1, 30 * 1000, null); - Threads.join(th2, 30 * 1000, null); + ThreadUtils.join(th1, 30 * 1000); + ThreadUtils.join(th2, 30 * 1000); if( !(name.equals(this.childThreadName1) && name.equals(this.childThreadName2)) ) { fail("Canonicalization name generation test failed in concurrent scenario as first name is "+this.childThreadName1 + "and second is "+name + " and third is "+this.childThreadName2); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java index bea41e9..c1d39b9 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexMaintainceJUnitTest.java @@ -51,7 +51,7 @@ import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.functional.StructSetOrResultsSet; import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter; import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -322,7 +322,7 @@ public class IndexMaintainceJUnitTest { } }); th.start(); - Threads.join(th, 30 * 1000, null); + ThreadUtils.join(th, 30 * 1000); assertTrue(IndexMaintainceJUnitTest.region.size() == 1); } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java index 5dc75ef..d9b0d5e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java @@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionQueryEvaluator.TestH import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -275,7 +275,7 @@ public class IndexTrackingQueryObserverDUnitTest extends CacheTestCase { totalResults += i.intValue(); } - LogWriterSupport.getLogWriter().fine("Index Info result size is " + totalResults); + LogWriterUtils.getLogWriter().fine("Index Info result size is " + totalResults); assertEquals(results, totalResults); } }; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java index b4ae88c..bfc431e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java @@ -37,8 +37,8 @@ import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.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; @@ -90,7 +90,7 @@ public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase { RegionFactory regionFactory = cache.createRegionFactory(attr.create()); localRegion = 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", localRegion); @@ -197,12 +197,12 @@ public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase { } }); - Threads.join(asyInvk0, 1000 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(asyInvk0, 1000 * 1000); if (asyInvk0.exceptionOccurred()) { Assert.fail("asyInvk0 failed", asyInvk0.getException()); } - Threads.join(asyInvk1, 1000 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(asyInvk1, 1000 * 1000); if (asyInvk1.exceptionOccurred()) { Assert.fail("asyInvk1 failed", asyInvk1.getException()); } @@ -227,7 +227,7 @@ public class InitializeIndexEntryDestroyQueryDUnitTest 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); @@ -333,12 +333,12 @@ public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase { } }); - Threads.join(asyInvk0, 1000 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(asyInvk0, 1000 * 1000); if (asyInvk0.exceptionOccurred()) { Assert.fail("asyInvk0 failed", asyInvk0.getException()); } - Threads.join(asyInvk1, 1000 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(asyInvk1, 1000 * 1000); if (asyInvk1.exceptionOccurred()) { Assert.fail("asyInvk1 failed", asyInvk1.getException()); } @@ -363,7 +363,7 @@ public class InitializeIndexEntryDestroyQueryDUnitTest 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); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java index 5cad45b..cea00c1 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java @@ -33,9 +33,9 @@ import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; 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.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; @@ -90,7 +90,7 @@ public class MultiIndexCreationDUnitTest extends CacheTestCase { public Object call() throws Exception { long giveupTime = System.currentTimeMillis() + 60000; while (!hooked && System.currentTimeMillis() < giveupTime) { - LogWriterSupport.getLogWriter().info("Query Waiting for index hook."); + LogWriterUtils.getLogWriter().info("Query Waiting for index hook."); Wait.pause(100); } assertTrue(hooked); @@ -127,12 +127,12 @@ public class MultiIndexCreationDUnitTest extends CacheTestCase { } }); - Threads.join(a1, 6000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(a1, 6000); if(a1.exceptionOccurred()) { fail(a1.getException().getMessage()); } - Threads.join(a2, 6000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(a2, 6000); if(a2.exceptionOccurred()) { fail(a2.getException().getMessage()); } @@ -189,9 +189,9 @@ public class MultiIndexCreationDUnitTest extends CacheTestCase { long giveupTime = System.currentTimeMillis() + 60000; if (spot == 13) { hooked = true; - LogWriterSupport.getLogWriter().info("MultiIndexCreationTestHook is hooked in create defined indexes."); + LogWriterUtils.getLogWriter().info("MultiIndexCreationTestHook is hooked in create defined indexes."); while (hooked && System.currentTimeMillis() < giveupTime) { - LogWriterSupport.getLogWriter().info("MultiIndexCreationTestHook waiting."); + LogWriterUtils.getLogWriter().info("MultiIndexCreationTestHook waiting."); Wait.pause(100); } assertEquals(hooked, false); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java index 098c814..fd50e63 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java @@ -40,9 +40,9 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.internal.AvailablePort; 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.NetworkSupport; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.junit.categories.DistributedTest; @@ -84,7 +84,7 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase { vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") { public void run2() throws CacheException { Properties config = new Properties(); - config.put("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.put("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); Cache cache = new CacheFactory(config).create(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -105,7 +105,7 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase { // Create client region final int port = vm0.invokeInt(PutAllWithIndexPerfDUnitTest.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(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java index 7df9922..30a5d6f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java @@ -28,9 +28,9 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -78,7 +78,7 @@ public class PRBasicIndexCreationDUnitTest extends VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreationDUnitTest.testPRBasicIndexCreate started ...."); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, @@ -88,7 +88,7 @@ public class PRBasicIndexCreationDUnitTest extends // Scope.DISTRIBUTED_ACK, redundancy)); // Creating the Datastores Nodes in the VM1. - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info("PRBasicIndexCreationDUnitTest : creating all the prs "); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); @@ -112,7 +112,7 @@ public class PRBasicIndexCreationDUnitTest extends name, "PrIndexOnStatus", "p.status",null, "p")); vm3.invoke(PRQHelp.getCacheSerializableRunnableForDuplicatePRIndexCreate( name, "PrIndexOnStatus", "p.status",null, "p")); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreationDUnitTest.testPRBasicIndexCreate is done "); } @@ -128,7 +128,7 @@ public class PRBasicIndexCreationDUnitTest extends VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreation.testPRMultiIndexCreation Test Started"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, @@ -152,7 +152,7 @@ public class PRBasicIndexCreationDUnitTest extends // will throw a RuntimeException. vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "PrIndexOnID", "p.ID", null, "p")); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRQBasicIndexCreationTest.testPRMultiIndexCreation ENDED"); } @@ -170,7 +170,7 @@ public class PRBasicIndexCreationDUnitTest extends VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreation.testPRMultiIndexCreation Test Started"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, @@ -234,7 +234,7 @@ public class PRBasicIndexCreationDUnitTest extends // Check getIndex() on datastore vm1.invoke(getIndexCheck); - LogWriterSupport.getLogWriter().info("PRQBasicIndexCreationTest.testPRMultiIndexCreation ENDED"); + LogWriterUtils.getLogWriter().info("PRQBasicIndexCreationTest.testPRMultiIndexCreation ENDED"); } /** @@ -250,28 +250,28 @@ public class PRBasicIndexCreationDUnitTest extends // VM vm3 = host.getVM(3); // closeAllCache(); final String fileName = "PRIndexCreation.xml"; - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreation.testCreatePartitionedIndexThroughXML started"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Starting and initializing partitioned regions and indexes using xml"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Starting a pr asynchronously using an xml file name : " + fileName); AsyncInvocation asyInvk0 = vm0.invokeAsync(PRQHelp .getCacheSerializableRunnableForPRCreateThrougXML(name, fileName)); AsyncInvocation asyInvk1 = vm1.invokeAsync(PRQHelp .getCacheSerializableRunnableForPRCreateThrougXML(name, fileName)); - Threads.join(asyInvk1, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(asyInvk1, 30 * 1000); if (asyInvk1.exceptionOccurred()) { Assert.fail("asyInvk1 failed", asyInvk1.getException()); } - Threads.join(asyInvk0, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(asyInvk0, 30 * 1000); if (asyInvk0.exceptionOccurred()) { Assert.fail("asyInvk0 failed", asyInvk0.getException()); } // printing all the indexes are created. vm0.invoke(PRQHelp.getCacheSerializableRunnableForIndexCreationCheck(name)); vm1.invoke(PRQHelp.getCacheSerializableRunnableForIndexCreationCheck(name)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreation.testCreatePartitionedIndexThroughXML is done " ); } @@ -293,7 +293,7 @@ public class PRBasicIndexCreationDUnitTest extends // final String fileName = "PRIndexCreation.xml"; // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreateThrougXML(name, // fileName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testCreatePartitionedRegionThroughXMLAndAPI started "); // creating all the prs @@ -341,7 +341,7 @@ public class PRBasicIndexCreationDUnitTest extends // final String fileName = "PRIndexCreation.xml"; // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreateThrougXML(name, // fileName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testCreatePartitionedIndexWithNoAliasAfterPuts started "); // creating all the prs @@ -387,7 +387,7 @@ public class PRBasicIndexCreationDUnitTest extends // final String fileName = "PRIndexCreation.xml"; // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreateThrougXML(name, // fileName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testCreatePartitionedIndexWithNoAliasBeforePuts started "); // creating all the prs @@ -466,7 +466,7 @@ public class PRBasicIndexCreationDUnitTest extends // final String fileName = "PRIndexCreation.xml"; // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreateThrougXML(name, // fileName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedIndexUsageWithPRQuery started "); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -494,7 +494,7 @@ public class PRBasicIndexCreationDUnitTest extends vm1.invoke(PRQHelp.getCacheSerializableRunnableForIndexUsageCheck(name)); vm2.invoke(PRQHelp.getCacheSerializableRunnableForIndexUsageCheck(name)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForIndexUsageCheck(name)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedIndexUsageWithPRQuery done "); } @@ -514,7 +514,7 @@ public class PRBasicIndexCreationDUnitTest extends // fileName)); int redundancy = 1; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedIndexCreationDuringPersistentRecovery started "); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPersistentPRCreate(name, @@ -553,7 +553,7 @@ public class PRBasicIndexCreationDUnitTest extends //The indexes may not have been completely created yet, because the buckets //may still be recovering from disk. // vm0.invoke(PRQHelp.getCacheSerializableRunnableForIndexUsageCheck(name)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedIndexCreationDuringPersistentRecovery done "); } @@ -571,7 +571,7 @@ public class PRBasicIndexCreationDUnitTest extends VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedQueryWithIndexOnIdBug37089 started "); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -595,7 +595,7 @@ public class PRBasicIndexCreationDUnitTest extends vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( name, localName)); // validation on index usage with queries over a pr - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedQueryWithIndexOnIdBug37089 done "); } @@ -613,11 +613,11 @@ public class PRBasicIndexCreationDUnitTest extends // VM vm3 = host.getVM(3); // closeAllCache(); final String fileName = "PRIndexCreation.xml"; - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreation.testCreatePartitionedIndexThroughXML started"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Starting and initializing partitioned regions and indexes using xml"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Starting a pr asynchronously using an xml file name : " + fileName); // AsyncInvocation asyInvk0 = vm0.invokeAsync(PRQHelp // .getCacheSerializableRunnableForPRCreateThrougXML(name, fileName)); @@ -663,7 +663,7 @@ public class PRBasicIndexCreationDUnitTest extends cnt, cntDest)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreation.testCreatePartitionedIndexThroughXML is done " ); @@ -757,7 +757,7 @@ public class PRBasicIndexCreationDUnitTest extends int totalDataSize = 90; final int i = 0; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -769,7 +769,7 @@ public class PRBasicIndexCreationDUnitTest extends VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -780,17 +780,17 @@ public class PRBasicIndexCreationDUnitTest extends redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets"); // creating a local region on one of the JVM's vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -808,7 +808,7 @@ public class PRBasicIndexCreationDUnitTest extends (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions, (3 * (step)), dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -826,14 +826,14 @@ public class PRBasicIndexCreationDUnitTest extends vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "PrIndexOnKeyID", "key.ID","/" + name + ".keys key", null)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndCompareResults( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } @@ -855,7 +855,7 @@ public class PRBasicIndexCreationDUnitTest extends int totalDataSize = 90; final int i = 0; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -867,7 +867,7 @@ public class PRBasicIndexCreationDUnitTest extends VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -878,17 +878,17 @@ public class PRBasicIndexCreationDUnitTest extends redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets"); // creating a local region on one of the JVM's vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -906,7 +906,7 @@ public class PRBasicIndexCreationDUnitTest extends (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions, (3 * (step)), dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -924,14 +924,14 @@ public class PRBasicIndexCreationDUnitTest extends vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRIndexCreate(name, "PrIndexOnKeyID", "key.ID","/" + name + ".keys key", null)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndVerifyOrder( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } @@ -943,7 +943,7 @@ public void testIndexQueryingWithOrderByLimit() throws Exception int totalDataSize = 90; final int i = 0; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -955,7 +955,7 @@ public void testIndexQueryingWithOrderByLimit() throws Exception VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -966,17 +966,17 @@ public void testIndexQueryingWithOrderByLimit() throws Exception redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets"); // creating a local region on one of the JVM's vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -994,7 +994,7 @@ public void testIndexQueryingWithOrderByLimit() throws Exception (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions, (3 * (step)), dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -1034,14 +1034,14 @@ public void testIndexQueryingWithOrderByLimit() throws Exception "rrIndexOnKeyStatus", "key.status", "/" + localName + ".keys key", null)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryWithLimit( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java index 5889c1f..b09eb31 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java @@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -186,7 +186,7 @@ public class PRBasicIndexCreationDeadlockDUnitTest extends }); for (AsyncInvocation async: asyns) { - Threads.join(async, 10000, null); + ThreadUtils.join(async, 10000); } } finally { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java index 1a3961b..d020ef6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -74,7 +74,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreationDUnitTest.testPRBasicIndexCreate started ...."); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, @@ -84,7 +84,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends // Scope.DISTRIBUTED_ACK, redundancy)); // Creating the Datastores Nodes in the VM1. - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info("PRBasicIndexCreationDUnitTest : creating all the prs "); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); @@ -116,7 +116,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends name, "PrIndexOnStatus", "p.status",null, "p")); vm3.invoke(PRQHelp.getCacheSerializableRunnableForDuplicatePRIndexCreate( name, "PrIndexOnStatus", "p.status",null, "p")); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreationDUnitTest.testPRBasicIndexCreate is done "); } @@ -135,7 +135,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreation.testPRMultiIndexCreation Test Started"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRAccessorCreate(name, @@ -203,7 +203,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends vm2.invoke(getIndexCheck); vm3.invoke(getIndexCheck); - LogWriterSupport.getLogWriter().info("PRQBasicIndexCreationTest.testPRMultiIndexCreation ENDED"); + LogWriterUtils.getLogWriter().info("PRQBasicIndexCreationTest.testPRMultiIndexCreation ENDED"); } @@ -225,7 +225,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends // final String fileName = "PRIndexCreation.xml"; // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreateThrougXML(name, // fileName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testCreatePartitionedRegionThroughXMLAndAPI started "); // creating all the prs @@ -279,7 +279,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends // final String fileName = "PRIndexCreation.xml"; // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreateThrougXML(name, // fileName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testCreatePartitionedIndexWithNoAliasAfterPuts started "); // creating all the prs @@ -336,7 +336,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends // final String fileName = "PRIndexCreation.xml"; // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreateThrougXML(name, // fileName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testCreatePartitionedIndexWithNoAliasBeforePuts started "); // creating all the prs @@ -426,7 +426,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends // final String fileName = "PRIndexCreation.xml"; // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreateThrougXML(name, // fileName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedIndexUsageWithPRQuery started "); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -460,7 +460,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends vm1.invoke(PRQHelp.getCacheSerializableRunnableForIndexUsageCheck(name)); vm2.invoke(PRQHelp.getCacheSerializableRunnableForIndexUsageCheck(name)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForIndexUsageCheck(name)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedIndexUsageWithPRQuery done "); } @@ -480,7 +480,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends // fileName)); int redundancy = 1; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedIndexCreationDuringPersistentRecovery started "); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPersistentPRCreate(name, @@ -524,7 +524,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends //The indexes may not have been completely created yet, because the buckets //may still be recovering from disk. // vm0.invoke(PRQHelp.getCacheSerializableRunnableForIndexUsageCheck(name)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedIndexCreationDuringPersistentRecovery done "); } @@ -542,7 +542,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedQueryWithIndexOnIdBug37089 started "); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -572,7 +572,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( name, localName)); // validation on index usage with queries over a pr - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRBasicIndexCreationDUnitTest.testPartitionedQueryWithIndexOnIdBug37089 done "); } @@ -590,11 +590,11 @@ public class PRBasicMultiIndexCreationDUnitTest extends // VM vm3 = host.getVM(3); // closeAllCache(); final String fileName = "PRIndexCreation.xml"; - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreation.testCreatePartitionedIndexThroughXML started"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Starting and initializing partitioned regions and indexes using xml"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Starting a pr asynchronously using an xml file name : " + fileName); // AsyncInvocation asyInvk0 = vm0.invokeAsync(PRQHelp // .getCacheSerializableRunnableForPRCreateThrougXML(name, fileName)); @@ -649,7 +649,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends cnt, cntDest)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicIndexCreation.testCreatePartitionedIndexThroughXML is done " ); @@ -750,7 +750,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends int totalDataSize = 90; final int i = 0; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -762,7 +762,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -773,17 +773,17 @@ public class PRBasicMultiIndexCreationDUnitTest extends redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets"); // creating a local region on one of the JVM's vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -801,7 +801,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions, (3 * (step)), dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -822,14 +822,14 @@ public class PRBasicMultiIndexCreationDUnitTest extends vm1.invoke(PRQHelp.getCacheSerializableRunnableForDefineIndex(name, names, exps)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndCompareResults( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } @@ -851,7 +851,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends int totalDataSize = 90; final int i = 0; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -863,7 +863,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -874,17 +874,17 @@ public class PRBasicMultiIndexCreationDUnitTest extends redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets"); // creating a local region on one of the JVM's vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -902,7 +902,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions, (3 * (step)), dataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -923,14 +923,14 @@ public class PRBasicMultiIndexCreationDUnitTest extends vm1.invoke(PRQHelp.getCacheSerializableRunnableForDefineIndex(name, names, exps)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryAndVerifyOrder( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } @@ -942,7 +942,7 @@ public void testIndexQueryingWithOrderByLimit() throws Exception int totalDataSize = 90; final int i = 0; - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Querying PR Test with DACK Started*****"); @@ -954,7 +954,7 @@ public void testIndexQueryingWithOrderByLimit() throws Exception VM vm3 = host.getVM(3); // Creating PR's on the participating VM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating PR's on VM0, VM1 , VM2 , VM3"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -965,17 +965,17 @@ public void testIndexQueryingWithOrderByLimit() throws Exception redundancy, valueConstraint)); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created PR's on VM0, VM1 , VM2 , VM3"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Creating Local region on VM0 to compare result Sets"); // creating a local region on one of the JVM's vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName, valueConstraint)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Successfully Created Local Region on VM0"); @@ -993,7 +993,7 @@ public void testIndexQueryingWithOrderByLimit() throws Exception (2 * step), (3 * step))); vm3.invoke(PRQHelp.getCacheSerializableRunnableForPRPutsKeyValue(name, portfoliosAndPositions, (3 * (step)), totalDataSize)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data across PR's"); @@ -1049,14 +1049,14 @@ public void testIndexQueryingWithOrderByLimit() throws Exception vm0.invoke(PRQHelp.getCacheSerializableRunnableForDefineIndex(localName, names2, exps2, fromClause2)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : Inserted Portfolio data over Local Region on VM0"); // querying the VM for data vm0.invoke(PRQHelp.getCacheSerializableRunnableForPROrderByQueryWithLimit( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java index fd09ab1..147ed4d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.query.data.PortfolioData; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -77,13 +77,13 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating Accessor node on the VM0. - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Creating the Accessor node in the PR"); @@ -93,22 +93,22 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(localName, // Scope.DISTRIBUTED_ACK, redundancy)); vm0.invoke(PRQHelp.getCacheSerializableRunnableForLocalRegionCreation(localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully created the Accessor node in the PR"); // Creating the Datastores Nodes in the VM1. - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest:testPRBasicQuerying ----- Creating the Datastore node in the PR"); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created the Datastore node in the PR"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Successfully Created PR's across all VM's"); @@ -122,7 +122,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRDuplicatePuts(name, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Inserted Portfolio data across PR's"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, @@ -136,7 +136,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED"); } @@ -148,13 +148,13 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase VM vm1 = host.getVM(1); VM vm2 = host.getVM(2); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRCountStarQuery: Querying PR Test with DACK Started"); // Creting PR's on the participating VM's // Creating Accessor node on the VM0. - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRCountStarQuery: Creating the Accessor node in the PR"); @@ -164,12 +164,12 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase // vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(localName, // Scope.DISTRIBUTED_ACK, redundancy)); vm0.invoke(PRQHelp.getCacheSerializableRunnableForLocalRegionCreation(localName, Portfolio.class)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRCountStarQuery: Successfully created the Accessor node in the PR"); // Creating the Datastores Nodes in the VM1. - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest:testPRCountStarQuery ----- Creating the Datastore node in the PR"); vm1.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, @@ -179,11 +179,11 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase redundancy, Portfolio.class)); vm2.invoke(PRQHelp.getCacheSerializableRunnableForLocalRegionCreation(localName, Portfolio.class)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRCountStarQuery: Successfully Created the Datastore node in the PR"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRCountStarQuery: Successfully Created PR's across all VM's"); @@ -197,7 +197,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRDuplicatePuts(name, portfolio, cnt, cntDest+100)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRCountStarQuery: Inserted Portfolio data across PR's"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, @@ -217,7 +217,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase vm2.invoke(PRQHelp.getCacheSerializableRunnableForPRCountStarQueries( name, localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQBasicQueryDUnitTest#testPRCountStarQuery: Querying PR's Test ENDED"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java index f27b66d..81ee3bf 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java @@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query.partitioned; import com.gemstone.gemfire.cache.query.data.PortfolioData; import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -69,7 +69,7 @@ public class PRBasicRemoveIndexDUnitTest extends PartitionedRegionDUnitTestCase VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicRemoveIndexDUnitTest.testPRBasicIndexCreate test now starts ...."); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy)); @@ -97,7 +97,7 @@ public class PRBasicRemoveIndexDUnitTest extends PartitionedRegionDUnitTestCase //remove indexes vm1.invoke(PRQHelp.getCacheSerializableRunnableForRemoveIndex(name, false)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicRemoveIndexDUnitTest.testPRBasicRemoveIndex test now ends sucessfully"); } @@ -112,7 +112,7 @@ public class PRBasicRemoveIndexDUnitTest extends PartitionedRegionDUnitTestCase VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRBasicRemoveIndexDUnitTest.testPRBasicIndexCreate test now starts ...."); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRCreate(name, redundancy));
