http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java index 86018c6..529ad47 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java @@ -54,154 +54,148 @@ public class DistTXWANDUnitTest extends WANTestBase { public void DISABLED_testPartitionedSerialPropagation_SenderSameAsCoordinator() throws Exception { - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); - - vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - - vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - false, 100, 10, false, false, null, true }); - vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - false, 100, 10, false, false, null, true }); - - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - - vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - - vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); - - vm4.invoke(WANTestBase.class, "doDistTXPuts", new Object[] { getTestMethodName() + "_PR", - 50 }); - - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName() + "_PR", 50 }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + + vm2.invoke(() -> WANTestBase.createReceiver( nyPort )); + vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); + + vm4.invoke(() -> WANTestBase.createCache( lnPort )); + vm5.invoke(() -> WANTestBase.createCache( lnPort )); + vm6.invoke(() -> WANTestBase.createCache( lnPort )); + vm7.invoke(() -> WANTestBase.createCache( lnPort )); + + vm4.invoke(() -> WANTestBase.createSender( "ln", 2, + false, 100, 10, false, false, null, true )); + vm5.invoke(() -> WANTestBase.createSender( "ln", 2, + false, 100, 10, false, false, null, true )); + + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + vm5.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + vm6.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + vm7.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + + vm4.invoke(() -> WANTestBase.startSender( "ln" )); + vm5.invoke(() -> WANTestBase.startSender( "ln" )); + + vm2.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() )); + vm3.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() )); + + vm4.invoke(() -> WANTestBase.doDistTXPuts( getTestMethodName() + "_PR", + 50 )); + + vm2.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName() + "_PR", 50 )); } public void testPartitionedSerialPropagation_SenderNotSameAsCoordinator() throws Exception { - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); - - vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - - vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - false, 100, 10, false, false, null, true }); - vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - false, 100, 10, false, false, null, true }); - - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - - vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - - vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); - - vm6.invoke(WANTestBase.class, "doDistTXPuts", new Object[] { getTestMethodName() + "_PR", - 50 }); - - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName() + "_PR", 50 }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + + vm2.invoke(() -> WANTestBase.createReceiver( nyPort )); + vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); + + vm4.invoke(() -> WANTestBase.createCache( lnPort )); + vm5.invoke(() -> WANTestBase.createCache( lnPort )); + vm6.invoke(() -> WANTestBase.createCache( lnPort )); + vm7.invoke(() -> WANTestBase.createCache( lnPort )); + + vm4.invoke(() -> WANTestBase.createSender( "ln", 2, + false, 100, 10, false, false, null, true )); + vm5.invoke(() -> WANTestBase.createSender( "ln", 2, + false, 100, 10, false, false, null, true )); + + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + vm5.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + vm6.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + vm7.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + + vm4.invoke(() -> WANTestBase.startSender( "ln" )); + vm5.invoke(() -> WANTestBase.startSender( "ln" )); + + vm2.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() )); + vm3.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() )); + + vm6.invoke(() -> WANTestBase.doDistTXPuts( getTestMethodName() + "_PR", + 50 )); + + vm2.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName() + "_PR", 50 )); } public void testPartitionedRegionParallelPropagation() throws Exception { - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); - - vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - - vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, false, null, true }); - vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, false, null, true }); - vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, false, null, true }); - vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, false, null, true }); - - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - - vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - - vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + + vm2.invoke(() -> WANTestBase.createReceiver( nyPort )); + vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); + + vm4.invoke(() -> WANTestBase.createCache( lnPort )); + vm5.invoke(() -> WANTestBase.createCache( lnPort )); + vm6.invoke(() -> WANTestBase.createCache( lnPort )); + vm7.invoke(() -> WANTestBase.createCache( lnPort )); + + vm4.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, false, null, true )); + vm5.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, false, null, true )); + vm6.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, false, null, true )); + vm7.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, false, null, true )); + + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + vm5.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + vm6.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + vm7.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + + vm4.invoke(() -> WANTestBase.startSender( "ln" )); + vm5.invoke(() -> WANTestBase.startSender( "ln" )); + vm6.invoke(() -> WANTestBase.startSender( "ln" )); + vm7.invoke(() -> WANTestBase.startSender( "ln" )); + + vm2.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR", null, 1, 100, isOffHeap() )); + vm3.invoke(() -> WANTestBase.createPartitionedRegion( + 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 - vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); + vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); - vm4.invoke(WANTestBase.class, "doDistTXPuts", new Object[] { getTestMethodName() + "_PR", - 5 }); + vm4.invoke(() -> WANTestBase.doDistTXPuts( getTestMethodName() + "_PR", + 5 )); //verify all buckets drained on all sender nodes. - vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); + vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln")); + vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln")); + vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln")); + vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln")); - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName() + "_PR", 5 }); + vm2.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName() + "_PR", 5 )); } public void testDummy() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java index 6be5b97..009bbf7 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java @@ -46,16 +46,15 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { public void testSameSenderWithNonColocatedRegions() throws Exception { IgnoredException.addIgnoredException("cannot have the same parallel"); - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, false, null, true }); - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + vm4.invoke(() -> WANTestBase.createCache( lnPort )); + vm4.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, false, null, true )); + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); try { - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() }); + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); fail("Expected IllegateStateException : cannot have the same parallel gateway sender"); } catch (Exception e) { @@ -79,81 +78,79 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { and version prior to 8.0 */ public void DISABLED_testParallelPropagation() throws Exception { - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); + vm2.invoke(() -> WANTestBase.createReceiver( nyPort )); + vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); - vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> WANTestBase.createCache( lnPort )); + vm5.invoke(() -> WANTestBase.createCache( lnPort )); + vm6.invoke(() -> WANTestBase.createCache( lnPort )); + vm7.invoke(() -> WANTestBase.createCache( lnPort )); - vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, false, null, true }); - vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, false, null, true }); - vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, false, null, true }); - vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, false, null, true }); + vm4.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, false, null, true )); + vm5.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, false, null, true )); + vm6.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, false, null, true )); + vm7.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, false, null, true )); - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() }); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() }); - vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() }); - vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() }); + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); + vm5.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); + vm6.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); + vm7.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() }); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() }); - vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() }); - vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() }); + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); + vm5.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); + vm6.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); + vm7.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); - vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); + vm4.invoke(() -> WANTestBase.startSender( "ln" )); + vm5.invoke(() -> WANTestBase.startSender( "ln" )); + vm6.invoke(() -> WANTestBase.startSender( "ln" )); + vm7.invoke(() -> WANTestBase.startSender( "ln" )); - vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", null, 1, 100, isOffHeap() }); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", null, 1, 100, isOffHeap() }); - vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", null, 1, 100, isOffHeap() }); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", null, 1, 100, isOffHeap() }); + vm2.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", null, 1, 100, isOffHeap() )); + vm3.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", null, 1, 100, isOffHeap() )); + vm2.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", null, 1, 100, isOffHeap() )); + vm3.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", 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 - vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); + vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR1", - 1000 }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR2", - 1000 }); + vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR1", + 1000 )); + vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR2", + 1000 )); //verify all buckets drained on all sender nodes. - vm4.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm5.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm6.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm7.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); + vm4.invoke(() -> CommonParallelGatewaySenderDUnitTest.validateParallelSenderQueueAllBucketsDrained("ln")); + vm5.invoke(() -> CommonParallelGatewaySenderDUnitTest.validateParallelSenderQueueAllBucketsDrained("ln")); + vm6.invoke(() -> CommonParallelGatewaySenderDUnitTest.validateParallelSenderQueueAllBucketsDrained("ln")); + vm7.invoke(() -> CommonParallelGatewaySenderDUnitTest.validateParallelSenderQueueAllBucketsDrained("ln")); - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName() + "_PR1", 1000 }); - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName() + "_PR2", 1000 }); + vm2.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName() + "_PR1", 1000 )); + vm2.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName() + "_PR2", 1000 )); } /** @@ -167,81 +164,79 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { and version prior to 8.0 */ public void DISABLED_testParallelPropagationPersistenceEnabled() throws Exception { - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); + vm2.invoke(() -> WANTestBase.createReceiver( nyPort )); + vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); - vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> WANTestBase.createCache( lnPort )); + vm5.invoke(() -> WANTestBase.createCache( lnPort )); + vm6.invoke(() -> WANTestBase.createCache( lnPort )); + vm7.invoke(() -> WANTestBase.createCache( lnPort )); - vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, true, null, true }); - vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, true, null, true }); - vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, true, null, true }); - vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, - true, 100, 10, false, true, null, true }); + vm4.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, true, null, true )); + vm5.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, true, null, true )); + vm6.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, true, null, true )); + vm7.invoke(() -> WANTestBase.createSender( "ln", 2, + true, 100, 10, false, true, null, true )); - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() }); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() }); - vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() }); - vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() }); + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); + vm5.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); + vm6.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); + vm7.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() }); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() }); - vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() }); - vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() }); + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); + vm5.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); + vm6.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); + vm7.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); - vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); + vm4.invoke(() -> WANTestBase.startSender( "ln" )); + vm5.invoke(() -> WANTestBase.startSender( "ln" )); + vm6.invoke(() -> WANTestBase.startSender( "ln" )); + vm7.invoke(() -> WANTestBase.startSender( "ln" )); - vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", null, 1, 100, isOffHeap() }); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR1", null, 1, 100, isOffHeap() }); - vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", null, 1, 100, isOffHeap() }); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName() + "_PR2", null, 1, 100, isOffHeap() }); + vm2.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", null, 1, 100, isOffHeap() )); + vm3.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR1", null, 1, 100, isOffHeap() )); + vm2.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", null, 1, 100, isOffHeap() )); + vm3.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName() + "_PR2", 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 - vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); + vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR1", - 1000 }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR2", - 1000 }); + vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR1", + 1000 )); + vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR2", + 1000 )); //verify all buckets drained on all sender nodes. - vm4.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm5.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm6.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); - vm7.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"}); + vm4.invoke(() -> CommonParallelGatewaySenderDUnitTest.validateParallelSenderQueueAllBucketsDrained("ln")); + vm5.invoke(() -> CommonParallelGatewaySenderDUnitTest.validateParallelSenderQueueAllBucketsDrained("ln")); + vm6.invoke(() -> CommonParallelGatewaySenderDUnitTest.validateParallelSenderQueueAllBucketsDrained("ln")); + vm7.invoke(() -> CommonParallelGatewaySenderDUnitTest.validateParallelSenderQueueAllBucketsDrained("ln")); - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName() + "_PR1", 1000 }); - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName() + "_PR2", 1000 }); + vm2.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName() + "_PR1", 1000 )); + vm2.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName() + "_PR2", 1000 )); } @@ -261,127 +256,117 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { */ public void DISABLED_testPRWithGatewaySenderPersistenceEnabled_Restart() { //create locator on local site - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); //create locator on remote site - Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); + Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); //create receiver on remote site - vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); + vm2.invoke(() -> WANTestBase.createReceiver( nyPort )); + vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); //create cache in local site - vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> WANTestBase.createCache( lnPort )); + vm5.invoke(() -> WANTestBase.createCache( lnPort )); + vm6.invoke(() -> WANTestBase.createCache( lnPort )); + vm7.invoke(() -> WANTestBase.createCache( lnPort )); //create senders with disk store - String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", - new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", - new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", - new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", - new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); + String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true )); + String diskStore2 = (String) vm5.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true )); + String diskStore3 = (String) vm6.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true )); + String diskStore4 = (String) vm7.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true )); LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on remote site - vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", null, 1, 100, isOffHeap() }); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", null, 1, 100, isOffHeap() }); + vm2.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", null, 1, 100, isOffHeap() )); + vm3.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", null, 1, 100, isOffHeap() )); //create PR on remote site - vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", null, 1, 100, isOffHeap() }); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", null, 1, 100, isOffHeap() }); + vm2.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", null, 1, 100, isOffHeap() )); + vm3.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", null, 1, 100, isOffHeap() )); //create PR on local site - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() }); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() }); - vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() }); - vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() }); + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() )); + vm5.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() )); + vm6.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() )); + vm7.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() )); //create PR on local site - vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() }); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() }); - vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() }); - vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() }); + vm4.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() )); + vm5.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() )); + vm6.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() )); + vm7.invoke(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() )); //start the senders on local site - vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); + vm4.invoke(() -> WANTestBase.startSender( "ln" )); + vm5.invoke(() -> WANTestBase.startSender( "ln" )); + vm6.invoke(() -> WANTestBase.startSender( "ln" )); + vm7.invoke(() -> WANTestBase.startSender( "ln" )); //wait for senders to become running - vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); + vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); //pause 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" }); + vm4.invoke(() -> WANTestBase.pauseSender( "ln" )); + vm5.invoke(() -> WANTestBase.pauseSender( "ln" )); + vm6.invoke(() -> WANTestBase.pauseSender( "ln" )); + vm7.invoke(() -> WANTestBase.pauseSender( "ln" )); //start puts in region on local site - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName()+"PR1", 3000 }); - vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName()+"PR2", 5000 }); + vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName()+"PR1", 3000 )); + vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName()+"PR2", 5000 )); LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders - vm4.invoke(WANTestBase.class, "killSender", new Object[] {}); - vm5.invoke(WANTestBase.class, "killSender", new Object[] {}); - vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); - vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); + vm4.invoke(() -> WANTestBase.killSender()); + vm5.invoke(() -> WANTestBase.killSender()); + vm6.invoke(() -> WANTestBase.killSender()); + vm7.invoke(() -> WANTestBase.killSender()); LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm - vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> WANTestBase.createCache( lnPort )); + vm5.invoke(() -> WANTestBase.createCache( lnPort )); + vm6.invoke(() -> WANTestBase.createCache( lnPort )); + vm7.invoke(() -> WANTestBase.createCache( lnPort )); LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store - vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", - new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true }); - vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", - new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true }); - vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", - new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true }); - vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", - new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); + vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, diskStore1, true )); + vm5.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, diskStore2, true )); + vm6.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, diskStore3, true )); + vm7.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, diskStore4, true )); LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site - AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() }); - AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() }); - AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() }); - AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() }); + AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() )); + AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() )); + AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() )); + AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() )); try { inv1.join(); @@ -393,14 +378,14 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { fail(); } - inv1 = vm4.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() }); - inv2 = vm5.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() }); - inv3 = vm6.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() }); - inv4 = vm7.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { - getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() }); + inv1 = vm4.invokeAsync(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() )); + inv2 = vm5.invokeAsync(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() )); + inv3 = vm6.invokeAsync(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() )); + inv4 = vm7.invokeAsync(() -> WANTestBase.createPartitionedRegion( + getTestMethodName()+"PR2", "ln", 1, 100, isOffHeap() )); try { inv1.join(); @@ -416,31 +401,31 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { //start the senders in async mode. This will ensure that the //node of shadow PR that went down last will come up first - 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" }); + vm4.invokeAsync(() -> WANTestBase.startSender( "ln" )); + vm5.invokeAsync(() -> WANTestBase.startSender( "ln" )); + vm6.invokeAsync(() -> WANTestBase.startSender( "ln" )); + vm7.invokeAsync(() -> WANTestBase.startSender( "ln" )); LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running - vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); + vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); + vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName()+"PR1", 3000 }); - vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName()+"PR1", 3000 }); + vm2.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName()+"PR1", 3000 )); + vm3.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName()+"PR1", 3000 )); - vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName()+"PR2", 5000 }); - vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { - getTestMethodName()+"PR2", 5000 }); + vm2.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName()+"PR2", 5000 )); + vm3.invoke(() -> WANTestBase.validateRegionSize( + getTestMethodName()+"PR2", 5000 )); } public static void validateParallelSenderQueueAllBucketsDrained(final String senderId) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java index 4b5fb00..598bece 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java @@ -68,49 +68,46 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase { // Site 2 and Site 3. // Site 1 - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - Integer lnRecPort = (Integer) vm1.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver( lnPort )); //Site 2 - Integer nyPort = (Integer)vm2.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); - Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); + Integer nyPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); //Site 3 - Integer tkPort = (Integer)vm4.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 3, lnPort }); - Integer tkRecPort = (Integer) vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort }); + Integer tkPort = (Integer)vm4.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort )); + Integer tkRecPort = (Integer) vm5.invoke(() -> WANTestBase.createReceiver( tkPort )); LogWriterUtils.getLogWriter().info("Created locators and receivers in 3 distributed systems"); //Site 1 - vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2, - true, 10, 1, false, false, null, true }); - vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3, - true, 10, 1, false, false, null, true }); + vm1.invoke(() -> WANTestBase.createSender( "ln1", 2, + true, 10, 1, false, false, null, true )); + vm1.invoke(() -> WANTestBase.createSender( "ln2", 3, + true, 10, 1, false, false, null, true )); - vm1.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "ln1,ln2", 0, 1, isOffHeap() }); - vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" }); - vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" }); - vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln1" }); - vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln2" }); + vm1.invoke(() -> WANTestBase.createPartitionedRegion("repRegion", "ln1,ln2", 0, 1, isOffHeap() )); + vm1.invoke(() -> WANTestBase.startSender( "ln1" )); + vm1.invoke(() -> WANTestBase.startSender( "ln2" )); + vm1.invoke(() -> WANTestBase.waitForSenderRunningState( "ln1" )); + vm1.invoke(() -> WANTestBase.waitForSenderRunningState( "ln2" )); //Site 2 - vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1, - true, 10, 1, false, false, null, true }); + vm3.invoke(() -> WANTestBase.createSender( "ny1", 1, + true, 10, 1, false, false, null, true )); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "ny1", 0, 1, isOffHeap() }); - vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" }); - vm3.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ny1" }); + vm3.invoke(() -> WANTestBase.createPartitionedRegion("repRegion", "ny1", 0, 1, isOffHeap() )); + vm3.invoke(() -> WANTestBase.startSender( "ny1" )); + vm3.invoke(() -> WANTestBase.waitForSenderRunningState( "ny1" )); //Site 3 which only knows about Site 1. - vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk1", 1, - true, 10, 1, false, false, null, true }); + vm5.invoke(() -> WANTestBase.createSender( "tk1", 1, + true, 10, 1, false, false, null, true )); - vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "tk1", 0, 1, isOffHeap() }); - vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk1" }); - vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "tk1" }); + vm5.invoke(() -> WANTestBase.createPartitionedRegion("repRegion", "tk1", 0, 1, isOffHeap() )); + vm5.invoke(() -> WANTestBase.startSender( "tk1" )); + vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "tk1" )); Wait.pause(2000); @@ -131,13 +128,12 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase { //wait for vm1 to propagate put to vm3 and vm5 Wait.pause(2000); - destroyTimeStamp = (Long) vm3.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterOp"); + destroyTimeStamp = (Long) vm3.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.getVersionTimestampAfterOp()); //wait for vm1 to propagate destroyed entry's new version tag to vm5 Wait.pause(2000); - vm5.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "verifyTimestampAfterOp", - new Object[] {destroyTimeStamp, 1 /* ds 3 receives gatway event only from ds 1*/}); + vm5.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.verifyTimestampAfterOp(destroyTimeStamp, 1 /* ds 3 receives gatway event only from ds 1*/)); } /** @@ -153,32 +149,30 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase { // a Replicated Region with one entry and concurrency checks enabled. // Site 1 - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - Integer lnRecPort = (Integer) vm1.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver( lnPort )); //Site 2 - Integer nyPort = (Integer)vm2.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); - Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); + Integer nyPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); LogWriterUtils.getLogWriter().info("Created locators and receivers in 2 distributed systems"); //Site 1 - vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2, - false, 10, 1, false, false, null, true }); + vm1.invoke(() -> WANTestBase.createSender( "ln1", 2, + false, 10, 1, false, false, null, true )); - vm1.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ln1", isOffHeap() }); - vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" }); - vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln1" }); + vm1.invoke(() -> WANTestBase.createReplicatedRegion("repRegion", "ln1", isOffHeap() )); + vm1.invoke(() -> WANTestBase.startSender( "ln1" )); + vm1.invoke(() -> WANTestBase.waitForSenderRunningState( "ln1" )); //Site 2 - vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1, - false, 10, 1, false, false, null, true }); + vm3.invoke(() -> WANTestBase.createSender( "ny1", 1, + false, 10, 1, false, false, null, true )); - vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ny1", isOffHeap() }); - vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" }); - vm3.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ny1" }); + vm3.invoke(() -> WANTestBase.createReplicatedRegion("repRegion", "ny1", isOffHeap() )); + vm3.invoke(() -> WANTestBase.startSender( "ny1" )); + vm3.invoke(() -> WANTestBase.waitForSenderRunningState( "ny1" )); Wait.pause(2000); @@ -242,9 +236,9 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase { //Wait for all Gateway events be received by vm3. Wait.pause(1000); - long putAllTimeStampVm1 = (Long) vm1.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp"); + long putAllTimeStampVm1 = (Long) vm1.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.getVersionTimestampAfterPutAllOp()); - long putAllTimeStampVm3 = (Long) vm3.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp"); + long putAllTimeStampVm3 = (Long) vm3.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.getVersionTimestampAfterPutAllOp()); assertEquals(putAllTimeStampVm1, putAllTimeStampVm3); } @@ -258,32 +252,30 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() { // a Replicated Region with one entry and concurrency checks enabled. // Site 1 - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - Integer lnRecPort = (Integer) vm1.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver( lnPort )); //Site 2 - Integer nyPort = (Integer)vm2.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); - Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); + Integer nyPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); LogWriterUtils.getLogWriter().info("Created locators and receivers in 2 distributed systems"); //Site 1 - vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2, - false, 10, 1, false, false, null, true }); + vm1.invoke(() -> WANTestBase.createSender( "ln1", 2, + false, 10, 1, false, false, null, true )); - vm1.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "ln1", 0, 1, isOffHeap() }); - vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" }); - vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln1" }); + vm1.invoke(() -> WANTestBase.createPartitionedRegion("repRegion", "ln1", 0, 1, isOffHeap() )); + vm1.invoke(() -> WANTestBase.startSender( "ln1" )); + vm1.invoke(() -> WANTestBase.waitForSenderRunningState( "ln1" )); //Site 2 - vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1, - false, 10, 1, false, false, null, true }); + vm3.invoke(() -> WANTestBase.createSender( "ny1", 1, + false, 10, 1, false, false, null, true )); - vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "ny1", 0, 1, isOffHeap() }); - vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" }); - vm3.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ny1" }); + vm3.invoke(() -> WANTestBase.createPartitionedRegion("repRegion", "ny1", 0, 1, isOffHeap() )); + vm3.invoke(() -> WANTestBase.startSender( "ny1" )); + vm3.invoke(() -> WANTestBase.waitForSenderRunningState( "ny1" )); Wait.pause(2000); @@ -347,9 +339,9 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() { //Wait for all Gateway events be received by vm3. Wait.pause(1000); - long putAllTimeStampVm1 = (Long) vm1.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp"); + long putAllTimeStampVm1 = (Long) vm1.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.getVersionTimestampAfterPutAllOp()); - long putAllTimeStampVm3 = (Long) vm3.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp"); + long putAllTimeStampVm3 = (Long) vm3.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.getVersionTimestampAfterPutAllOp()); assertEquals(putAllTimeStampVm1, putAllTimeStampVm3); } @@ -365,35 +357,33 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() { // a Replicated Region with one entry and concurrency checks enabled. // Site 1 - Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - Integer lnRecPort = (Integer) vm1.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort }); + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver( lnPort )); //Site 2 - Integer nyPort = (Integer)vm2.invoke(WANTestBase.class, - "createFirstRemoteLocator", new Object[] { 2, lnPort }); - Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); + Integer nyPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver( nyPort )); LogWriterUtils.getLogWriter().info("Created locators and receivers in 2 distributed systems"); //Site 1 - vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2, - false, 10, 1, false, false, null, true }); + vm1.invoke(() -> WANTestBase.createSender( "ln1", 2, + false, 10, 1, false, false, null, true )); - vm1.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ln1", isOffHeap() }); - vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" }); - vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln1" }); + vm1.invoke(() -> WANTestBase.createReplicatedRegion("repRegion", "ln1", isOffHeap() )); + vm1.invoke(() -> WANTestBase.startSender( "ln1" )); + vm1.invoke(() -> WANTestBase.waitForSenderRunningState( "ln1" )); //Site 2 - vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ny1", isOffHeap() }); + vm3.invoke(() -> WANTestBase.createReplicatedRegion("repRegion", "ny1", isOffHeap() )); - vm4.invoke(WANTestBase.class, "createCache", new Object[] { nyPort }); - vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1, - false, 10, 1, false, false, null, true }); + vm4.invoke(() -> WANTestBase.createCache( nyPort )); + vm4.invoke(() -> WANTestBase.createSender( "ny1", 1, + false, 10, 1, false, false, null, true )); - vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ny1", isOffHeap() }); - vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" }); - vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ny1" }); + vm4.invoke(() -> WANTestBase.createReplicatedRegion("repRegion", "ny1", isOffHeap() )); + vm4.invoke(() -> WANTestBase.startSender( "ny1" )); + vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ny1" )); Wait.pause(2000); @@ -457,9 +447,9 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() { }); // Check vm3 has latest timestamp from vm4. - long putAllTimeStampVm1 = (Long) vm4.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp"); + long putAllTimeStampVm1 = (Long) vm4.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.getVersionTimestampAfterPutAllOp()); - long putAllTimeStampVm3 = (Long) vm3.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp"); + long putAllTimeStampVm3 = (Long) vm3.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.getVersionTimestampAfterPutAllOp()); assertEquals(putAllTimeStampVm1, putAllTimeStampVm3); }
