Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-831 693c617c1 -> 95e23f0b6
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java index 804c3ed..c6123be 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java @@ -24,6 +24,8 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; 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.LogWriterUtils; /** * All the test cases are similar to SerialWANPropogationDUnitTest except that @@ -69,27 +71,27 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 1000 }); vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort }); vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort }); vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", null, isOffHeap() }); + getTestMethodName() + "_RR", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", null, isOffHeap() }); + getTestMethodName() + "_RR", null, isOffHeap() }); vm2.invoke(WANTestBase.class, "createReceiver2", new Object[] {nyPort }); @@ -97,11 +99,11 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { new Object[] {nyPort }); vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR", 1000 }); + getTestMethodName() + "_RR", 1000 }); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR", 1000 }); + getTestMethodName() + "_RR", 1000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR", 1000 }); + getTestMethodName() + "_RR", 1000 }); } public void testReplicatedSerialPropagation() throws Exception { @@ -124,36 +126,36 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD }); vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", null, isOffHeap() }); + getTestMethodName() + "_RR", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", null, isOffHeap() }); + getTestMethodName() + "_RR", null, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 1000 }); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR", 1000 }); + getTestMethodName() + "_RR", 1000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR", 1000 }); + getTestMethodName() + "_RR", 1000 }); } public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throws Exception { - addExpectedException("Broken pipe"); - addExpectedException("Connection reset"); - addExpectedException("Unexpected IOException"); + IgnoredException.addIgnoredException("Broken pipe"); + IgnoredException.addIgnoredException("Connection reset"); + IgnoredException.addIgnoredException("Unexpected IOException"); Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId", new Object[] { 1 }); Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, @@ -173,23 +175,23 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD }); vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", null, isOffHeap() }); + getTestMethodName() + "_RR", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", null, isOffHeap() }); + getTestMethodName() + "_RR", null, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 1000 }); //---------close local site and build again----------------------------------------- @@ -199,8 +201,8 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "killSender", new Object[] { }); Integer regionSize = - (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {testName + "_RR" }); - getLogWriter().info("Region size on remote is: " + regionSize); + (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_RR" }); + 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 }); @@ -216,13 +218,13 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true }); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR", "ln", isOffHeap() }); + getTestMethodName() + "_RR", "ln", isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -230,19 +232,19 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.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 + "_RR", + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 1000 }); //---------------------------------------------------------------------------------- //verify remote site receives all the events vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR", 1000 }); + getTestMethodName() + "_RR", 1000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR", 1000 }); + getTestMethodName() + "_RR", 1000 }); } /** @@ -276,15 +278,15 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { //create one RR (RR_1) on remote site vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", null, isOffHeap() }); + getTestMethodName() + "_RR_1", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", null, isOffHeap() }); + getTestMethodName() + "_RR_1", null, isOffHeap() }); //create another RR (RR_2) on remote site vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", null, isOffHeap() }); + getTestMethodName() + "_RR_2", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", null, isOffHeap() }); + getTestMethodName() + "_RR_2", null, isOffHeap() }); //start the senders on local site vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -292,30 +294,30 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { //create one RR (RR_1) on local site vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); //create another RR (RR_2) on local site vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); //start puts in RR_1 in another thread - AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 }); + AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1", 1000 }); //do puts in RR_2 in main thread - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_2", 500 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_2", 500 }); //destroy RR_2 after above puts are complete - vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_2"}); + vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_2"}); try { inv1.join(); @@ -327,9 +329,9 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { Thread.sleep(20); //vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 }); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR_1", 1000 }); + getTestMethodName() + "_RR_1", 1000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR_2", 500 }); + getTestMethodName() + "_RR_2", 500 }); } /** @@ -363,9 +365,9 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { //create one RR (RR_1) on remote site vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", null, isOffHeap() }); + getTestMethodName() + "_RR_1", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", null, isOffHeap() }); + getTestMethodName() + "_RR_1", null, isOffHeap() }); //start the senders on local site vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -373,21 +375,21 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { //create one RR (RR_1) on local site vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); //start puts in RR_1 in another thread - AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 10000 }); + AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1", 10000 }); //destroy RR_1 in remote site - vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_1"}); + vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_1"}); try { inv1.join(); @@ -398,7 +400,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { //verify that all is well in local site. All the events should be present in local region vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR_1", 10000 }); + getTestMethodName() + "_RR_1", 10000 }); //assuming some events might have been dispatched before the remote region was destroyed, //sender's region queue will have events less than 1000 but the queue will not be empty. //NOTE: this much verification might be sufficient in DUnit. Hydra will take care of @@ -437,15 +439,15 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { //create one RR (RR_1) on remote site vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", null, isOffHeap() }); + getTestMethodName() + "_RR_1", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", null, isOffHeap() }); + getTestMethodName() + "_RR_1", null, isOffHeap() }); //create another RR (RR_2) on remote site vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", null, isOffHeap() }); + getTestMethodName() + "_RR_2", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", null, isOffHeap() }); + getTestMethodName() + "_RR_2", null, isOffHeap() }); //start the senders on local site vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); @@ -453,35 +455,35 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { //create one RR (RR_1) on local site vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); //create another RR (RR_2) on local site vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); //destroy RR_2 on remote site in the middle - vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_2"}); + vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_2"}); //expected exceptions in the logs - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); //start puts in RR_2 in another thread - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_2", 1000 }); + vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_2", 1000 }); //start puts in RR_1 in another thread - AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 }); + AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1", 1000 }); try { inv1.join(); @@ -492,7 +494,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { //though region RR_2 is destroyed, RR_1 should still get all the events put in it //in local site vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR_1", 1000 }); + getTestMethodName() + "_RR_1", 1000 }); } @@ -520,15 +522,15 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { // create one RR (RR_1) on remote site vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", null, isOffHeap() }); + getTestMethodName() + "_RR_1", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", null, isOffHeap() }); + getTestMethodName() + "_RR_1", null, isOffHeap() }); // create another RR (RR_2) on remote site vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", null, isOffHeap() }); + getTestMethodName() + "_RR_2", null, isOffHeap() }); vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", null, isOffHeap() }); + getTestMethodName() + "_RR_2", null, isOffHeap() }); // start the senders on local site vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", @@ -542,35 +544,35 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { // create one RR (RR_1) on local site vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_1", "ln", isOffHeap() }); + getTestMethodName() + "_RR_1", "ln", isOffHeap() }); // create another RR (RR_2) on local site vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { - testName + "_RR_2", "ln", isOffHeap() }); + getTestMethodName() + "_RR_2", "ln", isOffHeap() }); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); // start puts in RR_1 in another thread AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", - new Object[] { testName + "_RR_1", 1000 }); + new Object[] { getTestMethodName() + "_RR_1", 1000 }); // start puts in RR_2 in another thread AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "doPuts", - new Object[] { testName + "_RR_2", 1000 }); + new Object[] { getTestMethodName() + "_RR_2", 1000 }); // destroy RR_2 on remote site in the middle - vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_2" }); try { @@ -585,7 +587,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { // in local site try { vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - testName + "_RR_1", 1000 }); + getTestMethodName() + "_RR_1", 1000 }); } finally { System.setProperty( "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
