http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java index c14af54..dbdff58 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java @@ -25,6 +25,9 @@ import com.gemstone.gemfire.internal.cache.wan.BatchException70; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor; import com.gemstone.gemfire.test.dunit.AsyncInvocation; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.Wait; import java.net.SocketException; import java.util.Set; @@ -75,13 +78,13 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -89,9 +92,9 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //before doing any puts, let the senders be running in order to ensure that //not a single event will be lost @@ -112,7 +115,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook", new Object[] {"ln", Boolean.TRUE }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); // verify all buckets drained on all sender nodes. @@ -126,7 +129,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 1000 }); + getTestMethodName() + "_PR", 1000 }); int dispatched1 = (Integer)vm4.invoke(WANTestBase.class, "verifyAndGetEventsDispatchedByConcurrentDispatchers", @@ -179,13 +182,13 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -193,9 +196,9 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //before doing any puts, let the senders be running in order to ensure that //not a single event will be lost @@ -204,7 +207,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); //verify all buckets drained on all sender nodes. @@ -214,7 +217,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 1000 }); + getTestMethodName() + "_PR", 1000 }); } @@ -246,13 +249,13 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -260,9 +263,9 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //before doing any puts, let the senders be running in order to ensure that //not a single event will be lost @@ -271,7 +274,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); //verify all buckets drained on all sender nodes. @@ -281,7 +284,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 1000 }); + getTestMethodName() + "_PR", 1000 }); } @@ -312,13 +315,13 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -336,7 +339,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); @@ -344,9 +347,9 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //verify all buckets drained on all sender nodes. vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); @@ -359,7 +362,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { // started before creating partition region it is quite possible that the // region may loose some of the events. This needs to be handled by the code vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 1000 }); + getTestMethodName() + "_PR", 1000 }); } /** @@ -471,13 +474,13 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -485,9 +488,9 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //before doing any puts, let the senders be running in order to ensure that //not a single event will be lost @@ -496,10 +499,10 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 1000 }); + getTestMethodName() + "_PR", 1000 }); //-------------------Close and rebuild local site --------------------------------- vm4.invoke(WANTestBase.class, "killSender", new Object[] {}); @@ -508,8 +511,8 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); Integer regionSize = - (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {testName + "_PR" }); - getLogWriter().info("Region size on remote is: " + regionSize); + (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_PR" }); + 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 }); @@ -531,13 +534,13 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -550,11 +553,11 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); //------------------------------------------------------------------------------------ - addExpectedException(EntryExistsException.class.getName()); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(EntryExistsException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10000 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 10000 }); //verify all buckets drained on all sender nodes. vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); @@ -563,9 +566,9 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 10000 }); + getTestMethodName() + "_PR", 10000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 10000 }); + getTestMethodName() + "_PR", 10000 }); } /** @@ -597,13 +600,13 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, "ln", 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, "ln", 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, "ln", 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, "ln", 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -611,11 +614,11 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, null, 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, null, 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 }); //verify all buckets drained on all sender nodes. vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); @@ -624,7 +627,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName, 1000 }); + getTestMethodName(), 1000 }); } @@ -657,13 +660,13 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION }); vm4.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, "ln", 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, "ln", 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, "ln", 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, "ln", 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -671,11 +674,11 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, null, 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions", - new Object[] { testName, null, 1, 100, isOffHeap() }); + new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 }); //verify all buckets drained on all sender nodes. vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); @@ -684,11 +687,11 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName, 1000 }); + getTestMethodName(), 1000 }); } public void testPartitionedParallelPropagationHA() throws Exception { - addExpectedException(SocketException.class.getName()); // for Connection reset + IgnoredException.addIgnoredException(SocketException.class.getName()); // for Connection reset Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId", new Object[] { 1 }); Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, @@ -717,13 +720,13 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 2, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 2, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 2, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 2, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -731,17 +734,17 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); AsyncInvocation inv1 = vm7.invokeAsync(WANTestBase.class, "doPuts", - new Object[] { testName + "_PR", 5000 }); - pause(500); + new Object[] { getTestMethodName() + "_PR", 5000 }); + Wait.pause(500); AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender"); AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "doPuts", - new Object[] { testName + "_PR", 10000 }); - pause(1500); + new Object[] { getTestMethodName() + "_PR", 10000 }); + Wait.pause(1500); AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender"); inv1.join(); inv2.join(); @@ -749,18 +752,18 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { inv4.join(); vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 10000 }); + getTestMethodName() + "_PR", 10000 }); vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 10000 }); + getTestMethodName() + "_PR", 10000 }); //verify all buckets drained on the sender nodes that up and running. vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 10000 }); + getTestMethodName() + "_PR", 10000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 10000 }); + getTestMethodName() + "_PR", 10000 }); } public void testWANPDX_PR_MultipleVM_ConcurrentParallelSender() { @@ -780,21 +783,21 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 0, 2, isOffHeap()}); + getTestMethodName() + "_PR", null, 0, 2, isOffHeap()}); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 0, 2, isOffHeap()}); + getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()}); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 0, 2, isOffHeap()}); + getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()}); vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR", + vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR", 10 }); vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] { - testName + "_PR", 10 }); + getTestMethodName() + "_PR", 10 }); } public void testWANPDX_PR_MultipleVM_ConcurrentParallelSender_StartedLater() { @@ -814,14 +817,14 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 0, 2, isOffHeap()}); + getTestMethodName() + "_PR", null, 0, 2, isOffHeap()}); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 0, 2, isOffHeap()}); + getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()}); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 0, 2, isOffHeap()}); + getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()}); - vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR", + vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR", 10 }); AsyncInvocation inv1 = vm3.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -835,11 +838,11 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { fail("Caught interrupted exception"); } - vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR", + vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR", 40 }); vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] { - testName + "_PR", 40 }); + getTestMethodName() + "_PR", 40 }); } public static void setTestHook(String senderId, boolean hook) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java index e0775b7..1ed4d1b 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java @@ -19,6 +19,9 @@ package com.gemstone.gemfire.internal.cache.wan.concurrent; import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; 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.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.Wait; /** * @author skumar @@ -33,9 +36,9 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes public void setUp() throws Exception { super.setUp(); - addExpectedException("Broken pipe"); - addExpectedException("Connection reset"); - addExpectedException("Unexpected IOException"); + IgnoredException.addIgnoredException("Broken pipe"); + IgnoredException.addIgnoredException("Connection reset"); + IgnoredException.addIgnoredException("Unexpected IOException"); } public void testParallelGatewaySenderWithoutStarting() { @@ -62,28 +65,28 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); vm4.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" }); - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 0 }); - vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 0 }); + vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 0 }); + vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 0 }); } /** @@ -113,18 +116,18 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] { - testName + "_PR", "ln", 1, 100 }); + getTestMethodName() + "_PR", "ln", 1, 100 }); vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] { - testName + "_PR", "ln", 1, 100 }); + getTestMethodName() + "_PR", "ln", 1, 100 }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //start the senders vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -132,18 +135,18 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - pause(2000); + Wait.pause(2000); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 }); - vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 }); + vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 }); + vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 }); } @@ -175,13 +178,13 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -189,9 +192,9 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //make sure all the senders are running before doing any puts vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); @@ -200,19 +203,19 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); //FIRST RUN: now, the senders are started. So, start the puts - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 }); //now, pause all of the senders vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); - pause(2000); + Wait.pause(2000); //SECOND RUN: keep one thread doing puts to the region - vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); //verify region size remains on remote vm and is restricted below a specified limit (i.e. number of puts in the first run) - vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 100 }); + vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {getTestMethodName() + "_PR", 100 }); } /** @@ -243,13 +246,13 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -257,9 +260,9 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //make sure all the senders are running before doing any puts vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); @@ -268,7 +271,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); //now, the senders are started. So, start the puts - vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); //now, pause all of the senders vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); @@ -277,7 +280,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); //sleep for a second or two - pause(2000); + Wait.pause(2000); //resume the senders vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); @@ -285,7 +288,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); - pause(2000); + Wait.pause(2000); vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); @@ -293,7 +296,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); //find the region size on remote vm - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 }); + vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 }); } @@ -322,14 +325,14 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -339,7 +342,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); //start the puts - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 }); //let the queue drain completely vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 }); @@ -353,11 +356,11 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); //do more puts - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); //validate region size on remote vm to contain only the events put in local site //before the senders are stopped. - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 100 }); + vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 100 }); } /** @@ -388,13 +391,13 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -402,9 +405,9 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //make sure all the senders are running before doing any puts vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); @@ -413,7 +416,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); //FIRST RUN: now, the senders are started. So, do some of the puts - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 }); //now, stop all of the senders vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); @@ -422,10 +425,10 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); //SECOND RUN: keep one thread doing puts - vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); //verify region size remains on remote vm and is restricted below a specified limit (number of puts in the first run) - vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 100 }); + vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {getTestMethodName() + "_PR", 100 }); } /** @@ -455,13 +458,13 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -469,9 +472,9 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //make sure all the senders are running before doing any puts vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); @@ -480,7 +483,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); //FIRST RUN: now, the senders are started. So, do some of the puts - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 }); //now, stop all of the senders vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); @@ -488,13 +491,13 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); - pause(2000); + Wait.pause(2000); //SECOND RUN: do some of the puts after the senders are stopped - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); //Region size on remote site should remain same and below the number of puts done in the FIRST RUN - vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 }); + vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {getTestMethodName() + "_PR", 200 }); //start the senders again AsyncInvocation vm4start = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -508,10 +511,10 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7start.getResult(START_TIMEOUT); //Region size on remote site should remain same and below the number of puts done in the FIRST RUN - vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 }); + vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {getTestMethodName() + "_PR", 200 }); //SECOND RUN: do some more puts - AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); async.join(); //verify all the buckets on all the sender nodes are drained @@ -521,7 +524,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); //verify the events propagate to remote site - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 }); + vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 }); vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 }); vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 }); @@ -559,13 +562,13 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -573,9 +576,9 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //make sure all the senders are running before doing any puts vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); @@ -583,12 +586,12 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - getLogWriter().info("All the senders are now started"); + LogWriterUtils.getLogWriter().info("All the senders are now started"); //FIRST RUN: now, the senders are started. So, do some of the puts - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 }); - getLogWriter().info("Done few puts"); + LogWriterUtils.getLogWriter().info("Done few puts"); //now, stop all of the senders vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); @@ -596,32 +599,32 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); - getLogWriter().info("All the senders are stopped"); - pause(2000); + LogWriterUtils.getLogWriter().info("All the senders are stopped"); + Wait.pause(2000); //SECOND RUN: do some of the puts after the senders are stopped - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); - getLogWriter().info("Done some more puts in second run"); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); + LogWriterUtils.getLogWriter().info("Done some more puts in second run"); //Region size on remote site should remain same and below the number of puts done in the FIRST RUN - vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 }); + vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {getTestMethodName() + "_PR", 200 }); //SECOND RUN: start async puts on region - AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 5000 }); - getLogWriter().info("Started high number of puts by async thread"); + AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 }); + LogWriterUtils.getLogWriter().info("Started high number of puts by async thread"); - getLogWriter().info("Starting the senders at the same time"); + LogWriterUtils.getLogWriter().info("Starting the senders at the same time"); //when puts are happening by another thread, start the senders vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("All the senders are started"); + LogWriterUtils.getLogWriter().info("All the senders are started"); async.join(); - pause(2000); + Wait.pause(2000); //verify all the buckets on all the sender nodes are drained vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); @@ -661,13 +664,13 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY }); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] { - testName + "_PR", "ln", 1, 100}); + getTestMethodName() + "_PR", "ln", 1, 100}); vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] { - testName + "_PR", "ln", 1, 100}); + getTestMethodName() + "_PR", "ln", 1, 100}); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -675,9 +678,9 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); //make sure all the senders are not running on accessor nodes and running on non-accessor nodes vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); @@ -687,7 +690,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); //FIRST RUN: now, the senders are started. So, do some of the puts - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 }); //now, stop all of the senders vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); @@ -695,13 +698,13 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); - pause(2000); + Wait.pause(2000); //SECOND RUN: do some of the puts after the senders are stopped - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); //Region size on remote site should remain same and below the number of puts done in the FIRST RUN - vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 }); + vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {getTestMethodName() + "_PR", 200 }); //start the senders again AsyncInvocation vm4start = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -715,19 +718,19 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7start.getResult(START_TIMEOUT); //Region size on remote site should remain same and below the number of puts done in the FIRST RUN - vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 }); + vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {getTestMethodName() + "_PR", 200 }); //SECOND RUN: do some more puts - AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); + AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); async.join(); - pause(5000); + Wait.pause(5000); //verify all buckets drained only on non-accessor nodes. vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); //verify the events propagate to remote site - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 }); + vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 }); } @@ -749,7 +752,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - getLogWriter().info("Created cache on local site"); + LogWriterUtils.getLogWriter().info("Created cache on local site"); vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY }); @@ -760,27 +763,27 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY }); - getLogWriter().info("Created senders on local site"); + LogWriterUtils.getLogWriter().info("Created senders on local site"); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", "ln", 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - getLogWriter().info("Created PRs on local site"); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - testName + "_PR", null, 1, 100, isOffHeap() }); - getLogWriter().info("Created PRs on remote site"); + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); + LogWriterUtils.getLogWriter().info("Created PRs on remote site"); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); - getLogWriter().info("Done 1000 puts on local site"); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); + LogWriterUtils.getLogWriter().info("Done 1000 puts on local site"); //Since puts are already done on userPR, it will have the buckets created. //During sender start, it will wait until those buckets are created for shadowPR as well. @@ -796,16 +799,16 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - getLogWriter().info("Started senders on local site"); + LogWriterUtils.getLogWriter().info("Started senders on local site"); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 5000 }); - getLogWriter().info("Done 5000 puts on local site"); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 }); + LogWriterUtils.getLogWriter().info("Done 5000 puts on local site"); vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); - getLogWriter().info("Paused senders on local site"); + LogWriterUtils.getLogWriter().info("Paused senders on local site"); vm4.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" }); @@ -813,14 +816,14 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" }); AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", - new Object[] { testName + "_PR", 1000 }); - getLogWriter().info("Started 1000 async puts on local site"); + new Object[] { getTestMethodName() + "_PR", 1000 }); + LogWriterUtils.getLogWriter().info("Started 1000 async puts on local site"); vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); - getLogWriter().info("Resumed senders on local site"); + LogWriterUtils.getLogWriter().info("Resumed senders on local site"); vm4.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" }); @@ -841,8 +844,8 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 5000 }); + getTestMethodName() + "_PR", 5000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_PR", 5000 }); + getTestMethodName() + "_PR", 5000 }); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java index 5533dc3..4e74822 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java @@ -21,9 +21,13 @@ import com.gemstone.gemfire.cache.RegionDestroyedException; import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; +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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.Wait; +import com.gemstone.gemfire.test.dunit.WaitCriterion; /** * @author skumar @@ -39,10 +43,10 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes public void setUp() throws Exception { super.setUp(); - addExpectedException("RegionDestroyedException"); - addExpectedException("Broken pipe"); - addExpectedException("Connection reset"); - addExpectedException("Unexpected IOException"); + IgnoredException.addIgnoredException("RegionDestroyedException"); + IgnoredException.addIgnoredException("Broken pipe"); + IgnoredException.addIgnoredException("Connection reset"); + IgnoredException.addIgnoredException("Unexpected IOException"); } // to test that when userPR is locally destroyed, shadow Pr is also locally @@ -57,7 +61,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes createReceiverAndDoPutsInPausedSender(nyPort); - vm4.invoke(() -> localDestroyRegion(testName + "_PR")); + vm4.invoke(() -> localDestroyRegion(getTestMethodName() + "_PR")); recreatePRDoPutsAndValidateRegionSizes(0, true); } finally { @@ -79,7 +83,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes vm4.invoke(() -> validateParallelSenderQueueAllBucketsDrained("ln")); - vm4.invoke(() -> localDestroyRegion(testName + "_PR")); + vm4.invoke(() -> localDestroyRegion(getTestMethodName() + "_PR")); recreatePRDoPutsAndValidateRegionSizes(10, false); } finally { @@ -96,11 +100,11 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes createReceiverAndDoPutsInPausedSender(nyPort); - vm4.invoke(() -> closeRegion(testName + "_PR")); + vm4.invoke(() -> closeRegion(getTestMethodName() + "_PR")); vm4.invoke(() -> resumeSender("ln")); - pause(500); //paused if there is any element which is received on remote site + Wait.pause(500); //paused if there is any element which is received on remote site recreatePRDoPutsAndValidateRegionSizes(0, false); @@ -115,14 +119,14 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes try { createAndStartSender(vm4, lnPort, 6, false, true); - vm4.invoke(() -> addCacheListenerAndDestroyRegion(testName + "_PR")); + vm4.invoke(() -> addCacheListenerAndDestroyRegion(getTestMethodName() + "_PR")); createReceiverAndDoPutsInPausedSender(nyPort); vm4.invoke(() -> resumeSender("ln")); AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class, - "doPutsFrom", new Object[] { testName + "_PR", 10, 101 }); + "doPutsFrom", new Object[] { getTestMethodName() + "_PR", 10, 101 }); try { putAsync.join(); } catch (InterruptedException e) { @@ -132,21 +136,21 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes if (putAsync.getException() != null && !(putAsync.getException() instanceof RegionDestroyedException)) { - fail("Expected RegionDestroyedException but got", + Assert.fail("Expected RegionDestroyedException but got", putAsync.getException()); } // before destroy, there is wait for queue to drain, so data will be // dispatched - vm2.invoke(() -> validateRegionSizeWithinRange(testName + "_PR", 10, 101)); // possible size is more than 10 + vm2.invoke(() -> validateRegionSizeWithinRange(getTestMethodName() + "_PR", 10, 101)); // possible size is more than 10 - vm4.invoke(() -> createPartitionedRegion(testName + "_PR", "ln", 1, 10, isOffHeap())); + vm4.invoke(() -> createPartitionedRegion(getTestMethodName() + "_PR", "ln", 1, 10, isOffHeap())); - vm4.invoke(() -> doPutsFrom(testName + "_PR", 10, 20)); + vm4.invoke(() -> doPutsFrom(getTestMethodName() + "_PR", 10, 20)); - vm4.invoke(() -> validateRegionSize(testName + "_PR", 10)); + vm4.invoke(() -> validateRegionSize(getTestMethodName() + "_PR", 10)); - vm2.invoke(() -> validateRegionSizeWithinRange(testName + "_PR", 20, 101)); // possible size is more than 20 + vm2.invoke(() -> validateRegionSizeWithinRange(getTestMethodName() + "_PR", 20, 101)); // possible size is more than 20 } finally { vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME()); } @@ -154,9 +158,9 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes public void testParallelGatewaySender_SingleNode_UserPR_Destroy_NodeDown() throws Exception { - addExpectedException("Broken pipe"); - addExpectedException("Connection reset"); - addExpectedException("Unexpected IOException"); + IgnoredException.addIgnoredException("Broken pipe"); + IgnoredException.addIgnoredException("Connection reset"); + IgnoredException.addIgnoredException("Unexpected IOException"); Integer[] locatorPorts = createLNAndNYLocators(); Integer lnPort = locatorPorts[0]; Integer nyPort = locatorPorts[1]; @@ -172,9 +176,9 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); - pause(200); + Wait.pause(200); AsyncInvocation localDestroyAsync = vm4.invokeAsync(WANTestBase.class, - "destroyRegion", new Object[] { testName + "_PR" }); + "destroyRegion", new Object[] { getTestMethodName() + "_PR" }); AsyncInvocation closeAsync = vm4.invokeAsync(WANTestBase.class, "closeCache"); @@ -186,7 +190,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes fail("Interrupted the async invocation."); } - vm2.invoke(() -> validateRegionSize(testName + "_PR", 10)); + vm2.invoke(() -> validateRegionSize(getTestMethodName() + "_PR", 10)); } finally { vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME()); vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME()); @@ -206,10 +210,10 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes createReceiverAndDoPutsInPausedSender(nyPort); AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class, - "doPutsFrom", new Object[] { testName + "_PR", 10, 2000 }); + "doPutsFrom", new Object[] { getTestMethodName() + "_PR", 10, 2000 }); AsyncInvocation localDestroyAsync = vm4.invokeAsync( ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class, - "closeRegion", new Object[] { testName + "_PR" }); + "closeRegion", new Object[] { getTestMethodName() + "_PR" }); try { putAsync.join(); localDestroyAsync.join(); @@ -238,7 +242,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes try { vm7.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(lnPort)); - getLogWriter().info("Created cache on local site"); + LogWriterUtils.getLogWriter().info("Created cache on local site"); vm7.invoke(() -> createConcurrentSender("ln1", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY)); vm7.invoke(() -> createConcurrentSender("ln2", 3, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY)); @@ -248,10 +252,10 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes vm7.invoke(() -> startSender("ln2")); vm7.invoke(() -> startSender("ln3")); - String regionName = testName + "_PR"; + String regionName = getTestMethodName() + "_PR"; vm7.invoke(() -> createPartitionedRegion(regionName, "ln1,ln2,ln3", 1, 10, isOffHeap())); - getLogWriter().info("Created PRs on local site"); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); vm4.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap())); vm5.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap())); @@ -288,12 +292,12 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes createAndStartSender(vm4, lnPort, 5, true, false); createAndStartSender(vm5, lnPort, 5, true, false); - String regionName = testName + "_PR"; + String regionName = getTestMethodName() + "_PR"; vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap())); AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { regionName, 10 }); - pause(1000); + Wait.pause(1000); vm5.invoke(() -> localDestroyRegion(regionName)); try { @@ -330,7 +334,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes createAndStartTwoSenders(vm4, lnPort, 4); createAndStartTwoSenders(vm5, lnPort, 4); - String regionName = testName + "_PR"; + String regionName = getTestMethodName() + "_PR"; vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { regionName, null, 1, 100, isOffHeap() }); vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { @@ -339,7 +343,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { regionName, 10 }); - pause(1000); + Wait.pause(1000); vm5.invoke(WANTestBase.class, "localDestroyRegion", new Object[] { regionName }); @@ -376,13 +380,13 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 5, true); createAndStartSenderWithCustomerOrderShipmentRegion(vm5, lnPort, 5, true); - getLogWriter().info("Created PRs on local site"); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); vm2.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, null, 1, 100, isOffHeap())); AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "putcolocatedPartitionedRegion", new Object[] { 10 }); - pause(1000); + Wait.pause(1000); try { vm5.invoke(() -> localDestroyRegion(customerRegionName)); @@ -393,7 +397,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes try { inv1.join(); } catch (Exception e) { - fail("Unexpected exception", e); + Assert.fail("Unexpected exception", e); } validateRegionSizes(customerRegionName, 10, vm4, vm5, vm2); @@ -414,7 +418,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 6, true); createAndStartSenderWithCustomerOrderShipmentRegion(vm5, lnPort, 6, true); - getLogWriter().info("Created PRs on local site"); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); vm2.invoke(WANTestBase.class, "createCustomerOrderShipmentPartitionedRegion", new Object[] { null, @@ -422,7 +426,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "putcolocatedPartitionedRegion", new Object[] { 2000 }); - pause(1000); + Wait.pause(1000); try { vm5.invoke(WANTestBase.class, "destroyRegion", @@ -465,7 +469,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes + max + " but actual entries: " + r.keySet().size(); } }; - DistributedTestCase.waitForCriterion(wc, 120000, 500, true); + Wait.waitForCriterion(wc, 120000, 500, true); } protected static void createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME( @@ -481,13 +485,13 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes if (pause) { vm.invoke(() -> pauseSender("ln")); } - vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln", 1, 10, isOffHeap())); - getLogWriter().info("Created PRs on local site"); + vm.invoke(() -> createPartitionedRegion(getTestMethodName() + "_PR", "ln", 1, 10, isOffHeap())); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); } protected void createReceiverAndDoPutsInPausedSender(int port) { // Note: This is a test-specific method used by several tests to do puts from vm4 to vm2. - String regionName = testName + "_PR"; + String regionName = getTestMethodName() + "_PR"; vm2.invoke(() -> createReceiver(port)); vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap())); vm4.invoke(() -> doPuts(regionName, 10)); @@ -500,7 +504,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes // Note: This is a test-specific method used by several test to recreate a partitioned region, // do puts and validate region sizes in vm2 and vm4. // since shadowPR is locally destroyed, so no data to dispatch - String regionName = testName + "_PR"; + String regionName = getTestMethodName() + "_PR"; vm2.invoke(() -> validateRegionSize(regionName, expectedRegionSize)); if (resumeSender) { vm4.invoke(() -> resumeSender("ln")); @@ -513,7 +517,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes protected void createAndStartTwoSenders(VM vm, int port, int concurrencyLevel) { // Note: This is a test-specific method used to create and start 2 senders. vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port)); - vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln1,ln2", 1, 100, isOffHeap())); + vm.invoke(() -> createPartitionedRegion(getTestMethodName() + "_PR", "ln1,ln2", 1, 100, isOffHeap())); createSenders(vm, concurrencyLevel); vm.invoke(() -> startSender("ln1")); vm.invoke(() -> startSender("ln2"));