http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java index 807a91f..d8eaf9c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -108,7 +108,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends firstCreationFlag = true; createPartitionRegion(vmList, startIndexForRegion, endIndexForRegion, localMaxMemory, redundancy, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testNameWithPartitionRegionFirstOnSameVM() - Partition Regions successfully created "); // creating distributed region on same vm with same name as previouslu @@ -119,7 +119,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends vmList = addNodeToList(startIndexForNode, endIndexForNode); createDistributedRegion(vmList, startIndexForRegion, endIndexForRegion, Scope.DISTRIBUTED_ACK, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testNameWithPartitionRegionFirstOnSameVM() - test completed successfully "); } @@ -160,7 +160,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends createPartitionRegion(vmList, startIndexForRegion, endIndexForRegion, localMaxMemory, redundancy, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testNameWithPartitionRegionFirstOnSameVM() - test completed successfully "); } @@ -197,7 +197,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends firstCreationFlag = true; createPartitionRegion(vmList, startIndexForRegion, endIndexForRegion, localMaxMemory, redundancy, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testNameWithPartitionRegionFirstOnDifferentVM() - Partition Regions successfully created "); // creating distrubuted region with the scope = DISTRIBUTED_ACK on @@ -210,7 +210,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends vmList = addNodeToList(startIndexForNode, endIndexForNode); createDistributedRegion(vmList, startIndexForRegion, endIndexForRegion, Scope.DISTRIBUTED_ACK, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testNameWithPartitionRegionFirstOnDifferentVM() - test completed successfully "); } @@ -252,7 +252,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends createPartitionRegion(vmList, startIndexForRegion, endIndexForRegion, localMaxMemory, redundancy, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testNameWithLocalRegionFirstOnDifferentVM() - test completed successfully "); } @@ -293,7 +293,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends firstCreationFlag = true; createPartitionRegion(vmList, startIndexForRegion, endIndexForRegion, localMaxMemory, redundancy, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testPartitionRegionVsLocalRegionFirst() - test completed successfully "); } @@ -335,7 +335,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends firstCreationFlag = true; createDistributedRegion(vmList, startIndexForRegion, endIndexForRegion, Scope.LOCAL, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testPartitionRegionVsLocalRegionSecond() - test completed successfully "); } @@ -367,12 +367,12 @@ public class PartitionedRegionWithSameNameDUnitTest extends firstCreationFlag = true; createPartitionRegion(vmList, startIndexForRegion, endIndexForRegion, localMaxMemory, redundancy, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testWithPartitionedRegionAsParentRegionAndDistributedSubRegion() - Parent region as partitioned region is created "); // create subregion of partition region createSubRegionOfPartitionedRegion(vmList, DISTRIBUTED_REGION); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testWithPartitionedRegionAsParentRegionAndDistributedSubRegion() completed Successfully "); } @@ -405,12 +405,12 @@ public class PartitionedRegionWithSameNameDUnitTest extends firstCreationFlag = true; createPartitionRegion(vmList, startIndexForRegion, endIndexForRegion, localMaxMemory, redundancy, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testWithPartitionedRegionAsParentRegionAndPartitionedSubRegion() - Parent region as partitioned region is created "); // create subregion of partition region createSubRegionOfPartitionedRegion(vmList, PARTITIONED_REGION); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testWithPartitionedRegionAsParentRegionAndPartitionedSubRegion() completed Successfully "); } @@ -442,7 +442,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends firstCreationFlag = true; createDistributedRegion(vmList, startIndexForRegion, endIndexForRegion, Scope.DISTRIBUTED_ACK, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testWithSubRegionPartitionedRegionFirst() - Parent region is created"); // creating distributed region as subregion of parent on vm0 prPrefix = "child_region"; @@ -450,7 +450,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends endIndexForNode = 1; vmList = addNodeToList(startIndexForNode, endIndexForNode); createPartitionedSubRegion(vmList, firstCreationFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testWithSubRegionPartitionedRegionFirst() - Partitioned sub region on vm0 "); // creating partiton region as subregion of parent region with the same name @@ -459,7 +459,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends endIndexForNode = 4; vmList = addNodeToList(startIndexForNode, endIndexForNode); createDistributedSubRegion(vmList, firstCreationFlag); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testWithSubRegionPartitionedRegionFirst() completed successfully "); } @@ -491,7 +491,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends firstCreationFlag = true; createDistributedRegion(vmList, startIndexForRegion, endIndexForRegion, Scope.DISTRIBUTED_ACK, firstCreationFlag, multipleVMFlag); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testWithSubRegionDistributedRegionFirst() - Parent region is created"); // creating distributed region as subregion of parent on vm0 prPrefix = "child_region"; @@ -499,7 +499,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends endIndexForNode = 1; vmList = addNodeToList(startIndexForNode, endIndexForNode); createDistributedSubRegion(vmList, firstCreationFlag); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "testWithSubRegionDistributedRegionFirst() - Distributed sub region on vm0 "); // creating partiton region as subregion of parent region with the same name @@ -508,7 +508,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends endIndexForNode = 4; vmList = addNodeToList(startIndexForNode, endIndexForNode); createPartitionedSubRegion(vmList, firstCreationFlag); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "testWithSubRegionDistributedRegionFirst() completed successfully "); } @@ -619,7 +619,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends case DISTRIBUTED_REGION: { Region childRegion = parentRegion.createSubregion("child_region", ra); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Distributed Subregion is created as : " + childRegion.getName()); } @@ -627,7 +627,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends case PARTITIONED_REGION: { Region childRegion = parentRegion.createSubregion("child_region", createRegionAttrsForPR(0, 200)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Subregion is created as : " + childRegion.getName()); @@ -881,7 +881,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends } } } - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "createMultiplePartitionRegion() - Partition Regions Successfully Completed "); }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java index 278be8b..495ad0e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java @@ -41,7 +41,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -73,7 +73,7 @@ public class PutAllDAckDUnitTest extends DistributedTestCase { VM vm1 = host.getVM(1); vm0.invoke(PutAllDAckDUnitTest.class, "createCacheForVM0"); vm1.invoke(PutAllDAckDUnitTest.class, "createCacheForVM1"); - LogWriterSupport.getLogWriter().fine("Cache created successfully"); + LogWriterUtils.getLogWriter().fine("Cache created successfully"); } public void preTearDown(){ @@ -216,7 +216,7 @@ public class PutAllDAckDUnitTest extends DistributedTestCase { // } beforeCreateputAllcounter++; - LogWriterSupport.getLogWriter().fine("*******BeforeCreate*****"); + LogWriterUtils.getLogWriter().fine("*******BeforeCreate*****"); beforeCreate = true; } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java index 719024e..72e5439 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java @@ -49,9 +49,9 @@ 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.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -89,7 +89,7 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase { VM vm1 = host.getVM(1); vm0.invoke(PutAllGlobalDUnitTest.class, "createCacheForVM0"); vm1.invoke(PutAllGlobalDUnitTest.class, "createCacheForVM1"); - LogWriterSupport.getLogWriter().fine("Cache created successfully"); + LogWriterUtils.getLogWriter().fine("Cache created successfully"); } public void preTearDown(){ @@ -185,16 +185,16 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase { long startTime = 0; try{ Thread.sleep(500); - LogWriterSupport.getLogWriter().info("async2 proceeding with put operation"); + LogWriterUtils.getLogWriter().info("async2 proceeding with put operation"); startTime = System.currentTimeMillis(); region.put(new Integer(1),"mapVal"); - LogWriterSupport.getLogWriter().info("async2 done with put operation"); + LogWriterUtils.getLogWriter().info("async2 done with put operation"); fail("Should have thrown TimeoutException"); }catch(TimeoutException Tx){ // Tx.printStackTrace(); - LogWriterSupport.getLogWriter().info("PASS: As expected Caught TimeoutException "); + LogWriterUtils.getLogWriter().info("PASS: As expected Caught TimeoutException "); if (startTime + TIMEOUT_PERIOD + DLockGrantor.GRANTOR_THREAD_MAX_WAIT /* slop of grantor max wait ms */ < System.currentTimeMillis()) { - LogWriterSupport.getLogWriter().warning("though this test passed, the put() timed out in " + LogWriterUtils.getLogWriter().warning("though this test passed, the put() timed out in " + (System.currentTimeMillis() - startTime) + " instead of the expected " + TIMEOUT_PERIOD + " milliseconds"); } @@ -206,13 +206,13 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase { } }); - Threads.join(async2, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async2, 30 * 1000); if (async2.exceptionOccurred()) { - Threads.join(async1, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async1, 30 * 1000); Assert.fail("async2 failed", async2.getException()); } - Threads.join(async1, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async1, 30 * 1000); if (async1.exceptionOccurred()) { Assert.fail("async1 failed", async1.getException()); } @@ -224,14 +224,14 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase { public static void putAllMethod() throws Exception { Map m = new HashMap(); serverSocket.accept(); - LogWriterSupport.getLogWriter().info("async1 connection received - continuing with putAll operation"); + LogWriterUtils.getLogWriter().info("async1 connection received - continuing with putAll operation"); serverSocket.close(); try{ for (int i=1; i<2; i++) { m.put(new Integer(i), String.valueOf(i)); } region.putAll(m); - LogWriterSupport.getLogWriter().info("async1 done with putAll operation"); + LogWriterUtils.getLogWriter().info("async1 done with putAll operation"); }catch(Exception ex){ // ex.printStackTrace(); @@ -280,13 +280,13 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase { static class BeforeCreateCallback extends CacheWriterAdapter { public void beforeCreate(EntryEvent event){ - LogWriterSupport.getLogWriter().info("beforeCreate invoked for " + event.getKey()); + LogWriterUtils.getLogWriter().info("beforeCreate invoked for " + event.getKey()); try{ Thread.sleep(5000); }catch(InterruptedException ex) { fail("interrupted"); } - LogWriterSupport.getLogWriter().info("beforeCreate done for " + event.getKey()); + LogWriterUtils.getLogWriter().info("beforeCreate done for " + event.getKey()); } }// end of BeforeCreateCallback http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java index d1b3b5d..81b2a73 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java @@ -99,7 +99,7 @@ import com.gemstone.gemfire.internal.cache.versions.VersionTag; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -253,7 +253,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { } public Object call() throws Exception { CacheTransactionManager mgr = getGemfireCache().getTxManager(); - LogWriterSupport.getLogWriter().fine("testTXPut starting tx"); + LogWriterUtils.getLogWriter().fine("testTXPut starting tx"); mgr.begin(); Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER); Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER); @@ -2539,7 +2539,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { PartitionedRegion pr = (PartitionedRegion)getGemfireCache().getRegion(CUSTOMER); Set filter = new HashSet(); filter.add(expectedCustId); - LogWriterSupport.getLogWriter().info("SWAP:inside NestedTxFunc calling func2:"); + LogWriterUtils.getLogWriter().info("SWAP:inside NestedTxFunc calling func2:"); r.put(expectedCustId, expectedCustomer); FunctionService.onRegion(pr).withFilter(filter).execute(new NestedTxFunction2()).getResult(); assertNotNull(getGemfireCache().getTxManager().getTXState()); @@ -3465,7 +3465,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(true); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<Integer, String> crf = cCache .createClientRegionFactory(isEmpty ? ClientRegionShortcut.PROXY @@ -3677,7 +3677,7 @@ protected static class ClientListener extends CacheListenerAdapter { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(true); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<Integer, String> crf = cCache .createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY); @@ -3955,12 +3955,12 @@ protected static class ClientListener extends CacheListenerAdapter { private int count; @Override public void afterCreate(EntryEvent event) { - LogWriterSupport.getLogWriter().info("afterCreate invoked for " + event); + LogWriterUtils.getLogWriter().info("afterCreate invoked for " + event); count++; } @Override public void afterUpdate(EntryEvent event) { - LogWriterSupport.getLogWriter().info("afterUpdate invoked for " + event); + LogWriterUtils.getLogWriter().info("afterUpdate invoked for " + event); count++; } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java index 9c0ef03..f4ab8a1 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -70,7 +70,7 @@ public class RemoveAllDAckDUnitTest extends DistributedTestCase { VM vm1 = host.getVM(1); vm0.invoke(RemoveAllDAckDUnitTest.class, "createCacheForVM0"); vm1.invoke(RemoveAllDAckDUnitTest.class, "createCacheForVM1"); - LogWriterSupport.getLogWriter().fine("Cache created successfully"); + LogWriterUtils.getLogWriter().fine("Cache created successfully"); } public void preTearDown(){ @@ -161,7 +161,7 @@ public class RemoveAllDAckDUnitTest extends DistributedTestCase { beforeDestroyRemoveAllcounter++; assertEquals(true, event.getOperation().isRemoveAll()); assertEquals("removeAllCallback", event.getCallbackArgument()); - LogWriterSupport.getLogWriter().fine("*******BeforeDestroy*****"); + LogWriterUtils.getLogWriter().fine("*******BeforeDestroy*****"); beforeDestroy = true; } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java index 38d7ca3..6d5b9d6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java @@ -35,7 +35,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -66,7 +66,7 @@ public class RemoveDAckDUnitTest extends DistributedTestCase { VM vm1 = host.getVM(1); vm0.invoke(RemoveDAckDUnitTest.class, "createCacheVM0"); vm1.invoke(RemoveDAckDUnitTest.class, "createCacheVM1"); - LogWriterSupport.getLogWriter().fine("Cache created in successfully"); + LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } public void preTearDown(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java index 72d5a06..b4907ae 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java @@ -39,9 +39,9 @@ import com.gemstone.gemfire.distributed.DistributedSystem; 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.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; /** @@ -152,7 +152,7 @@ public class RemoveGlobalDUnitTest extends DistributedTestCase { } }); - Threads.join(async, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async, 30 * 1000); if(async.exceptionOccurred()) throw async.getException(); @@ -225,7 +225,7 @@ public class RemoveGlobalDUnitTest extends DistributedTestCase { } }); - Threads.join(async, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async, 30 * 1000); if(async.exceptionOccurred()) throw async.getException(); @@ -243,7 +243,7 @@ public class RemoveGlobalDUnitTest extends DistributedTestCase { }catch(InterruptedException ex){ fail("interrupted"); } - LogWriterSupport.getLogWriter().fine("quitingfromcachewriter"); + LogWriterUtils.getLogWriter().fine("quitingfromcachewriter"); } }/////////// http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java index bc2e3bf..2f14119 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java @@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category; import static org.junit.Assert.*; import com.gemstone.gemfire.StatisticsFactory; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -363,11 +363,11 @@ public class SimpleDiskRegionJUnitTest extends DiskRegionTestingBase thread4.start(); thread5.start(); - Threads.join(thread1, 30 * 1000, null); - Threads.join(thread2, 30 * 1000, null); - Threads.join(thread3, 30 * 1000, null); - Threads.join(thread4, 30 * 1000, null); - Threads.join(thread5, 30 * 1000, null); + ThreadUtils.join(thread1, 30 * 1000); + ThreadUtils.join(thread2, 30 * 1000); + ThreadUtils.join(thread3, 30 * 1000); + ThreadUtils.join(thread4, 30 * 1000); + ThreadUtils.join(thread5, 30 * 1000); if (keyIds.size() != 50000) { fail("Size not equal to 5000 as expected but is " + keyIds.size()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java index dabda5e..4b016a4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java @@ -42,10 +42,10 @@ import com.gemstone.gemfire.internal.cache.execute.data.OrderId; import com.gemstone.gemfire.internal.cache.execute.data.ShipmentId; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; 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.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; @@ -133,7 +133,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ } finally { - DistributedTestSupport.unregisterAllDataSerializersFromAllVms(); + DistributedTestUtils.unregisterAllDataSerializersFromAllVms(); } } @@ -256,7 +256,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ attr.setDataPolicy(DataPolicy.REPLICATE); region = cache.createRegion(Region_Name, attr.create()); assertNotNull(region); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Distributed Region " + Region_Name + " created Successfully :" + region.toString()); }else{ @@ -267,7 +267,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ attr.setPartitionAttributes(paf.create()); region = cache.createRegion(Region_Name, attr.create()); assertNotNull(region); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + Region_Name + " created Successfully :" + region.toString()); } @@ -281,7 +281,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ attr.setPartitionAttributes(paf.create()); customerRegion = cache.createRegion("CUSTOMER", attr.create()); assertNotNull(customerRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region CUSTOMER created Successfully :" + customerRegion.toString()); @@ -293,7 +293,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ attr.setPartitionAttributes(paf.create()); orderRegion = cache.createRegion("ORDER", attr.create()); assertNotNull(orderRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region ORDER created Successfully :" + orderRegion.toString()); @@ -305,7 +305,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ attr.setPartitionAttributes(paf.create()); shipmentRegion = cache.createRegion("SHIPMENT", attr.create()); assertNotNull(shipmentRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region SHIPMENT created Successfully :" + shipmentRegion.toString()); } @@ -320,7 +320,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ RegionAttributes attrs = factory.create(); region = cache.createRegion(Region_Name, attrs); assertNotNull(region); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Region " + Region_Name + " created Successfully :" + region.toString()); } else { @@ -329,7 +329,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ RegionAttributes attrs = factory.create(); customerRegion = cache.createRegion("CUSTOMER", attrs); assertNotNull(customerRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region CUSTOMER created Successfully :" + customerRegion.toString()); @@ -338,7 +338,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ attrs = factory.create(); orderRegion = cache.createRegion("ORDER", attrs); assertNotNull(orderRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region ORDER created Successfully :" + orderRegion.toString()); @@ -347,7 +347,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ attrs = factory.create(); shipmentRegion = cache.createRegion("SHIPMENT", attrs); assertNotNull(shipmentRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region SHIPMENT created Successfully :" + shipmentRegion.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java index a1dc855..e47892e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java @@ -56,7 +56,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { ///////// Public test methods public void testNullFailure() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("TODO: this test needs to use VM#bounce."); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("TODO: this test needs to use VM#bounce."); try { SystemFailure.initiateFailure(null); fail("Null failure set allowed"); @@ -308,7 +308,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { static private final Runnable listener1 = new Runnable() { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Inside of preListener1"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Inside of preListener1"); listenerCount.addAndGet(1); } }; @@ -495,7 +495,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { protected static void message(String s) { System.out.println(s); System.err.println(s); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info(s); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info(s); cache.getLogger().info(s); } @@ -545,7 +545,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { } } public void afterCreate(EntryEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Invoking afterCreate on listener; name=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Invoking afterCreate on listener; name=" + event.getKey()); forceOutOfMemory(); } @@ -590,7 +590,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { } } public void afterCreate(EntryEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Invoking afterCreate on listener; name=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Invoking afterCreate on listener; name=" + event.getKey()); forceOutOfMemory(); } @@ -660,7 +660,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { } public void afterCreate(EntryEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Invoking afterCreate on listener; name=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Invoking afterCreate on listener; name=" + event.getKey()); forceLowMemory(); } @@ -676,7 +676,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { } public void afterCreate(EntryEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Invoking afterCreate on listener; name=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Invoking afterCreate on listener; name=" + event.getKey()); forceInternalError(); } @@ -692,7 +692,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { } public void afterCreate(EntryEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Invoking afterCreate on listener; name=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Invoking afterCreate on listener; name=" + event.getKey()); forceInternalError(); } @@ -704,7 +704,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { } public void afterCreate(EntryEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Invoking afterCreate on listener; name=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Invoking afterCreate on listener; name=" + event.getKey()); forceError(); } @@ -756,7 +756,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { } protected void doCreateEntry(String name) { - LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter(); + LogWriter log = com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter(); log.info( "<ExpectedException action=add>" + "dunit.RMIException" http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java index ef5b9ef..b1d1e64 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java @@ -30,7 +30,7 @@ import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.CommitConflictException; import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @Category(IntegrationTest.class) @@ -124,7 +124,7 @@ public class TXReservationMgrJUnitTest { threads[i].start(); } for (int i=0; i < THREAD_COUNT; i++) { - Threads.join(threads[i], 60 * 1000, null); // increased from 30 to 60 for parallel junit runs + ThreadUtils.join(threads[i], 60 * 1000); // increased from 30 to 60 for parallel junit runs } int invalidCount = 0; for (int i=0; i < KEY_COUNT; i++) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java index a0549a4..fdb7ada 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java @@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.cache.execute.data.CustId; import com.gemstone.gemfire.internal.cache.execute.data.Order; import com.gemstone.gemfire.internal.cache.execute.data.OrderId; 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.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; @@ -115,7 +115,7 @@ public class TransactionsWithDeltaDUnitTest extends CacheTestCase { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<Integer, String> crf = cCache .createClientRegionFactory(isEmpty ? ClientRegionShortcut.PROXY @@ -331,7 +331,7 @@ public class TransactionsWithDeltaDUnitTest extends CacheTestCase { pr.put(cust1, new Customer(1, "name1")); Iterator<CustId> it = pr.keySet().iterator(); while (it.hasNext()) { - LogWriterSupport.getLogWriter().info("SWAP:iterator1:"+pr.get(it.next())); + LogWriterUtils.getLogWriter().info("SWAP:iterator1:"+pr.get(it.next())); } Customer c = pr.get(cust1); assertNotNull(c); @@ -349,10 +349,10 @@ public class TransactionsWithDeltaDUnitTest extends CacheTestCase { mgr.begin(); Customer c = pr.get(cust1); c.setName("updatedName"); - LogWriterSupport.getLogWriter().info("SWAP:doingPut"); + LogWriterUtils.getLogWriter().info("SWAP:doingPut"); pr.put(cust1, c); - LogWriterSupport.getLogWriter().info("SWAP:getfromtx:"+pr.get(cust1)); - LogWriterSupport.getLogWriter().info("SWAP:doingCommit"); + LogWriterUtils.getLogWriter().info("SWAP:getfromtx:"+pr.get(cust1)); + LogWriterUtils.getLogWriter().info("SWAP:doingCommit"); assertEquals("updatedName", pr.get(cust1).getName()); TXStateProxy tx = mgr.internalSuspend(); assertEquals("name1", pr.get(cust1).getName()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java index aa58ef8..6c2cc98 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java @@ -77,7 +77,7 @@ 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.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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -1869,7 +1869,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase { assertEquals(12, details.getCreatedBucketCount()); assertEquals(1,details.getActualRedundantCopies()); assertEquals(0,details.getLowRedundancyBucketCount()); - LogWriterSupport.getLogWriter().info("details=" + details.getPartitionMemberInfo()); + LogWriterUtils.getLogWriter().info("details=" + details.getPartitionMemberInfo()); long afterSize = 0; for(PartitionMemberInfo memberDetails: details.getPartitionMemberInfo()) { assertEquals(8, memberDetails.getBucketCount()); @@ -2011,7 +2011,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase { assertEquals(12, details.getCreatedBucketCount()); assertEquals(1,details.getActualRedundantCopies()); assertEquals(0,details.getLowRedundancyBucketCount()); - LogWriterSupport.getLogWriter().info("details=" + details.getPartitionMemberInfo()); + LogWriterUtils.getLogWriter().info("details=" + details.getPartitionMemberInfo()); long afterSize = 0; for(PartitionMemberInfo memberDetails: details.getPartitionMemberInfo()) { assertEquals(8, memberDetails.getBucketCount()); @@ -2080,7 +2080,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase { assertEquals(12, details.getCreatedBucketCount()); assertEquals(1,details.getActualRedundantCopies()); assertEquals(0,details.getLowRedundancyBucketCount()); - LogWriterSupport.getLogWriter().info("details=" + details.getPartitionMemberInfo()); + LogWriterUtils.getLogWriter().info("details=" + details.getPartitionMemberInfo()); long afterSize = 0; for(PartitionMemberInfo memberDetails: details.getPartitionMemberInfo()) { assertEquals(6, memberDetails.getBucketCount()); @@ -2195,7 +2195,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase { assertEquals(12, details.getCreatedBucketCount()); assertEquals(1,details.getActualRedundantCopies()); assertEquals(0,details.getLowRedundancyBucketCount()); - LogWriterSupport.getLogWriter().info("details=" + details.getPartitionMemberInfo()); + LogWriterUtils.getLogWriter().info("details=" + details.getPartitionMemberInfo()); long afterSize = 0; for(PartitionMemberInfo memberDetails: details.getPartitionMemberInfo()) { assertEquals(8, memberDetails.getBucketCount()); @@ -2505,7 +2505,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase { } cacheWriter.release(); - LogWriterSupport.getLogWriter().info("starting wait for rebalance. Will wait for " + MAX_WAIT + " seconds"); + LogWriterUtils.getLogWriter().info("starting wait for rebalance. Will wait for " + MAX_WAIT + " seconds"); RebalanceResults results = rebalance.getResults(MAX_WAIT, TimeUnit.SECONDS); assertEquals(2, results.getTotalBucketCreatesCompleted()); assertEquals(1, results.getTotalPrimaryTransfersCompleted()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java index 4d18cde..5e2da16 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java @@ -34,7 +34,7 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.DiskStoreFactoryImpl; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @Category(IntegrationTest.class) @@ -142,7 +142,7 @@ public class MultiThreadedOplogPerJUnitPerformanceTest } for (int i = 0; i < numberOfThreads; i++) { - Threads.join(threads[i], 30 * 1000, null); + ThreadUtils.join(threads[i], 30 * 1000); } long totalPuts = ((long)numberOfIterations * numberOfKeysPerThread * numberOfThreads); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java index d89d6ce..0fe4bd0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java @@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.cache.tier.ClientHandShake; import com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection; import com.gemstone.gemfire.test.dunit.DistributedTestCase; -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.VM; @@ -118,7 +118,7 @@ public class Bug51193DUnitTest extends DistributedTestCase { public static Integer createServerCache(Boolean createPR) throws Exception { Properties props = new Properties(); - props.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + props.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); Bug51193DUnitTest test = new Bug51193DUnitTest("Bug51193DUnitTest"); DistributedSystem ds = test.getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java index 6882106..3890498 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java @@ -36,8 +36,8 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; 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.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -102,7 +102,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa registerFunctionAtServer(function); isByName = new Boolean(true); toRegister = new Boolean(true); - LogWriterSupport.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); + LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); client.invoke(ClientServerFunctionExecutionDUnitTest.class, "serverExecution", new Object[] { isByName, function, toRegister}); client.invoke(ClientServerFunctionExecutionDUnitTest.class, @@ -119,7 +119,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa registerFunctionAtServer(function); isByName = new Boolean(true); toRegister = new Boolean(true); - LogWriterSupport.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); + LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); client.invoke(ClientServerFunctionExecutionDUnitTest.class, "serverExecution_SendException", new Object[] { isByName, function, toRegister}); client.invoke(ClientServerFunctionExecutionDUnitTest.class, @@ -138,7 +138,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa registerFunctionAtServer(function); isByName = new Boolean(true); toRegister = new Boolean(true); - LogWriterSupport.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); + LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); client.invoke(ClientServerFunctionExecutionDUnitTest.class, "serverExecution_NoLastResult", new Object[] { isByName, function, toRegister}); client.invoke(ClientServerFunctionExecutionDUnitTest.class, @@ -154,7 +154,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa registerFunctionAtServer(function); isByName = new Boolean(true); toRegister = new Boolean(false); - LogWriterSupport.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); + LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); client.invoke(ClientServerFunctionExecutionDUnitTest.class, "serverExecution", new Object[] { isByName, function, toRegister}); client.invoke(ClientServerFunctionExecutionDUnitTest.class, @@ -165,7 +165,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa */ public void testServerExecution_byInlineFunction() { createScenario(); - LogWriterSupport.getLogWriter().info("ClientServerFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); + LogWriterUtils.getLogWriter().info("ClientServerFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); client.invoke(ClientServerFunctionExecutionDUnitTest.class, "serverExecution_Inline"); client.invoke(ClientServerFunctionExecutionDUnitTest.class, @@ -178,7 +178,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa */ public void testServerExecution_byInlineFunction_InvalidAttrbiutes() { createScenario(); - LogWriterSupport.getLogWriter().info("ClientServerFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); + LogWriterUtils.getLogWriter().info("ClientServerFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); client.invoke(ClientServerFunctionExecutionDUnitTest.class, "serverExecution_Inline_InvalidAttributes"); } @@ -188,7 +188,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa */ public void testBug40714() { createScenario(); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "ClientServerFunctionExecutionDUnitTest#testBug40714 : Starting test"); @@ -258,7 +258,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation."); } } @@ -273,7 +273,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa registerFunctionAtServer(function); isByName = new Boolean(true); toRegister = new Boolean(true); - LogWriterSupport.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); + LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); client.invoke(ClientServerFunctionExecutionDUnitTest.class, "serverExecution", new Object[] { isByName, function, toRegister}); client.invoke(ClientServerFunctionExecutionDUnitTest.class, @@ -287,7 +287,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa registerFunctionAtServer(function); isByName = new Boolean(true); toRegister = new Boolean(false); - LogWriterSupport.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); + LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); client.invoke(ClientServerFunctionExecutionDUnitTest.class, "serverExecution", new Object[] { isByName, function, toRegister}); client.invoke(ClientServerFunctionExecutionDUnitTest.class, @@ -322,7 +322,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa client.invoke(ClientServerFunctionExecutionDUnitTest.class, "createProxyRegion", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()) }); + new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA_SERVER); registerFunctionAtServer(function); @@ -360,7 +360,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa client.invoke(ClientServerFunctionExecutionDUnitTest.class, "createProxyRegion", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()) }); + new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA_SERVER); registerFunctionAtServer(function); @@ -400,7 +400,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa client.invoke(ClientServerFunctionExecutionDUnitTest.class, "createProxyRegion", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()) }); + new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); function = new TestFunction(true, TestFunction.TEST_FUNCTION_NONHA_SERVER); registerFunctionAtServer(function); @@ -431,7 +431,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa private void createScenario() { - LogWriterSupport.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#createScenario : creating scenario"); + LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#createScenario : creating scenario"); createClientServerScenarionWithoutRegion(); } @@ -450,7 +450,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operation"); } @@ -470,7 +470,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operations"); } } @@ -507,7 +507,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operation"); } @@ -534,7 +534,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operations"); } } @@ -579,7 +579,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa String excuse; public boolean done() { int sz = pool.getConnectedServerCount(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Checking for the Live Servers : Expected : " + expectedLiveServers + " Available :" + sz); if (sz == expectedLiveServers.intValue()) { @@ -613,7 +613,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa assertEquals(retryRegionName, ((List)rs.getResult()).get(0)); } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation"); } return rs.getResult(); @@ -636,7 +636,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa } catch (Exception ex) { if (!(ex instanceof ServerConnectivityException)) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation"); } } @@ -660,7 +660,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa } catch (Exception ex) { if (!(ex instanceof ServerConnectivityException)) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation"); } } @@ -734,7 +734,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operation nn TRUE"); } } @@ -769,7 +769,7 @@ public static void serverExecution_Inline_InvalidAttributes() { fail("Should have failed with Invalid attributes."); }catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); assertTrue(ex.getMessage().contains( "For Functions with isHA true, hasResult must also be true.")); } @@ -798,7 +798,7 @@ public static void serverExecution_Inline_InvalidAttributes() { }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operation"); } @@ -823,7 +823,7 @@ public static void serverExecution_Inline_InvalidAttributes() { }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operation"); } @@ -851,7 +851,7 @@ public static void allServerExecution_SendException(Boolean isByName, Function f }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operation"); } @@ -877,7 +877,7 @@ public static void allServerExecution_SendException(Boolean isByName, Function f }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operation"); } @@ -932,7 +932,7 @@ public static void allServerExecution_SendException(Boolean isByName, Function f }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); fail("Test failed after the execute operation asdfasdfa "); } } @@ -940,9 +940,9 @@ public static void allServerExecution_SendException(Boolean isByName, Function f private static ResultCollector execute(Execution member, Serializable args, Function function, Boolean isByName) throws Exception { if (isByName.booleanValue()) {// by name - LogWriterSupport.getLogWriter().info("The function name to execute : " + function.getId()); + LogWriterUtils.getLogWriter().info("The function name to execute : " + function.getId()); Execution me = member.withArgs(args); - LogWriterSupport.getLogWriter().info("The args passed : " + args); + LogWriterUtils.getLogWriter().info("The args passed : " + args); return me.execute(function.getId()); } else { // By Instance http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java index 360c1ff..0d6dca5 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java @@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -216,7 +216,7 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase { protected static void dump() { - final InternalLogWriter logger = LogWriterSupport.getLogWriter(); + final InternalLogWriter logger = LogWriterUtils.getLogWriter(); ((PartitionedRegion)customerPR).dumpAllBuckets(false); ((PartitionedRegion)orderPR).dumpAllBuckets(false); ((PartitionedRegion)shipmentPR).dumpAllBuckets(false); @@ -431,7 +431,7 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase { if (partitionedRegionName.equals(customerPR_Name)) { customerPR = cache.createRegion(partitionedRegionName, attr.create()); assertNotNull(customerPR); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + customerPR); @@ -439,7 +439,7 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase { if (partitionedRegionName.equals(orderPR_Name)) { orderPR = cache.createRegion(partitionedRegionName, attr.create()); assertNotNull(orderPR); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + orderPR); @@ -448,7 +448,7 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase { if (partitionedRegionName.equals(shipmentPR_Name)) { shipmentPR = cache.createRegion(partitionedRegionName, attr.create()); assertNotNull(shipmentPR); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + shipmentPR); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java index 0ec7b20..0624f0f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java @@ -56,8 +56,8 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.IgnoredException; -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.Host; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -537,7 +537,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, "disconnect"); - Threads.join(async[0], 50 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 50 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -693,7 +693,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends "startServerHA"); emptyServer1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, "closeCacheHA"); - Threads.join(async[0], 4 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 4 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -1138,7 +1138,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends ds.disconnect(); } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Exception Occured : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception Occured : " + e.getMessage()); e.printStackTrace(); Assert.fail("Test failed", e); } @@ -1418,7 +1418,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends factory.setDataPolicy(policy); assertNotNull(cache); region = cache.createRegion(REGION_NAME, factory.create()); - LogWriterSupport.getLogWriter().info("Client Region Created :" + region); + LogWriterUtils.getLogWriter().info("Client Region Created :" + region); assertNotNull(region); for (int i = 1; i <= 200; i++) { region.put("execKey-" + i, new Integer(i)); @@ -1444,7 +1444,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends factory.setPoolName(p.getName()); assertNotNull(cache); region = cache.createRegion(REGION_NAME, factory.create()); - LogWriterSupport.getLogWriter().info("Client Region Created :" + region); + LogWriterUtils.getLogWriter().info("Client Region Created :" + region); assertNotNull(region); } @@ -1454,7 +1454,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends factory.setDataPolicy(policy); assertNotNull(cache); region = cache.createRegion(REGION_NAME, factory.create()); - LogWriterSupport.getLogWriter().info("Region Created :" + region); + LogWriterUtils.getLogWriter().info("Region Created :" + region); assertNotNull(region); CacheServer server = cache.addCacheServer(); @@ -1477,7 +1477,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends factory.setDataPolicy(policy); assertNotNull(cache); region = cache.createRegion(REGION_NAME, factory.create()); - LogWriterSupport.getLogWriter().info("Region Created :" + region); + LogWriterUtils.getLogWriter().info("Region Created :" + region); assertNotNull(region); } @@ -1497,7 +1497,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends ds.disconnect(); ds = getSystem(props); cache = CacheFactory.create(ds); - LogWriterSupport.getLogWriter().info("Created Cache on peer"); + LogWriterUtils.getLogWriter().info("Created Cache on peer"); assertNotNull(cache); FunctionService.registerFunction(function); } @@ -1542,11 +1542,11 @@ public class DistributedRegionFunctionExecutionDUnitTest extends }; Wait.waitForCriterion(wc, 2000, 500, false); Collection bridgeServers = cache.getCacheServers(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Start Server Bridge Servers list : " + bridgeServers.size()); Iterator bridgeIterator = bridgeServers.iterator(); CacheServer bridgeServer = (CacheServer)bridgeIterator.next(); - LogWriterSupport.getLogWriter().info("start Server Bridge Server" + bridgeServer); + LogWriterUtils.getLogWriter().info("start Server Bridge Server" + bridgeServer); try { bridgeServer.start(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java index f9c45e7..9edb736 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java @@ -54,7 +54,7 @@ import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -263,7 +263,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Exception : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + e.getMessage()); e.printStackTrace(); fail("Test failed after the put operation"); } @@ -287,9 +287,9 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ .getFunctionExecutionsCompleted()); assertTrue(functionServiceStats.getResultsReceived() >= resultReceived_Aggregate); - LogWriterSupport.getLogWriter().info("Calling FunctionStats for TEST_FUNCTION2 :"); + LogWriterUtils.getLogWriter().info("Calling FunctionStats for TEST_FUNCTION2 :"); FunctionStats functionStats = FunctionStats.getFunctionStats(TestFunction.TEST_FUNCTION2, iDS); - LogWriterSupport.getLogWriter().info("Called FunctionStats for TEST_FUNCTION2 :"); + LogWriterUtils.getLogWriter().info("Called FunctionStats for TEST_FUNCTION2 :"); assertEquals(noOfExecutionCalls_TESTFUNCTION2, functionStats .getFunctionExecutionCalls()); assertEquals(noOfExecutionsCompleted_TESTFUNCTION2, functionStats @@ -380,14 +380,14 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ ds.disconnect(); ds = getSystem(props); cache = CacheFactory.create(ds); - LogWriterSupport.getLogWriter().info("Created Cache on Server"); + LogWriterUtils.getLogWriter().info("Created Cache on Server"); assertNotNull(cache); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.DISTRIBUTED_ACK); factory.setDataPolicy(DataPolicy.REPLICATE); assertNotNull(cache); Region region = cache.createRegion(regionName, factory.create()); - LogWriterSupport.getLogWriter().info("Region Created :" + region); + LogWriterUtils.getLogWriter().info("Region Created :" + region); assertNotNull(region); for (int i = 1; i <= 200; i++) { region.put("execKey-" + i, new Integer(i)); @@ -429,7 +429,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ ds.disconnect(); ds = getSystem(props); cache = CacheFactory.create(ds); - LogWriterSupport.getLogWriter().info("Created Cache on Client"); + LogWriterUtils.getLogWriter().info("Created Cache on Client"); assertNotNull(cache); @@ -454,7 +454,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ factory.setPoolName(p.getName()); assertNotNull(cache); Region region = cache.createRegion(regionName, factory.create()); - LogWriterSupport.getLogWriter().info("Client Region Created :" + region); + LogWriterUtils.getLogWriter().info("Client Region Created :" + region); assertNotNull(region); for (int i = 1; i <= 200; i++) { region.put("execKey-" + i, new Integer(i)); @@ -605,7 +605,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation nn TRUE"); } function = new TestFunction(true, TestFunction.TEST_FUNCTION5); @@ -627,7 +627,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operationssssss"); } return Boolean.TRUE; @@ -975,7 +975,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ factory.setScope(Scope.DISTRIBUTED_ACK); factory.setDataPolicy(DataPolicy.EMPTY); Region region = getCache().createRegion(rName, factory.create()); - LogWriterSupport.getLogWriter().info("Region Created :" + region); + LogWriterUtils.getLogWriter().info("Region Created :" + region); assertNotNull(region); FunctionService.registerFunction(new TestFunction(true, TestFunction.TEST_FUNCTION2)); for (int i = 1; i <= 200; i++) { @@ -993,7 +993,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ factory.setScope(Scope.DISTRIBUTED_ACK); factory.setDataPolicy(DataPolicy.REPLICATE); Region region = getCache().createRegion(rName, factory.create()); - LogWriterSupport.getLogWriter().info("Region Created :" + region); + LogWriterUtils.getLogWriter().info("Region Created :" + region); assertNotNull(region); FunctionService.registerFunction(new TestFunction(true, TestFunction.TEST_FUNCTION2)); for (int i = 1; i <= 200; i++) { @@ -1147,7 +1147,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Exception Occured : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception Occured : " + e.getMessage()); e.printStackTrace(); Assert.fail("Test failed", e); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java index be26687..6d582ed 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java @@ -47,7 +47,7 @@ import com.gemstone.gemfire.internal.cache.functions.LocalDataSetFunction; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -143,7 +143,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase { Region localRegion = PartitionRegionHelper.getLocalDataForContext((RegionFunctionContext)context); Iterator it = localRegion.keySet().iterator(); while (it.hasNext()) { - LogWriterSupport.getLogWriter().info("LocalKeys:"+it.next()); + LogWriterUtils.getLogWriter().info("LocalKeys:"+it.next()); } context.getResultSender().lastResult(Boolean.TRUE); } @@ -304,7 +304,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase { if (partitionedRegionName.equals("CustomerPR")) { customerPR = cache.createRegion(partitionedRegionName, attr.create()); assertNotNull(customerPR); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + customerPR); @@ -312,7 +312,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase { if (partitionedRegionName.equals("OrderPR")) { orderPR = cache.createRegion(partitionedRegionName, attr.create()); assertNotNull(orderPR); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + orderPR); @@ -321,7 +321,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase { if (partitionedRegionName.equals("ShipmentPR")) { shipmentPR = cache.createRegion(partitionedRegionName, attr.create()); assertNotNull(shipmentPR); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + shipmentPR); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java index 9ffbb61..9d68f8f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java @@ -38,7 +38,7 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -116,7 +116,7 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{ region = cache.createRegion(partitionedRegionName, attr.create()); assertNotNull(region); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + region); } @@ -129,7 +129,7 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{ assertNotNull(cache); region = cache.createRegion(distributedRegionName, attr.create()); assertNotNull(region); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Distributed Region " + distributedRegionName + " created Successfully :" + region); }
