Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-773-2 b17027b64 -> c05f6798d
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java index c0f6dea..01f665c 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; 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.LogWriterUtils; public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBase { @@ -145,14 +145,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - LogWriterSupport.getLogWriter().info("Created remote receivers"); + LogWriterUtils.getLogWriter().info("Created remote receivers"); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created local site cache"); + LogWriterUtils.getLogWriter().info("Created local site cache"); vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true, 100, 10, false, true, null, true }); @@ -163,7 +163,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true, 100, 10, false, true, null, true }); - LogWriterSupport.getLogWriter().info("Created local site senders"); + LogWriterUtils.getLogWriter().info("Created local site senders"); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); @@ -174,15 +174,15 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); - LogWriterSupport.getLogWriter().info("Created local site persistent PR"); + LogWriterUtils.getLogWriter().info("Created local site persistent PR"); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started sender on vm4"); + LogWriterUtils.getLogWriter().info("Started sender on vm4"); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the senders"); + LogWriterUtils.getLogWriter().info("Started the senders"); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() }); @@ -234,7 +234,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on remote site vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { @@ -272,7 +272,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 3000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -281,7 +281,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -289,7 +289,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -301,7 +301,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); @@ -322,7 +322,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends fail(); } - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); //start the senders in async mode. This will ensure that the //node of shadow PR that went down last will come up first @@ -331,14 +331,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- @@ -383,7 +383,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on remote site vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -421,7 +421,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 3000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -430,7 +430,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -438,7 +438,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -450,7 +450,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); @@ -471,7 +471,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends fail(); } - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); //start the senders in async mode. This will ensure that the //node of shadow PR that went down last will come up first @@ -480,14 +480,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- @@ -528,7 +528,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, false }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on local site vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -560,7 +560,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 300 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -569,7 +569,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -577,7 +577,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -589,7 +589,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -611,7 +611,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends fail(); } - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); vm4.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" }); @@ -625,7 +625,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); @@ -633,13 +633,13 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Creating the receiver."); + LogWriterUtils.getLogWriter().info("Creating the receiver."); //create receiver on remote site vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); //create PR on remote site - LogWriterSupport.getLogWriter().info("Creating the partitioned region at receiver. "); + LogWriterUtils.getLogWriter().info("Creating the partitioned region at receiver. "); vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -649,7 +649,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Doing some extra puts. "); + LogWriterUtils.getLogWriter().info("Doing some extra puts. "); //start puts in region on local site vm4.invoke(WANTestBase.class, "doPutsAfter300", new Object[] { getTestMethodName(), 1000 }); //---------------------------------------------------------------------------------------------------- @@ -658,7 +658,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Validating the region size at the receiver end. "); + LogWriterUtils.getLogWriter().info("Validating the region size at the receiver end. "); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 1000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { @@ -702,7 +702,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on remote site vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -740,7 +740,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 3000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -749,7 +749,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -757,7 +757,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -769,7 +769,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -791,7 +791,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends fail(); } - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); //start the senders in async mode. This will ensure that the //node of shadow PR that went down last will come up first @@ -800,14 +800,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- @@ -860,7 +860,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on remote site vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -898,7 +898,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { getTestMethodName(), 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -907,7 +907,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -915,7 +915,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -927,7 +927,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -949,7 +949,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends fail(); } - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); //start the senders in async mode. This will ensure that the //node of shadow PR that went down last will come up first @@ -958,14 +958,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- @@ -1010,7 +1010,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on remote site vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -1048,7 +1048,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { getTestMethodName(), 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -1057,7 +1057,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1065,7 +1065,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -1077,7 +1077,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); // create PR on local site vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", @@ -1089,7 +1089,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); //start the senders in async mode. This will ensure that the //node of shadow PR that went down last will come up first @@ -1098,14 +1098,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- @@ -1125,7 +1125,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //do some extra puts in region on local site vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { getTestMethodName(), 10000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { @@ -1158,7 +1158,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends // start puts in region on local site vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { getTestMethodName(), 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); // --------------------close and rebuild local site // ------------------------------------------------- @@ -1168,7 +1168,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); // restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1176,7 +1176,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); // // create PR on local site // vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", @@ -1213,7 +1213,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends fail(); } - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 1000 }); @@ -1262,7 +1262,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on remote site vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -1300,7 +1300,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -1309,7 +1309,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1317,7 +1317,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders from disk store @@ -1330,7 +1330,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //start the senders. NOTE that the senders are not associated with partitioned region @@ -1339,16 +1339,16 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the senders."); + LogWriterUtils.getLogWriter().info("Started the senders."); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- @@ -1392,7 +1392,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on remote site vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { @@ -1430,7 +1430,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //kill the senders vm4.invoke(WANTestBase.class, "killSender", new Object[] {}); @@ -1438,7 +1438,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders. The local site has been brought down."); + LogWriterUtils.getLogWriter().info("Killed all the senders. The local site has been brought down."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1446,7 +1446,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -1458,7 +1458,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { @@ -1470,7 +1470,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); //start the senders vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -1478,16 +1478,16 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the senders."); + LogWriterUtils.getLogWriter().info("Started the senders."); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 1000 }); @@ -1569,7 +1569,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 3000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //----------------- Close and rebuild local site ------------------------------------- //kill the senders @@ -1578,7 +1578,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1586,7 +1586,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create back the senders vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, @@ -1598,7 +1598,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true, 100, 10, false, false, null, true }); - LogWriterSupport.getLogWriter().info("Created the senders again"); + LogWriterUtils.getLogWriter().info("Created the senders again"); vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true }); vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true }); @@ -1611,9 +1611,9 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the senders."); + LogWriterUtils.getLogWriter().info("Started the senders."); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); @@ -1621,7 +1621,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] { @@ -1643,13 +1643,13 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends fail(); } - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); //------------------------------------------------------------------------------------------- //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 3000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 3000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 3000 }); @@ -1711,7 +1711,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_PR", 1000 }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java index 7ea17d6..530e101 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java @@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Wait; public class ParallelWANPropagationDUnitTest extends WANTestBase { @@ -421,7 +421,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { Integer regionSize = (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_PR" }); - LogWriterSupport.getLogWriter().info("Region size on remote is: " + regionSize); + LogWriterUtils.getLogWriter().info("Region size on remote is: " + regionSize); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java index 90ccd1b..b306c22 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java @@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.RMIException; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -175,7 +175,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { fail("Interrupted the async invocation."); } - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); validateQueueContents(vm4, "ln", 0); validateQueueContents(vm5, "ln", 0); @@ -315,7 +315,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { vm4.invoke(() -> WANTestBase.startSender( "ln" )); asyncPuts.getResult(); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR", 300 )); @@ -354,7 +354,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 100 )); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR", 100 )); @@ -389,7 +389,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 100 )); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR", 100 )); } @@ -432,7 +432,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { vm2.invoke(() -> WANTestBase.createReceiver( nyPort )); vm2.invoke(() -> WANTestBase.createReplicatedRegion( getTestMethodName() + "_RR", null, isOffHeap() )); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR", 100 )); vm5.invoke(() -> WANTestBase.stopSender( "ln" )); @@ -582,7 +582,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { public void run() { InternalLocator inl = (InternalLocator)Locator.getLocator(); ServerLocator servel = inl.getServerLocatorAdvisee(); - LogWriterSupport.getLogWriter().info("Server load map is " + servel.getLoadMap()); + LogWriterUtils.getLogWriter().info("Server load map is " + servel.getLoadMap()); assertTrue("expected an empty map but found " + servel.getLoadMap(), servel.getLoadMap().isEmpty()); QueueConnectionRequest request = new QueueConnectionRequest( http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java index 6cc2d99..bd60ad6 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java @@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.cache.wan.serial; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Wait; /** @@ -217,8 +217,8 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The first ds is " + firstDStore); - LogWriterSupport.getLogWriter().info("The first ds is " + secondDStore); + LogWriterUtils.getLogWriter().info("The first ds is " + firstDStore); + LogWriterUtils.getLogWriter().info("The first ds is " + secondDStore); vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", null, isOffHeap() }); @@ -243,7 +243,7 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); // verify if the queue has all the events // vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000 @@ -262,24 +262,24 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the sender. "); + LogWriterUtils.getLogWriter().info("Killed all the sender. "); // restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, firstDStore, true }); - LogWriterSupport.getLogWriter().info("Creted the sender.... in vm4 "); + LogWriterUtils.getLogWriter().info("Creted the sender.... in vm4 "); vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, secondDStore, true }); - LogWriterSupport.getLogWriter().info("Creted the sender.... in vm5 "); + LogWriterUtils.getLogWriter().info("Creted the sender.... in vm5 "); AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the sender in vm 4"); + LogWriterUtils.getLogWriter().info("Started the sender in vm 4"); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the sender in vm 5"); + LogWriterUtils.getLogWriter().info("Started the sender in vm 5"); try { inv1.join(); } catch (InterruptedException e) { @@ -322,8 +322,8 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The first ds is " + firstDStore); - LogWriterSupport.getLogWriter().info("The first ds is " + secondDStore); + LogWriterUtils.getLogWriter().info("The first ds is " + firstDStore); + LogWriterUtils.getLogWriter().info("The first ds is " + secondDStore); vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", null, isOffHeap() }); @@ -348,13 +348,13 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); // kill the vm vm4.invoke(WANTestBase.class, "killSender", new Object[] {}); vm5.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed the sender. "); + LogWriterUtils.getLogWriter().info("Killed the sender. "); // restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -362,11 +362,11 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, firstDStore, true }); - LogWriterSupport.getLogWriter().info("Created the sender.... in vm4 "); + LogWriterUtils.getLogWriter().info("Created the sender.... in vm4 "); vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, secondDStore, true }); - LogWriterSupport.getLogWriter().info("Created the sender.... in vm5 "); + LogWriterUtils.getLogWriter().info("Created the sender.... in vm5 "); vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); @@ -376,10 +376,10 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the sender in vm 4"); + LogWriterUtils.getLogWriter().info("Started the sender in vm 4"); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the sender in vm 5"); + LogWriterUtils.getLogWriter().info("Started the sender in vm 5"); try { inv1.join(); } catch (InterruptedException e) { @@ -445,7 +445,7 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); // verify if the queue has all the events // vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000 @@ -462,22 +462,22 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "killSender", new Object[] {}); vm5.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed the sender. "); + LogWriterUtils.getLogWriter().info("Killed the sender. "); // restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, false, 100, 10, false, false, null, true}); - LogWriterSupport.getLogWriter().info("Creted the sender.... in vm4 "); + LogWriterUtils.getLogWriter().info("Creted the sender.... in vm4 "); vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, false, 100, 10, false, false, null, true}); - LogWriterSupport.getLogWriter().info("Creted the sender.... in vm5 "); + LogWriterUtils.getLogWriter().info("Creted the sender.... in vm5 "); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the sender in vm 4"); + LogWriterUtils.getLogWriter().info("Started the sender in vm 4"); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the sender in vm 5"); + LogWriterUtils.getLogWriter().info("Started the sender in vm 5"); AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); @@ -529,8 +529,8 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The first ds is " + firstDStore); - LogWriterSupport.getLogWriter().info("The first ds is " + secondDStore); + LogWriterUtils.getLogWriter().info("The first ds is " + firstDStore); + LogWriterUtils.getLogWriter().info("The first ds is " + secondDStore); vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", null, isOffHeap() }); @@ -555,13 +555,13 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 1000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); // kill the vm vm4.invoke(WANTestBase.class, "killSender", new Object[] {}); vm5.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed the sender. "); + LogWriterUtils.getLogWriter().info("Killed the sender. "); // restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -569,11 +569,11 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, firstDStore, true }); - LogWriterSupport.getLogWriter().info("Created the sender.... in vm4 "); + LogWriterUtils.getLogWriter().info("Created the sender.... in vm4 "); vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, secondDStore, true }); - LogWriterSupport.getLogWriter().info("Created the sender.... in vm5 "); + LogWriterUtils.getLogWriter().info("Created the sender.... in vm5 "); vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); @@ -583,10 +583,10 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the sender in vm 4"); + LogWriterUtils.getLogWriter().info("Started the sender in vm 4"); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started the sender in vm 5"); + LogWriterUtils.getLogWriter().info("Started the sender in vm 5"); try { inv1.join(); } catch (InterruptedException e) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java index 18d028e..56e8d82 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java @@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.cache.wan.BatchException70; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Wait; public class SerialWANPropogationDUnitTest extends WANTestBase { @@ -333,7 +333,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { Integer regionSize = (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_RR" }); - LogWriterSupport.getLogWriter().info("Region size on remote is: " + regionSize); + LogWriterUtils.getLogWriter().info("Region size on remote is: " + regionSize); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1310,7 +1310,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - LogWriterSupport.getLogWriter().info("Started receivers on remote site"); + LogWriterUtils.getLogWriter().info("Started receivers on remote site"); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1332,7 +1332,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started senders on local site"); + LogWriterUtils.getLogWriter().info("Started senders on local site"); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); @@ -1341,7 +1341,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 10000 }); - LogWriterSupport.getLogWriter().info("Started async puts on local site"); + LogWriterUtils.getLogWriter().info("Started async puts on local site"); Wait.pause(1000); Map oldConnectionInfo = (Map)vm4.invoke(WANTestBase.class, @@ -1349,11 +1349,11 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { assertNotNull(oldConnectionInfo); String oldServerHost = (String)oldConnectionInfo.get("serverHost"); int oldServerPort = (Integer)oldConnectionInfo.get("serverPort"); - LogWriterSupport.getLogWriter().info("Got sender to receiver connection information"); + LogWriterUtils.getLogWriter().info("Got sender to receiver connection information"); AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender"); inv2.join(); - LogWriterSupport.getLogWriter().info("Killed primary sender on local site"); + LogWriterUtils.getLogWriter().info("Killed primary sender on local site"); Wait.pause(5000);// give some time for vm5 to take primary charge Map newConnectionInfo = (Map)vm5.invoke(WANTestBase.class, @@ -1361,11 +1361,11 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { assertNotNull(newConnectionInfo); String newServerHost = (String)newConnectionInfo.get("serverHost"); int newServerPort = (Integer)newConnectionInfo.get("serverPort"); - LogWriterSupport.getLogWriter().info("Got new sender to receiver connection information"); + LogWriterUtils.getLogWriter().info("Got new sender to receiver connection information"); assertEquals(oldServerHost, newServerHost); assertEquals(oldServerPort, newServerPort); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "Matched the new connection info with old connection info. Receiver affinity verified."); @@ -1400,7 +1400,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - LogWriterSupport.getLogWriter().info("Started receivers on remote site"); + LogWriterUtils.getLogWriter().info("Started receivers on remote site"); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1422,7 +1422,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started senders on local site"); + LogWriterUtils.getLogWriter().info("Started senders on local site"); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); @@ -1431,7 +1431,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 10000 }); - LogWriterSupport.getLogWriter().info("Started async puts on local site"); + LogWriterUtils.getLogWriter().info("Started async puts on local site"); Wait.pause(1000); Map oldConnectionInfo = (Map)vm4.invoke(WANTestBase.class, @@ -1439,36 +1439,36 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { assertNotNull(oldConnectionInfo); String oldServerHost = (String)oldConnectionInfo.get("serverHost"); int oldServerPort = (Integer)oldConnectionInfo.get("serverPort"); - LogWriterSupport.getLogWriter().info("Got sender to receiver connection information"); + LogWriterUtils.getLogWriter().info("Got sender to receiver connection information"); // ---------------------------- KILL vm4 // -------------------------------------- AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender"); inv2.join(); - LogWriterSupport.getLogWriter().info("Killed vm4 (primary sender) on local site"); + LogWriterUtils.getLogWriter().info("Killed vm4 (primary sender) on local site"); // ----------------------------------------------------------------------------- vm5.invoke(WANTestBase.class, "waitForSenderToBecomePrimary", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("vm5 sender has now acquired primary status"); + LogWriterUtils.getLogWriter().info("vm5 sender has now acquired primary status"); Wait.pause(5000);// give time to process unprocessedEventsMap // ---------------------------REBUILD vm4 // -------------------------------------- - LogWriterSupport.getLogWriter().info("Rebuilding vm4...."); + LogWriterUtils.getLogWriter().info("Rebuilding vm4...."); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, false, 100, 10, false, false, null, true }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - LogWriterSupport.getLogWriter().info("Rebuilt vm4"); + LogWriterUtils.getLogWriter().info("Rebuilt vm4"); // ----------------------------------------------------------------------------- // --------------------------- KILL vm5 // ---------------------------------------- inv1.join();// once the puts are done, kill vm5 - LogWriterSupport.getLogWriter().info("puts in vm5 are done"); + LogWriterUtils.getLogWriter().info("puts in vm5 are done"); inv2 = vm5.invokeAsync(WANTestBase.class, "killSender"); inv2.join(); @@ -1481,10 +1481,10 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { assertNotNull(newConnectionInfo); String newServerHost = (String)newConnectionInfo.get("serverHost"); int newServerPort = (Integer)newConnectionInfo.get("serverPort"); - LogWriterSupport.getLogWriter().info("Got new sender to receiver connection information"); + LogWriterUtils.getLogWriter().info("Got new sender to receiver connection information"); assertEquals(oldServerHost, newServerHost); assertEquals(oldServerPort, newServerPort); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "Matched the new connection info with old connection info. Receiver affinity verified."); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java index 74f5554..675e15b 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.management.internal.MBeanJMXAdapter; 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; @@ -323,7 +323,7 @@ public class WANManagementDUnitTest extends ManagementTestBase { DistributedSystemMXBean dsBean = service.getDistributedSystemMXBean(); Map<String, Boolean> dsMap = dsBean.viewRemoteClusterStatus(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Ds Map is: " + dsMap + "</ExpectedString> "); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java index b076db7..43caf90 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java @@ -838,8 +838,8 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { } protected void executeAndVerifyCommand(String commandString) { CommandResult cmdResult = executeCommand(commandString); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Command : " + commandString); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Command Result : " + commandResultToString(cmdResult)); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Command : " + commandString); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Command Result : " + commandResultToString(cmdResult)); assertEquals(Status.OK, cmdResult.getStatus()); assertFalse(cmdResult.failedToPersist()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java index ba69123..4d7882f 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java @@ -36,7 +36,7 @@ import com.gemstone.gemfire.management.RegionMXBean; import com.gemstone.gemfire.management.internal.MBeanJMXAdapter; 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; @@ -169,7 +169,7 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase { .getDistributedSystemMXBean(); assertNotNull(dsBean); Map<String, Boolean> dsMap = dsBean.viewRemoteClusterStatus(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Ds Map is: " + dsMap.size()); assertNotNull(dsMap); assertEquals(true, dsMap.size() > 0 ? true : false);
