From a3389bdc233d02eca19ad5150b52a27372697b69 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Wed, 10 Feb 2016 16:09:14 -0800 Subject: [PATCH 01/12] Changing SerializableRunnableIF to throw exception from run This makes writing tests easier, it will get converted to an unchecked exception. Adding throws Exception to some tests that invoked run directory on SerializableRunnable. --- .../internal/AutoConnectionSourceDUnitTest.java | 2 +- .../internal/LocatorLoadBalancingDUnitTest.java | 15 +++++++++------ .../cache/client/internal/LocatorTestBase.java | 6 +++--- .../cache30/RegionReliabilityTestCase.java | 4 ++-- .../cache/PartitionedRegionCreationDUnitTest.java | 2 +- .../control/RebalanceOperationDUnitTest.java | 6 ++---- ...onWithCacheLoaderDuringCacheMissDUnitTest.java | 8 ++++---- ...ListAndDescribeDiskStoreCommandsDUnitTest.java | 4 ++-- .../cli/commands/ListIndexCommandDUnitTest.java | 8 ++++---- .../gemfire/test/dunit/IgnoredException.java | 12 ++++++++++-- .../test/dunit/SerializableRunnableIF.java | 3 ++- .../gemfire/test/dunit/rules/RemoteInvoker.java | 6 +++++- 12 files changed, 45 insertions(+), 31 deletions(-) diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java index b0f3b5987ad4..03368de781d0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java @@ -267,7 +267,7 @@ public void testServerGroups() throws Exception { Assert.assertEquals("value", getInVM(vm1, "B", "key7")); } - public void testTwoServersInSameVM() { + public void testTwoServersInSameVM() throws Exception { final Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java index 3c6a980f41a2..6f4d40410696 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java @@ -174,8 +174,9 @@ locatorPort, new QueueConnectionRequest(null, 5, Collections.EMPTY_SET, null, * Test to make sure the bridge servers communicate * their updated load to the controller when the load * on the bridge server changes. + * @throws Exception */ - public void testLoadMessaging() { + public void testLoadMessaging() throws Exception { final Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); @@ -220,8 +221,9 @@ public void testLoadMessaging() { /** * Test to make sure that the locator * balancing load between two servers. + * @throws Exception */ - public void testBalancing() { + public void testBalancing() throws Exception { final Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); @@ -277,11 +279,11 @@ public String description() { vm.invoke(checkConnectionCount); } - private void waitForPrefilledConnections(VM vm, final int count) { + private void waitForPrefilledConnections(VM vm, final int count) throws Exception { waitForPrefilledConnections(vm, count, POOL_NAME); } - private void waitForPrefilledConnections(VM vm, final int count, final String poolName) { + private void waitForPrefilledConnections(VM vm, final int count, final String poolName) throws Exception { SerializableRunnable runnable = new SerializableRunnable("waitForPrefilledConnections") { public void run() { final PoolImpl pool = (PoolImpl) PoolManager.getAll().get(poolName); @@ -307,8 +309,9 @@ public String description() { * three servers with intersecting server groups. * Server: 1 2 3 * Groups: a a,b b + * @throws Exception */ - public void testIntersectingServerGroups() { + public void testIntersectingServerGroups() throws Exception { final Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); @@ -390,7 +393,7 @@ public void testIntersectingServerGroups() { } - public void testCustomLoadProbe() { + public void testCustomLoadProbe() throws Exception { final Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java index f35e2fa48b4f..a89d64896bb5 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java @@ -241,12 +241,12 @@ public Object call() throws IOException { return port.intValue(); } - protected void startBridgeClientInVM(VM vm, final String group, final String host, final int port) { + protected void startBridgeClientInVM(VM vm, final String group, final String host, final int port) throws Exception { startBridgeClientInVM(vm, group, host, port, new String[] {REGION_NAME}); } - protected void startBridgeClientInVM(VM vm, final String group, final String host, final int port, final String[] regions) { + protected void startBridgeClientInVM(VM vm, final String group, final String host, final int port, final String[] regions) throws Exception { PoolFactoryImpl pf = new PoolFactoryImpl(null); pf.addLocator(host, port) .setServerGroup(group) @@ -256,7 +256,7 @@ protected void startBridgeClientInVM(VM vm, final String group, final String hos startBridgeClientInVM(vm, pf.getPoolAttributes(), regions); } - protected void startBridgeClientInVM(VM vm, final Pool pool, final String[] regions) { + protected void startBridgeClientInVM(VM vm, final Pool pool, final String[] regions) throws Exception { SerializableRunnable connect = new SerializableRunnable("Start bridge client") { public void run() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java index 2ae829306109..07f00cd0c4b0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java @@ -1118,7 +1118,7 @@ public void run2() throws CacheException { }); // define the afterReleaseLocalLocks callback - Runnable removeRequiredRole = new SerializableRunnable() { + Runnable removeRequiredRole = new Runnable() { public void run() { Host.getHost(0).getVM(1).invoke(new SerializableRunnable("Close Region") { public void run() { @@ -1240,7 +1240,7 @@ public void run2() throws CacheException { region.put("INVALIDATE_ME", "VAL"); // define the afterReleaseLocalLocks callback - Runnable removeRequiredRole = new SerializableRunnable() { + Runnable removeRequiredRole = new Runnable() { public void run() { Host.getHost(0).getVM(1).invoke(new SerializableRunnable("Close Region") { public void run() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java index 78c70dcddd93..f97bf78ed108 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java @@ -240,7 +240,7 @@ public void run2() throws CacheException { } }; - Thread th = new Thread(createAccessorPR); + Thread th = new Thread(() -> createAccessorPR.run()); th.start(); async[0] = vm0.invokeAsync(createPR); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java index 6c2cc98c17ed..f7275b73e37f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java @@ -2393,11 +2393,9 @@ public void execute(Region region, Integer key) { /** * Test to ensure that we wait for * in progress write operations before moving a primary. - * @throws InterruptedException - * @throws CancellationException - * @throws TimeoutException + * @throws Exception */ - public void runTestWaitForOperation(final Operation op) throws CancellationException, InterruptedException, TimeoutException { + public void runTestWaitForOperation(final Operation op) throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java index 7f161fed1b9f..dc580cdd9310 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java @@ -101,7 +101,7 @@ public void setUp() throws Exception { verifyGemFireSetup(createPeer(Host.getHost(0).getVM(0), managerDistributedSystemProperties)); } - private void setupGemFire() { + private void setupGemFire() throws Exception { initializePeer(createPeer(Host.getHost(0).getVM(1), createDistributedSystemProperties(GEMFIRE_SERVER_NAME))); } @@ -118,7 +118,7 @@ protected Peer createPeer(final VM vm, final Properties distributedSystemPropert return new Peer(vm, distributedSystemProperties); } - protected void initializePeer(final Peer peer) { + protected void initializePeer(final Peer peer) throws Exception { peer.run(new SerializableRunnable( String.format("Initializes the '%1$s' with the '%2$s' Region having a CacheLoader.", GEMFIRE_SERVER_NAME, USERS_REGION_NAME)) { @@ -151,7 +151,7 @@ public void run() { }); } - private void verifyGemFireSetup(final Peer manager) { + private void verifyGemFireSetup(final Peer manager) throws Exception { manager.run(new SerializableRunnable("Verifies the GemFire Cluster was properly configured and initialized!") { @Override public void run() { @@ -283,7 +283,7 @@ public VM getVm() { return vm; } - public void run(final SerializableRunnableIF runnable) { + public void run(final SerializableRunnableIF runnable) throws Exception { if (getVm() == null) { runnable.run(); } else { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java index 386b8ed59574..4f86a55092a9 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java @@ -97,7 +97,7 @@ protected Properties createDistributedSystemProperties(final String gemfireName) return distributedSystemProperties; } - protected void createPersistentRegion(final Peer peer, final String regionName, final String diskStoreName) { + protected void createPersistentRegion(final Peer peer, final String regionName, final String diskStoreName) throws Exception { peer.run(new SerializableRunnable("Creating Persistent Region for Member " + peer.getName()) { @Override public void run() { @@ -183,7 +183,7 @@ public VM getVm() { return vm; } - public void run(final SerializableRunnableIF runnable) { + public void run(final SerializableRunnableIF runnable) throws Exception { if (getVm() == null) { runnable.run(); } else { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java index b7c42dc92770..c60f33e61982 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java @@ -144,7 +144,7 @@ protected Properties createDistributedSystemProperties(final String gemfireName) return distributedSystemProperties; } - protected void createRegionWithIndexes(final Peer peer) { + protected void createRegionWithIndexes(final Peer peer) throws Exception { peer.run(new SerializableRunnable( String.format("Creating Regions with Indexes on GemFire peer (%1$s).", peer.getName())) { public void run() { @@ -185,7 +185,7 @@ public void run() { }); } - protected void loadConsumerData(final Peer peer, final int operationsTotal) { + protected void loadConsumerData(final Peer peer, final int operationsTotal) throws Exception { peer.run(new SerializableRunnable("Load /consumers Region with data") { public void run() { final Cache cache = getCache(); @@ -231,7 +231,7 @@ public void run() { }); } - protected void loadProducerData(final Peer peer, final int operationsTotal) { + protected void loadProducerData(final Peer peer, final int operationsTotal) throws Exception { peer.run(new SerializableRunnable("Load /producers Region with data") { public void run() { final Cache cache = getCache(); @@ -357,7 +357,7 @@ public boolean remove(final RegionDefinition... regionDefinitions) { return (regionDefinitions != null && regions.removeAll(Arrays.asList(regionDefinitions))); } - public void run(final SerializableRunnableIF runnable) { + public void run(final SerializableRunnableIF runnable) throws Exception { if (getVm() == null) { runnable.run(); } else { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java index d0cead61bc3c..e453226c4f6a 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java @@ -119,7 +119,11 @@ public void run() { } }; - removeRunnable.run(); + try { + removeRunnable.run(); + } catch (Exception e) { + throw new RuntimeException(e); + } if (this.vm != null) { vm.invoke(removeRunnable); @@ -169,7 +173,11 @@ public void run() { } }; - addRunnable.run(); + try { + addRunnable.run(); + } catch (Exception e) { + throw new RuntimeException(e); + } if (vm != null) { vm.invoke(addRunnable); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnableIF.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnableIF.java index 5e5467dc5b2d..e7923f6b7e0a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnableIF.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnableIF.java @@ -21,5 +21,6 @@ /** * Interface for {@link SerializableRunnable} to enable use with lambdas. */ -public interface SerializableRunnableIF extends Serializable, Runnable { +public interface SerializableRunnableIF extends Serializable { + public void run() throws Exception; } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/RemoteInvoker.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/RemoteInvoker.java index e7e523fb6cc7..9e3c5b29f2b9 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/RemoteInvoker.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/RemoteInvoker.java @@ -27,7 +27,11 @@ public class RemoteInvoker implements Serializable { public void invokeEverywhere(final SerializableRunnable runnable) { - runnable.run(); + try { + runnable.run(); + } catch (Exception e) { + throw new RuntimeException(e); + } invokeInEveryVM(runnable); invokeInLocator(runnable); } From 5350890c10c73987e343d43c8d0ace3e17fdf7ca Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Wed, 10 Feb 2016 17:49:45 -0800 Subject: [PATCH 02/12] Decrecating all string based methods from VM These methods should no longer be used. Unfortunately, there are some calls that could not be automatically converted, so they cannot be completely removed. --- .../com/gemstone/gemfire/test/dunit/VM.java | 927 +----------------- 1 file changed, 10 insertions(+), 917 deletions(-) diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java index db3e302494a7..122aa0e34dfb 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java @@ -91,6 +91,7 @@ public int getPid() { * @throws RMIException * An exception occurred on while invoking the method in * this VM + * @deprecated Use {@link #invoke(SerializableCallableIF)} instead */ public Object invoke(final Class targetClass, final String methodName) { return invoke(targetClass, methodName, new Object[0]); @@ -106,6 +107,7 @@ public Object invoke(final Class targetClass, final String methodName) { * The class on which to invoke the method * @param methodName * The name of the method to invoke + * @deprecated Use {@link #invoke(SerializableCallableIF)} instead */ public AsyncInvocation invokeAsync(final Class targetClass, final String methodName) { return invokeAsync(targetClass, methodName, null); @@ -127,6 +129,7 @@ public AsyncInvocation invokeAsync(final Class targetClass, final String methodN * @throws RMIException * An exception occurred on while invoking the method in * this VM + * @deprecated Use {@link #invoke(SerializableCallableIF)} instead */ public Object invoke(Class targetClass, String methodName, Object[] args) { if (!this.available) { @@ -183,7 +186,8 @@ public Object invoke(Class targetClass, String methodName, Object[] args) { * The name of the method to invoke * @param args * Arguments passed to the method call (must be {@link - * java.io.Serializable}). + * java.io.Serializable}). + * @deprecated Use {@link #invoke(SerializableCallableIF)} instead */ public AsyncInvocation invokeAsync(final Class targetClass, final String methodName, @@ -210,7 +214,8 @@ public void run() { * The name of the method to invoke * @param args * Arguments passed to the method call (must be {@link - * java.io.Serializable}). + * java.io.Serializable}). + * @deprecated Use {@link #invoke(SerializableCallableIF)} instead */ public AsyncInvocation invokeAsync(final Object o, final String methodName, @@ -310,11 +315,12 @@ public void invokeRepeatingIfNecessary(RepeatableRunnable o, long repeatTimeoutM * @throws RMIException * An exception occurred on while invoking the method in * this VM + * @deprecated Use {@link #invoke(SerializableCallableIF)} instead */ public Object invoke(Object o, String methodName) { return invoke(o, methodName, new Object[0]); } - + /** * Invokes an instance method on an object that is serialized into * this VM. The return type of the method can be either {@link @@ -332,6 +338,7 @@ public Object invoke(Object o, String methodName) { * @throws RMIException * An exception occurred on while invoking the method in * this VM + * @deprecated Use {@link #invoke(SerializableCallableIF)} instead */ public Object invoke(Object o, String methodName, Object[] args) { if (!this.available) { @@ -373,922 +380,8 @@ public Object invoke(Object o, String methodName, Object[] args) { } } - /** - * Invokes the main method of a given class - * - * @param targetClass - * The class on which to invoke the main method - * @param args - * The "command line" arguments to pass to the - * main method - */ - public void invokeMain(Class targetClass, String[] args) { - Object[] stupid = new Object[] { args }; - invoke(targetClass, "main", stupid); - } - - /** - * Asynchronously invokes the main method of a given - * class - * - * @param c - * The class on which to invoke the main method - * @param args - * The "command line" arguments to pass to the - * main method - */ - public AsyncInvocation invokeMainAsync(Class c, String[] args) { - Object[] stupid = new Object[] { args }; - return invokeAsync(c, "main", stupid); - } - - /** - * Invokes a static method with a boolean return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a boolean - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public boolean invokeBoolean(Class c, String methodName) { - return invokeBoolean(c, methodName, new Object[0]); - } - - /** - * Invokes a static method with a boolean return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a boolean - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public boolean invokeBoolean(Class c, String methodName, Object[] args) { - Object result = invoke(c, methodName, args); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a boolean"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Boolean) { - return ((Boolean) result).booleanValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a boolean"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is boolean. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a boolean - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public boolean invokeBoolean(Object o, String methodName) { - return invokeBoolean(o, methodName, new Object[0]); - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is boolean. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a boolean - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public boolean invokeBoolean(Object o, String methodName, Object[] args) { - Object result = invoke(o, methodName, args); - Class c = o.getClass(); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a boolean"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Boolean) { - return ((Boolean) result).booleanValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a boolean"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes a static method with a char return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a char - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public char invokeChar(Class c, String methodName) { - return invokeChar(c, methodName, new Object[0]); - } - - /** - * Invokes a static method with a char return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a char - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public char invokeChar(Class c, String methodName, Object[] args) { - Object result = invoke(c, methodName, args); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a char"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Character) { - return ((Character) result).charValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a char"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is char. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a char - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public char invokeChar(Object o, String methodName) { - return invokeChar(o, methodName, new Object[0]); - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is char. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a char - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public char invokeChar(Object o, String methodName, Object[] args) { - Object result = invoke(o, methodName, args); - Class c = o.getClass(); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a char"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Character) { - return ((Character) result).charValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a char"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes a static method with a byte return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a byte - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public byte invokeByte(Class c, String methodName) { - return invokeByte(c, methodName, new Object[0]); - } - - /** - * Invokes a static method with a byte return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a byte - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public byte invokeByte(Class c, String methodName, Object[] args) { - Object result = invoke(c, methodName, args); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a byte"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Byte) { - return ((Byte) result).byteValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a byte"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is byte. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a byte - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public byte invokeByte(Object o, String methodName) { - return invokeByte(o, methodName, new Object[0]); - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is byte. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a byte - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public byte invokeByte(Object o, String methodName, Object[] args) { - Object result = invoke(o, methodName, args); - Class c = o.getClass(); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a byte"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Byte) { - return ((Byte) result).byteValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a byte"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes a static method with a short return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a short - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public short invokeShort(Class c, String methodName) { - return invokeShort(c, methodName, new Object[0]); - } - - /** - * Invokes a static method with a short return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a short - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public short invokeShort(Class c, String methodName, Object[] args) { - Object result = invoke(c, methodName, args); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a short"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Short) { - return ((Short) result).shortValue(); - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a short"; - throw new IllegalArgumentException(s); - } - } - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is short. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a short - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public short invokeShort(Object o, String methodName) { - return invokeShort(o, methodName, new Object[0]); - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is short. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a short - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public short invokeShort(Object o, String methodName, Object[] args) { - Object result = invoke(o, methodName, args); - Class c = o.getClass(); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a short"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Short) { - return ((Short) result).shortValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a short"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes a static method with a int return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a int - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public int invokeInt(Class c, String methodName) { - return invokeInt(c, methodName, new Object[0]); - } - - /** - * Invokes a static method with a int return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a int - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public int invokeInt(Class c, String methodName, Object[] args) { - Object result = invoke(c, methodName, args); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a int"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Integer) { - return ((Integer) result).intValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a int"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is int. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a int - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public int invokeInt(Object o, String methodName) { - return invokeInt(o, methodName, new Object[0]); - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is int. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a int - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public int invokeInt(Object o, String methodName, Object[] args) { - Object result = invoke(o, methodName, args); - Class c = o.getClass(); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a int"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Integer) { - return ((Integer) result).intValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a int"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes a static method with a long return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a long - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public long invokeLong(Class c, String methodName) { - return invokeLong(c, methodName, new Object[0]); - } - - /** - * Invokes a static method with a long return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a long - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public long invokeLong(Class c, String methodName, Object[] args) { - Object result = invoke(c, methodName, args); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a long"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Long) { - return ((Long) result).longValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a long"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is long. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a long - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public long invokeLong(Object o, String methodName) { - return invokeLong(o, methodName, new Object[0]); - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is long. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a long - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public long invokeLong(Object o, String methodName, Object[] args) { - Object result = invoke(o, methodName, args); - Class c = o.getClass(); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a long"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Long) { - return ((Long) result).longValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a long"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes a static method with a float return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a float - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public float invokeFloat(Class c, String methodName) { - return invokeFloat(c, methodName, new Object[0]); - } - - /** - * Invokes a static method with a float return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a float - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public float invokeFloat(Class c, String methodName, Object[] args) { - Object result = invoke(c, methodName, args); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a float"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Float) { - return ((Float) result).floatValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a float"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is float. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a float - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public float invokeFloat(Object o, String methodName) { - return invokeFloat(o, methodName, new Object[0]); - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is float. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a float - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public float invokeFloat(Object o, String methodName, Object[] args) { - Object result = invoke(o, methodName, args); - Class c = o.getClass(); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a float"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Float) { - return ((Float) result).floatValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a float"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes a static method with a double return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a double - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public double invokeDouble(Class c, String methodName) { - return invokeDouble(c, methodName, new Object[0]); - } - - /** - * Invokes a static method with a double return type - * in this VM. - * - * @param c - * The class on which to invoke the method - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a double - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public double invokeDouble(Class c, String methodName, Object[] args) { - Object result = invoke(c, methodName, args); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a double"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Double) { - return ((Double) result).doubleValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a double"; - throw new IllegalArgumentException(s); - } - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is double. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * - * @throws IllegalArgumentException - * The method does not return a double - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public double invokeDouble(Object o, String methodName) { - return invokeDouble(o, methodName, new Object[0]); - } - - /** - * Invokes an instance method on an object that is serialized into - * this VM. The return type of the method is double. - * - * @param o - * The receiver of the method invocation - * @param methodName - * The name of the method to invoke - * @param args - * Arguments passed to the method call (must be {@link - * java.io.Serializable}). - * - * @throws IllegalArgumentException - * The method does not return a double - * @throws RMIException - * An exception occurred on while invoking the method in - * this VM - */ - public double invokeDouble(Object o, String methodName, Object[] args) { - Object result = invoke(o, methodName, args); - Class c = o.getClass(); - if (result == null) { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned null, expected a double"; - throw new IllegalArgumentException(s); - - } else if (result instanceof Double) { - return ((Double) result).doubleValue(); - - } else { - String s = "Method \"" + methodName + "\" in class \"" + - c.getName() + "\" returned a \"" + result.getClass().getName() - + "\" expected a double"; - throw new IllegalArgumentException(s); - } - } /** * Synchronously bounces (mean kills and restarts) this VM. From 69024aa9946d1c2da2ca7245e6ad62f8ff025cb8 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Thu, 11 Feb 2016 11:16:38 -0800 Subject: [PATCH 03/12] Automatically converting calls of vm.invoke to lambdas This is an automatic conversion of many of the calls to vm.invoke that take a string to instead use a lambda. This was done using the following perl search/replace expressions on all dunit tests. perl -i -0pe 's/.\s*invoke(?:Boolean|Int|Long|)(Async|)\(\s*(\w+)(?:\.class|\.getClass\(\))\s*,\s*"([^"]+)",\s*new\s+Object\[\]\s*{([^}]*)}\s*\)/.invoke$1(() -> $2.$3($4))/mg' $1 perl -i -0pe 's/.\s*invoke(?:Boolean|Int|Long|)(Async|)\(\s*(\w+)(?:\.class|\.getClass\(\))\s*,\s*"([^"]+)"\s*\)/.invoke$1(() -> $2.$3())/mg' $1 perl -i -0pe 's/.\s*invoke(?:Boolean|Int|Long|)(Async|)\(\s*getClass\(\)\s*,\s*"([^"]+)",\s*new\s+Object\[\]\s*{([^}]*)}\s*\)/.invoke$1(() -> $2($3))/mg' $1 perl -i -0pe 's/.\s*invoke(?:Boolean|Int|Long|)(Async|)\(\s*getClass\(\)\s*,\s*"([^"]+)"\s*\)/.invoke$1(() -> $2())/mg' $1 --- .../cache/CacheRegionClearStatsDUnitTest.java | 36 +- .../cache/ClientServerTimeSyncDUnitTest.java | 4 +- .../CacheServerSSLConnectionDUnitTest.java | 44 +- .../internal/SSLNoClientAuthDUnitTest.java | 14 +- .../management/MemoryThresholdsDUnitTest.java | 10 +- .../MemoryThresholdsOffHeapDUnitTest.java | 10 +- .../query/dunit/PdxStringQueryDUnitTest.java | 42 +- .../QueryDataInconsistencyDUnitTest.java | 12 +- .../QueryUsingFunctionContextDUnitTest.java | 39 +- .../query/dunit/QueryUsingPoolDUnitTest.java | 32 +- .../query/dunit/RemoteQueryDUnitTest.java | 18 +- ...entIndexInitOnOverflowRegionDUnitTest.java | 3 +- .../index/PutAllWithIndexPerfDUnitTest.java | 2 +- .../gemfire/cache30/Bug34387DUnitTest.java | 2 +- .../gemfire/cache30/CacheMapTxnDUnitTest.java | 20 +- .../cache30/CachedAllEventsDUnitTest.java | 2 +- .../gemfire/cache30/CallbackArgDUnitTest.java | 2 +- .../cache30/ClearMultiVmCallBkDUnitTest.java | 18 +- .../cache30/ClearMultiVmDUnitTest.java | 18 +- .../cache30/ClientMembershipDUnitTest.java | 30 +- .../ClientRegisterInterestDUnitTest.java | 9 +- .../cache30/DistAckMapMethodsDUnitTest.java | 44 +- .../DistributedNoAckRegionCCEDUnitTest.java | 28 +- .../cache30/MultiVMRegionTestCase.java | 68 +- .../cache30/PartitionedRegionDUnitTest.java | 2 +- .../gemfire/cache30/ProxyDUnitTest.java | 2 +- .../PutAllCallBkRemoteVMDUnitTest.java | 8 +- .../PutAllCallBkSingleVMDUnitTest.java | 10 +- .../cache30/PutAllMultiVmDUnitTest.java | 8 +- .../gemfire/cache30/ReconnectDUnitTest.java | 6 +- .../RegionMembershipListenerDUnitTest.java | 2 +- .../cache30/RemoveAllMultiVmDUnitTest.java | 8 +- .../cache30/RolePerformanceDUnitTest.java | 3 +- .../cache30/SearchAndLoadDUnitTest.java | 4 +- .../cache30/TXDistributedDUnitTest.java | 12 +- .../gemfire/cache30/TXOrderDUnitTest.java | 2 +- .../gemfire/distributed/LocatorDUnitTest.java | 25 +- .../LocatorLauncherLocalJUnitTest.java | 4 +- .../LocatorLauncherRemoteJUnitTest.java | 2 +- .../ServerLauncherLocalJUnitTest.java | 4 +- .../ServerLauncherRemoteJUnitTest.java | 2 +- .../ConsoleDistributionManagerDUnitTest.java | 7 +- .../disttx/CacheMapDistTXDUnitTest.java | 8 +- .../gemfire/disttx/DistTXDebugDUnitTest.java | 20 +- .../DistributedTransactionDUnitTest.java | 2 +- .../internal/cache/Bug33359DUnitTest.java | 8 +- .../internal/cache/Bug33726DUnitTest.java | 10 +- .../internal/cache/Bug37241DUnitTest.java | 26 +- .../internal/cache/Bug39079DUnitTest.java | 19 +- .../internal/cache/Bug41733DUnitTest.java | 2 +- .../internal/cache/ClearDAckDUnitTest.java | 24 +- .../internal/cache/ClearGlobalDUnitTest.java | 6 +- .../cache/DeltaPropagationDUnitTest.java | 320 +-- .../cache/DeltaPropagationStatsDUnitTest.java | 120 +- .../cache/DiskRegByteArrayDUnitTest.java | 14 +- .../cache/DistributedCacheTestCase.java | 5 +- .../internal/cache/EventTrackerDUnitTest.java | 6 +- .../cache/EvictionStatsDUnitTest.java | 12 +- .../internal/cache/EvictionTestBase.java | 9 +- .../cache/FixedPRSinglehopDUnitTest.java | 156 +- .../internal/cache/GIIDeltaDUnitTest.java | 84 +- .../internal/cache/HABug36773DUnitTest.java | 46 +- .../HAOverflowMemObjectSizerDUnitTest.java | 48 +- .../internal/cache/MapClearGIIDUnitTest.java | 17 +- .../cache/P2PDeltaPropagationDUnitTest.java | 105 +- .../PartitionedRegionSingleHopDUnitTest.java | 460 ++-- ...gionSingleHopWithServerGroupDUnitTest.java | 243 +- .../internal/cache/PutAllDAckDUnitTest.java | 12 +- .../internal/cache/PutAllGlobalDUnitTest.java | 12 +- .../cache/RemoveAllDAckDUnitTest.java | 12 +- .../internal/cache/RemoveDAckDUnitTest.java | 10 +- .../internal/cache/RemoveGlobalDUnitTest.java | 12 +- .../cache/SingleHopStatsDUnitTest.java | 60 +- .../cache/SystemFailureDUnitTest.java | 4 +- .../cache/execute/Bug51193DUnitTest.java | 16 +- ...lientServerFunctionExecutionDUnitTest.java | 142 +- .../execute/ColocationFailoverDUnitTest.java | 43 +- ...butedRegionFunctionExecutionDUnitTest.java | 875 +++---- .../cache/execute/LocalDataSetDUnitTest.java | 26 +- .../LocalFunctionExecutionDUnitTest.java | 16 +- .../MemberFunctionExecutionDUnitTest.java | 59 +- ...MultiRegionFunctionExecutionDUnitTest.java | 8 +- ...ServerFunctionExecutionNoAckDUnitTest.java | 12 +- ...erverRegionFunctionExecutionDUnitTest.java | 97 +- ...ionFunctionExecutionFailoverDUnitTest.java | 236 +- ...FunctionExecutionNoSingleHopDUnitTest.java | 174 +- ...ExecutionSelectorNoSingleHopDUnitTest.java | 162 +- ...onFunctionExecutionSingleHopDUnitTest.java | 130 +- .../cache/execute/PRClientServerTestBase.java | 147 +- .../cache/execute/PRColocationDUnitTest.java | 219 +- .../PRCustomPartitioningDUnitTest.java | 8 +- .../execute/PRFunctionExecutionDUnitTest.java | 8 +- .../execute/PRPerformanceTestDUnitTest.java | 8 +- .../cache/execute/PRTransactionDUnitTest.java | 50 +- .../SingleHopGetAllPutAllDUnitTest.java | 6 +- .../ha/Bug36853EventsExpiryDUnitTest.java | 17 +- .../internal/cache/ha/Bug48571DUnitTest.java | 20 +- .../internal/cache/ha/Bug48879DUnitTest.java | 20 +- .../ha/EventIdOptimizationDUnitTest.java | 44 +- .../internal/cache/ha/FailoverDUnitTest.java | 18 +- .../cache/ha/HABugInPutDUnitTest.java | 20 +- .../internal/cache/ha/HAClearDUnitTest.java | 26 +- .../cache/ha/HAConflationDUnitTest.java | 14 +- .../cache/ha/HADuplicateDUnitTest.java | 21 +- .../ha/HAEventIdPropagationDUnitTest.java | 107 +- .../internal/cache/ha/HAExpiryDUnitTest.java | 56 +- .../internal/cache/ha/HAGIIBugDUnitTest.java | 12 +- .../internal/cache/ha/HAGIIDUnitTest.java | 29 +- .../cache/ha/HARQueueNewImplDUnitTest.java | 436 ++-- .../internal/cache/ha/HARegionDUnitTest.java | 68 +- .../cache/ha/HARegionQueueDUnitTest.java | 83 +- .../cache/ha/HASlowReceiverDUnitTest.java | 25 +- .../ha/OperationsPropagationDUnitTest.java | 30 +- .../internal/cache/ha/PutAllDUnitTest.java | 51 +- .../internal/cache/ha/StatsBugDUnitTest.java | 28 +- .../cache/locks/TXLockServiceDUnitTest.java | 28 +- .../cache/partitioned/Bug43684DUnitTest.java | 36 +- .../cache/partitioned/Bug47388DUnitTest.java | 29 +- .../cache/partitioned/Bug51400DUnitTest.java | 21 +- ...artitionedRegionLoaderWriterDUnitTest.java | 54 +- .../fixed/FixedPartitioningDUnitTest.java | 1139 ++++----- .../fixed/FixedPartitioningTestBase.java | 10 +- ...WithColocationAndPersistenceDUnitTest.java | 1296 ++++------ .../cache/tier/Bug40396DUnitTest.java | 21 +- ...atibilityHigherVersionClientDUnitTest.java | 29 +- .../cache/tier/sockets/Bug36269DUnitTest.java | 14 +- .../cache/tier/sockets/Bug36457DUnitTest.java | 29 +- .../cache/tier/sockets/Bug36805DUnitTest.java | 32 +- .../cache/tier/sockets/Bug36829DUnitTest.java | 23 +- .../cache/tier/sockets/Bug36995DUnitTest.java | 35 +- .../cache/tier/sockets/Bug37210DUnitTest.java | 19 +- .../cache/tier/sockets/Bug37805DUnitTest.java | 16 +- .../CacheServerTransactionsDUnitTest.java | 218 +- .../sockets/ClearPropagationDUnitTest.java | 48 +- .../sockets/ClientConflationDUnitTest.java | 28 +- .../ClientInterestNotifyDUnitTest.java | 85 +- .../sockets/ClientServerMiscDUnitTest.java | 35 +- .../tier/sockets/ConflationDUnitTest.java | 81 +- .../DataSerializerPropogationDUnitTest.java | 329 +-- .../DestroyEntryPropagationDUnitTest.java | 86 +- .../DurableClientQueueSizeDUnitTest.java | 106 +- .../DurableClientReconnectDUnitTest.java | 40 +- .../sockets/DurableClientStatsDUnitTest.java | 72 +- .../sockets/DurableRegistrationDUnitTest.java | 335 +-- .../DurableResponseMatrixDUnitTest.java | 86 +- .../sockets/EventIDVerificationDUnitTest.java | 64 +- .../EventIDVerificationInP2PDUnitTest.java | 38 +- .../tier/sockets/HABug36738DUnitTest.java | 18 +- .../sockets/HAInterestPart1DUnitTest.java | 100 +- .../sockets/HAInterestPart2DUnitTest.java | 114 +- .../tier/sockets/HAInterestTestCase.java | 32 +- .../HAStartupAndFailoverDUnitTest.java | 108 +- .../InstantiatorPropagationDUnitTest.java | 230 +- .../tier/sockets/InterestListDUnitTest.java | 280 +-- .../InterestListEndpointDUnitTest.java | 58 +- .../InterestListFailoverDUnitTest.java | 46 +- .../InterestListRecoveryDUnitTest.java | 24 +- .../InterestRegrListenerDUnitTest.java | 82 +- .../InterestResultPolicyDUnitTest.java | 27 +- .../sockets/NewRegionAttributesDUnitTest.java | 28 +- .../RedundancyLevelPart1DUnitTest.java | 36 +- .../RedundancyLevelPart2DUnitTest.java | 67 +- .../RedundancyLevelPart3DUnitTest.java | 100 +- .../tier/sockets/RedundancyLevelTestBase.java | 20 +- .../tier/sockets/RegionCloseDUnitTest.java | 16 +- ...InterestBeforeRegionCreationDUnitTest.java | 20 +- .../RegisterInterestKeysDUnitTest.java | 24 +- .../sockets/ReliableMessagingDUnitTest.java | 22 +- .../sockets/UnregisterInterestDUnitTest.java | 62 +- .../sockets/UpdatePropagationDUnitTest.java | 65 +- ...VerifyEventIDGenerationInP2PDUnitTest.java | 13 +- ...datesFromNonInterestEndPointDUnitTest.java | 25 +- .../cache/wan/AsyncEventQueueTestBase.java | 16 +- .../AsyncEventListenerDUnitTest.java | 2175 +++++++---------- .../AsyncEventQueueStatsDUnitTest.java | 321 ++- .../ConcurrentAsyncEventQueueDUnitTest.java | 354 ++- ...ommonParallelAsyncEventQueueDUnitTest.java | 15 +- .../jta/dunit/ExceptionsDUnitTest.java | 10 +- .../jta/dunit/IdleTimeOutDUnitTest.java | 7 +- .../jta/dunit/LoginTimeOutDUnitTest.java | 8 +- .../jta/dunit/MaxPoolSizeDUnitTest.java | 5 +- .../dunit/TransactionTimeOutDUnitTest.java | 24 +- .../dunit/TxnManagerMultiThreadDUnitTest.java | 14 +- .../jta/dunit/TxnTimeOutDUnitTest.java | 9 +- .../statistics/StatisticsDUnitTest.java | 10 +- .../management/CacheManagementDUnitTest.java | 16 +- .../ClientHealthStatsDUnitTest.java | 56 +- .../management/QueryDataDUnitTest.java | 20 +- ...salMembershipListenerAdapterDUnitTest.java | 54 +- .../commands/FunctionCommandsDUnitTest.java | 4 +- .../GemfireDataCommandsDUnitTest.java | 4 +- .../MiscellaneousCommandsDUnitTest.java | 6 +- ...neousCommandsExportLogsPart3DUnitTest.java | 2 +- .../pulse/TestFunctionsDUnitTest.java | 3 +- .../internal/pulse/TestHeapDUnitTest.java | 5 +- .../internal/pulse/TestLocatorsDUnitTest.java | 3 +- .../web/controllers/RestAPITestBase.java | 8 +- .../ClientAuthenticationDUnitTest.java | 417 ++-- .../ClientAuthorizationDUnitTest.java | 235 +- .../security/ClientAuthorizationTestBase.java | 19 +- .../ClientMultiUserAuthzDUnitTest.java | 53 +- .../DeltaClientAuthorizationDUnitTest.java | 47 +- ...DeltaClientPostAuthorizationDUnitTest.java | 36 +- .../security/P2PAuthenticationDUnitTest.java | 116 +- .../gemfire/test/dunit/AsyncInvocation.java | 4 +- .../gemfire/test/dunit/RMIException.java | 2 +- .../test/dunit/tests/BasicDUnitTest.java | 12 +- .../gemfire/test/dunit/tests/VMDUnitTest.java | 18 +- .../cache/query/cq/dunit/CqDataDUnitTest.java | 33 +- .../cq/dunit/CqDataUsingPoolDUnitTest.java | 91 +- .../cache/query/cq/dunit/CqPerfDUnitTest.java | 19 +- .../cq/dunit/CqPerfUsingPoolDUnitTest.java | 17 +- .../query/cq/dunit/CqQueryDUnitTest.java | 92 +- .../CqQueryOptimizedExecuteDUnitTest.java | 12 +- .../cq/dunit/CqQueryUsingPoolDUnitTest.java | 49 +- .../dunit/CqResultSetUsingPoolDUnitTest.java | 34 +- ...SetUsingPoolOptimizedExecuteDUnitTest.java | 4 +- .../query/cq/dunit/CqStatsDUnitTest.java | 4 +- .../cq/dunit/CqStatsUsingPoolDUnitTest.java | 4 +- .../PartitionedRegionCqQueryDUnitTest.java | 32 +- ...egionCqQueryOptimizedExecuteDUnitTest.java | 6 +- .../cq/dunit/PrCqUsingPoolDUnitTest.java | 28 +- .../query/dunit/PdxQueryCQDUnitTest.java | 14 +- .../dunit/QueryIndexUpdateRIDUnitTest.java | 24 +- .../query/dunit/QueryMonitorDUnitTest.java | 7 +- .../cache/PRDeltaPropagationDUnitTest.java | 192 +- .../internal/cache/ha/CQListGIIDUnitTest.java | 116 +- .../cache/ha/HADispatcherDUnitTest.java | 38 +- .../sockets/ClientToServerDeltaDUnitTest.java | 282 +-- .../DeltaPropagationWithCQDUnitTest.java | 41 +- ...RegionRelationCQRegistrationDUnitTest.java | 140 +- .../sockets/DurableClientCrashDUnitTest.java | 4 +- .../DurableClientNetDownDUnitTest.java | 10 +- .../sockets/DurableClientSimpleDUnitTest.java | 442 ++-- .../tier/sockets/DurableClientTestCase.java | 202 +- .../CacheServerManagementDUnitTest.java | 3 +- .../cli/commands/ClientCommandsDUnitTest.java | 8 +- .../DurableClientCommandsDUnitTest.java | 6 +- .../internal/pulse/TestCQDUnitTest.java | 6 +- .../internal/pulse/TestClientsDUnitTest.java | 6 +- .../internal/pulse/TestServerDUnitTest.java | 3 +- .../ClientAuthorizationTwoDUnitTest.java | 20 +- .../ClientAuthzObjectModDUnitTest.java | 23 +- .../ClientCQPostAuthorizationDUnitTest.java | 62 +- .../ClientPostAuthorizationDUnitTest.java | 49 +- .../security/MultiuserAPIDUnitTest.java | 41 +- .../MultiuserDurableCQAuthzDUnitTest.java | 52 +- .../cache/UpdateVersionDUnitTest.java | 88 +- .../internal/cache/wan/WANTestBase.java | 16 +- ...currentParallelGatewaySenderDUnitTest.java | 1164 +++++---- ...lelGatewaySenderOperation_1_DUnitTest.java | 1063 ++++---- ...lelGatewaySenderOperation_2_DUnitTest.java | 63 +- .../ConcurrentWANPropogation_1_DUnitTest.java | 644 +++-- .../ConcurrentWANPropogation_2_DUnitTest.java | 699 +++--- .../cache/wan/disttx/DistTXWANDUnitTest.java | 258 +- .../CommonParallelGatewaySenderDUnitTest.java | 459 ++-- ...ANConcurrencyCheckForDestroyDUnitTest.java | 164 +- .../cache/wan/misc/PDXNewWanDUnitTest.java | 744 +++--- ...egion_ParallelWANPersistenceDUnitTest.java | 767 +++--- ...egion_ParallelWANPropogationDUnitTest.java | 1014 ++++---- .../SenderWithTransportFilterDUnitTest.java | 66 +- ...wnAllPersistentGatewaySenderDUnitTest.java | 48 +- .../wan/misc/WANLocatorServerDUnitTest.java | 40 +- .../cache/wan/misc/WANSSLDUnitTest.java | 98 +- .../wan/misc/WanAutoDiscoveryDUnitTest.java | 282 +-- .../wan/misc/WanValidationsDUnitTest.java | 1594 ++++++------ ...allelGatewaySenderOperationsDUnitTest.java | 273 +-- ...elGatewaySenderQueueOverflowDUnitTest.java | 476 ++-- ...sistenceEnabledGatewaySenderDUnitTest.java | 1839 +++++++------- ...elWANPropagationClientServerDUnitTest.java | 94 +- ...lWANPropagationConcurrentOpsDUnitTest.java | 264 +- .../ParallelWANPropagationDUnitTest.java | 2046 ++++++++-------- ...rallelWANPropagationLoopBackDUnitTest.java | 438 ++-- .../parallel/ParallelWANStatsDUnitTest.java | 366 ++- ...waySenderDistributedDeadlockDUnitTest.java | 171 +- ...alGatewaySenderEventListenerDUnitTest.java | 300 ++- ...erialGatewaySenderOperationsDUnitTest.java | 26 +- .../SerialGatewaySenderQueueDUnitTest.java | 200 +- ...sistenceEnabledGatewaySenderDUnitTest.java | 707 +++--- ...SerialWANPropagationLoopBackDUnitTest.java | 547 ++--- .../serial/SerialWANPropogationDUnitTest.java | 1701 ++++++------- ...ropogation_PartitionedRegionDUnitTest.java | 693 +++--- ...SerialWANPropogationsFeatureDUnitTest.java | 562 ++--- .../wan/serial/SerialWANStatsDUnitTest.java | 733 +++--- .../wan/wancommand/WANCommandTestBase.java | 16 +- ...CommandCreateGatewayReceiverDUnitTest.java | 274 +-- ...anCommandCreateGatewaySenderDUnitTest.java | 302 +-- ...nCommandGatewayReceiverStartDUnitTest.java | 171 +- ...anCommandGatewayReceiverStopDUnitTest.java | 175 +- ...WanCommandGatewaySenderStartDUnitTest.java | 289 +-- .../WanCommandGatewaySenderStopDUnitTest.java | 273 +-- .../wancommand/WanCommandListDUnitTest.java | 172 +- .../WanCommandPauseResumeDUnitTest.java | 630 +++-- .../wancommand/WanCommandStatusDUnitTest.java | 234 +- .../management/WANManagementDUnitTest.java | 108 +- .../pulse/TestRemoteClusterDUnitTest.java | 46 +- 296 files changed, 18455 insertions(+), 23442 deletions(-) diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java index 7ea3565fb599..743887a4f110 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java @@ -148,13 +148,11 @@ public static void createClientCacheDisk(String host, Integer port1) * 1)Verifies that clear operation count matches with stats count
*/ public void testClearStatsWithNormalRegion(){ - Integer port1 = ((Integer)server1.invoke( - CacheRegionClearStatsDUnitTest.class, "createServerCache")); + Integer port1 = ((Integer)server1.invoke(() -> CacheRegionClearStatsDUnitTest.createServerCache())); - client1.invoke(CacheRegionClearStatsDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client1.invoke(CacheRegionClearStatsDUnitTest.class, "put"); + client1.invoke(() -> CacheRegionClearStatsDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client1.invoke(() -> CacheRegionClearStatsDUnitTest.put()); try{ Thread.sleep(10000); @@ -162,24 +160,20 @@ public void testClearStatsWithNormalRegion(){ // sleep } - client1.invoke(CacheRegionClearStatsDUnitTest.class, - "validationClearStat"); + client1.invoke(() -> CacheRegionClearStatsDUnitTest.validationClearStat()); - server1.invoke(CacheRegionClearStatsDUnitTest.class, - "validationClearStat"); + server1.invoke(() -> CacheRegionClearStatsDUnitTest.validationClearStat()); } /** * This test does the following ( clear stats counter when disk involved ):
* 1)Verifies that clear operation count matches with stats count
*/ public void testClearStatsWithDiskRegion(){ - Integer port1 = ((Integer)server1.invoke( - CacheRegionClearStatsDUnitTest.class, "createServerCacheDisk")); + Integer port1 = ((Integer)server1.invoke(() -> CacheRegionClearStatsDUnitTest.createServerCacheDisk())); - client1.invoke(CacheRegionClearStatsDUnitTest.class, - "createClientCacheDisk", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client1.invoke(CacheRegionClearStatsDUnitTest.class, "put"); + client1.invoke(() -> CacheRegionClearStatsDUnitTest.createClientCacheDisk( + NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client1.invoke(() -> CacheRegionClearStatsDUnitTest.put()); try{ Thread.sleep(10000); @@ -187,18 +181,16 @@ public void testClearStatsWithDiskRegion(){ // sleep } - client1.invoke(CacheRegionClearStatsDUnitTest.class, - "validationClearStat"); + client1.invoke(() -> CacheRegionClearStatsDUnitTest.validationClearStat()); - server1.invoke(CacheRegionClearStatsDUnitTest.class, - "validationClearStat"); + server1.invoke(() -> CacheRegionClearStatsDUnitTest.validationClearStat()); } @Override protected final void preTearDown() throws Exception { - client1.invoke(CacheRegionClearStatsDUnitTest.class, "closeCache"); + client1.invoke(() -> CacheRegionClearStatsDUnitTest.closeCache()); // then close the servers - server1.invoke(CacheRegionClearStatsDUnitTest.class, "closeCache"); + server1.invoke(() -> CacheRegionClearStatsDUnitTest.closeCache()); } public static void closeCache() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java index 8166318ad00f..8b04ab5fbfc4 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java @@ -113,7 +113,7 @@ public String description() { Wait.waitForCriterion(wc, 60000, 1000, true); } finally { cache.close(); - vm1.invoke(CacheTestCase.class, "disconnectFromDS"); + vm1.invoke(() -> CacheTestCase.disconnectFromDS()); } } @@ -196,7 +196,7 @@ public String description() { Wait.waitForCriterion(wc, 60000, 1000, true); } finally { cache.close(); - vm1.invoke(CacheTestCase.class, "disconnectFromDS"); + vm1.invoke(() -> CacheTestCase.disconnectFromDS()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java index 9bdf56c5e860..5fa4fc4d4ee5 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java @@ -252,10 +252,10 @@ public void testCacheServerSSL() throws Exception { boolean cacheClientSslenabled = true; boolean cacheClientSslRequireAuth = true; - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpServerVMTask", new Object[]{cacheServerSslenabled}); - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "createServerTask"); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.setUpServerVMTask(cacheServerSslenabled)); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.createServerTask()); - Object array[] = (Object[])serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "getCacheServerEndPointTask"); + Object array[] = (Object[])serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.getCacheServerEndPointTask()); String hostName = (String)array[0]; int port = (Integer) array[1]; Object params[] = new Object[6]; @@ -267,8 +267,8 @@ public void testCacheServerSSL() throws Exception { params[5] = CLIENT_TRUST_STORE; //getLogWriter().info("Starting client with server endpoint " + hostName + ":" + port); clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpClientVMTask", params); - clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "doClientRegionTestTask"); - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "doServerRegionTestTask"); + clientVM.invoke(() -> CacheServerSSLConnectionDUnitTest.doClientRegionTestTask()); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.doServerRegionTestTask()); } @@ -282,10 +282,10 @@ public void testNonSSLClient() throws Exception { boolean cacheClientSslenabled = false; boolean cacheClientSslRequireAuth = true; - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpServerVMTask", new Object[]{cacheServerSslenabled}); - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "createServerTask"); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.setUpServerVMTask(cacheServerSslenabled)); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.createServerTask()); - Object array[] = (Object[])serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "getCacheServerEndPointTask"); + Object array[] = (Object[])serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.getCacheServerEndPointTask()); String hostName = (String)array[0]; int port = (Integer) array[1]; Object params[] = new Object[6]; @@ -300,8 +300,8 @@ public void testNonSSLClient() throws Exception { try{ //getLogWriter().info("Starting client with server endpoint " + hostName + ":" + port); clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpClientVMTaskNoSubscription", params); - clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "doClientRegionTestTask"); - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "doServerRegionTestTask"); + clientVM.invoke(() -> CacheServerSSLConnectionDUnitTest.doClientRegionTestTask()); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.doServerRegionTestTask()); fail("Test should fail as non-ssl client is trying to connect to ssl configured server"); } catch (Exception rmiException) { Throwable e = rmiException.getCause(); @@ -330,10 +330,10 @@ public void testSSLClientWithNoAuth() throws Exception { boolean cacheClientSslenabled = true; boolean cacheClientSslRequireAuth = false; - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpServerVMTask", new Object[]{cacheServerSslenabled}); - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "createServerTask"); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.setUpServerVMTask(cacheServerSslenabled)); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.createServerTask()); - Object array[] = (Object[])serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "getCacheServerEndPointTask"); + Object array[] = (Object[])serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.getCacheServerEndPointTask()); String hostName = (String)array[0]; int port = (Integer) array[1]; Object params[] = new Object[6]; @@ -346,8 +346,8 @@ public void testSSLClientWithNoAuth() throws Exception { //getLogWriter().info("Starting client with server endpoint " + hostName + ":" + port); try { clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpClientVMTask", params); - clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "doClientRegionTestTask"); - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "doServerRegionTestTask"); + clientVM.invoke(() -> CacheServerSSLConnectionDUnitTest.doClientRegionTestTask()); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.doServerRegionTestTask()); } catch (Exception rmiException) { Throwable e = rmiException.getCause(); //getLogWriter().info("ExceptionCause at clientVM " + e); @@ -372,10 +372,10 @@ public void testSSLClientWithNonSSLServer() throws Exception { boolean cacheClientSslenabled = true; boolean cacheClientSslRequireAuth = true; - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpServerVMTask", new Object[]{cacheServerSslenabled}); - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "createServerTask"); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.setUpServerVMTask(cacheServerSslenabled)); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.createServerTask()); - Object array[] = (Object[])serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "getCacheServerEndPointTask"); + Object array[] = (Object[])serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.getCacheServerEndPointTask()); String hostName = (String)array[0]; int port = (Integer) array[1]; Object params[] = new Object[6]; @@ -389,8 +389,8 @@ public void testSSLClientWithNonSSLServer() throws Exception { try{ //getLogWriter().info("Starting client with server endpoint " + hostName + ":" + port); clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpClientVMTask", params); - clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "doClientRegionTestTask"); - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "doServerRegionTestTask"); + clientVM.invoke(() -> CacheServerSSLConnectionDUnitTest.doClientRegionTestTask()); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.doServerRegionTestTask()); fail("Test should fail as ssl client with ssl enabled is trying to connect to server with ssl disabled"); }catch (Exception rmiException) { @@ -417,8 +417,8 @@ protected final void preTearDown() throws Exception { final Host host = Host.getHost(0); VM serverVM = host.getVM(1); VM clientVM = host.getVM(2); - clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "closeClientCacheTask"); - serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "closeCacheTask"); + clientVM.invoke(() -> CacheServerSSLConnectionDUnitTest.closeClientCacheTask()); + serverVM.invoke(() -> CacheServerSSLConnectionDUnitTest.closeCacheTask()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java index bb1cc0963571..e23fb76225d0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java @@ -241,10 +241,10 @@ public void testSSLServerWithNoAuth() throws Exception { boolean cacheClientSslenabled = true; boolean cacheClientSslRequireAuth = true; - serverVM.invoke(SSLNoClientAuthDUnitTest.class, "setUpServerVMTask", new Object[]{cacheServerSslenabled}); - serverVM.invoke(SSLNoClientAuthDUnitTest.class, "createServerTask"); + serverVM.invoke(() -> SSLNoClientAuthDUnitTest.setUpServerVMTask(cacheServerSslenabled)); + serverVM.invoke(() -> SSLNoClientAuthDUnitTest.createServerTask()); - Object array[] = (Object[])serverVM.invoke(SSLNoClientAuthDUnitTest.class, "getCacheServerEndPointTask"); + Object array[] = (Object[])serverVM.invoke(() -> SSLNoClientAuthDUnitTest.getCacheServerEndPointTask()); String hostName = (String)array[0]; int port = (Integer) array[1]; Object params[] = new Object[6]; @@ -257,8 +257,8 @@ public void testSSLServerWithNoAuth() throws Exception { //getLogWriter().info("Starting client with server endpoint " + hostName + ":" + port); try { clientVM.invoke(SSLNoClientAuthDUnitTest.class, "setUpClientVMTask", params); - clientVM.invoke(SSLNoClientAuthDUnitTest.class, "doClientRegionTestTask"); - serverVM.invoke(SSLNoClientAuthDUnitTest.class, "doServerRegionTestTask"); + clientVM.invoke(() -> SSLNoClientAuthDUnitTest.doClientRegionTestTask()); + serverVM.invoke(() -> SSLNoClientAuthDUnitTest.doServerRegionTestTask()); } catch (Exception rmiException) { Throwable e = rmiException.getCause(); //getLogWriter().info("ExceptionCause at clientVM " + e); @@ -271,7 +271,7 @@ protected final void preTearDown() throws Exception { final Host host = Host.getHost(0); VM serverVM = host.getVM(1); VM clientVM = host.getVM(2); - clientVM.invoke(SSLNoClientAuthDUnitTest.class, "closeClientCacheTask"); - serverVM.invoke(SSLNoClientAuthDUnitTest.class, "closeCacheTask"); + clientVM.invoke(() -> SSLNoClientAuthDUnitTest.closeClientCacheTask()); + serverVM.invoke(() -> SSLNoClientAuthDUnitTest.closeCacheTask()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java index 4e4b10f8eb63..c93848b7d13c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java @@ -1732,7 +1732,7 @@ public void testLRLoadRejection() throws Exception { final float criticalHeapThresh = 0.90f; final int fakeHeapMaxSize = 1000; - vm.invoke(DistributedTestCase.class, "disconnectFromDS"); + vm.invoke(() -> DistributedTestCase.disconnectFromDS()); vm.invoke(new CacheSerializableRunnable("test LocalRegion load passthrough when critical") { @Override @@ -1850,8 +1850,8 @@ public void testDRLoadRejection() throws Exception { final int fakeHeapMaxSize = 1000; // Make sure the desired VMs will have a fresh DS. - AsyncInvocation d1 = replicate1.invokeAsync(DistributedTestCase.class, "disconnectFromDS"); - AsyncInvocation d2 = replicate2.invokeAsync(DistributedTestCase.class, "disconnectFromDS"); + AsyncInvocation d1 = replicate1.invokeAsync(() -> DistributedTestCase.disconnectFromDS()); + AsyncInvocation d2 = replicate2.invokeAsync(() -> DistributedTestCase.disconnectFromDS()); d1.join(); assertFalse(d1.exceptionOccurred()); d2.join(); @@ -2032,8 +2032,8 @@ public void testPRLoadRejection() throws Exception { final int fakeHeapMaxSize = 1000; // Make sure the desired VMs will have a fresh DS. - AsyncInvocation d0 = accessor.invokeAsync(DistributedTestCase.class, "disconnectFromDS"); - AsyncInvocation d1 = ds1.invokeAsync(DistributedTestCase.class, "disconnectFromDS"); + AsyncInvocation d0 = accessor.invokeAsync(() -> DistributedTestCase.disconnectFromDS()); + AsyncInvocation d1 = ds1.invokeAsync(() -> DistributedTestCase.disconnectFromDS()); d0.join(); assertFalse(d0.exceptionOccurred()); d1.join(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java index 532a239b8591..3cf7b09d9136 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java @@ -524,8 +524,8 @@ public void testDRLoadRejection() throws Exception { final String rName = getUniqueName(); // Make sure the desired VMs will have a fresh DS. - AsyncInvocation d1 = replicate1.invokeAsync(DistributedTestCase.class, "disconnectFromDS"); - AsyncInvocation d2 = replicate2.invokeAsync(DistributedTestCase.class, "disconnectFromDS"); + AsyncInvocation d1 = replicate1.invokeAsync(() -> DistributedTestCase.disconnectFromDS()); + AsyncInvocation d2 = replicate2.invokeAsync(() -> DistributedTestCase.disconnectFromDS()); d1.join(); assertFalse(d1.exceptionOccurred()); d2.join(); @@ -928,8 +928,8 @@ public void testPRLoadRejection() throws Exception { final String rName = getUniqueName(); // Make sure the desired VMs will have a fresh DS. - AsyncInvocation d0 = accessor.invokeAsync(DistributedTestCase.class, "disconnectFromDS"); - AsyncInvocation d1 = ds1.invokeAsync(DistributedTestCase.class, "disconnectFromDS"); + AsyncInvocation d0 = accessor.invokeAsync(() -> DistributedTestCase.disconnectFromDS()); + AsyncInvocation d1 = ds1.invokeAsync(() -> DistributedTestCase.disconnectFromDS()); d0.join(); assertFalse(d0.exceptionOccurred()); d1.join(); @@ -1152,7 +1152,7 @@ public void testLRLoadRejection() throws Exception { final VM vm = host.getVM(2); final String rName = getUniqueName(); - vm.invoke(DistributedTestCase.class, "disconnectFromDS"); + vm.invoke(() -> DistributedTestCase.disconnectFromDS()); vm.invoke(new CacheSerializableRunnable("test LocalRegion load passthrough when critical") { @Override diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java index 42459c99d61c..934798cae342 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java @@ -166,9 +166,9 @@ public void run2() throws CacheException { }); // Client pool. - final int port0 = server0.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); + final int port0 = server0.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port1 = server1.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port2 = server2.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(server0.getHost()); @@ -424,9 +424,9 @@ public void run2() throws CacheException { }); // Client pool. - final int port0 = server0.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); + final int port0 = server0.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port1 = server1.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port2 = server2.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(server0.getHost()); @@ -637,9 +637,9 @@ public void run2() throws CacheException { }); // Client pool. - final int port0 = server0.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); + final int port0 = server0.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port1 = server1.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port2 = server2.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(server0.getHost()); // Create client pool. @@ -850,9 +850,9 @@ public void run2() throws CacheException { }); // Client pool. - final int port0 = server0.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); + final int port0 = server0.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port1 = server1.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port2 = server2.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(server0.getHost()); @@ -1114,9 +1114,9 @@ public void run2() throws CacheException { }); // Client pool. - final int port0 = server0.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); + final int port0 = server0.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port1 = server1.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port2 = server2.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(server0.getHost()); @@ -1341,9 +1341,9 @@ public void run2() throws CacheException { }); // Client pool. - final int port0 = server0.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); + final int port0 = server0.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port1 = server1.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port2 = server2.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(server0.getHost()); @@ -1568,9 +1568,9 @@ public void run2() throws CacheException { }); // Client pool. - final int port0 = server0.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); - final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort"); + final int port0 = server0.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port1 = server1.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); + final int port2 = server2.invoke(() -> PdxStringQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(server0.getHost()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java index aeb4343e85d2..0227836954a1 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java @@ -114,8 +114,7 @@ public void setUp() throws Exception { public void testCompactRangeIndex() { // Create caches Properties props = new Properties(); - server.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); + server.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); server.invoke(new CacheSerializableRunnable("create indexes") { @@ -210,8 +209,7 @@ public void run2() throws CacheException { public void testRangeIndex() { // Create caches Properties props = new Properties(); - server.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); + server.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); server.invoke(new CacheSerializableRunnable("create indexes") { @@ -305,8 +303,7 @@ public void run2() throws CacheException { public void testRangeIndexWithIndexAndQueryFromCluaseMisMatch() { // Create caches Properties props = new Properties(); - server.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); + server.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); server.invoke(new CacheSerializableRunnable("create indexes") { @@ -396,8 +393,7 @@ public void run2() throws CacheException { public void testRangeIndexWithIndexAndQueryFromCluaseMisMatch2() { // Create caches Properties props = new Properties(); - server.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); + server.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); server.invoke(new CacheSerializableRunnable("create indexes") { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java index fcc96dce52a4..2d7212e64ff0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java @@ -713,44 +713,37 @@ private void registerFunctionOnServers() { private void createServersWithRegions() { //Create caches Properties props = new Properties(); - server1.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); - server2.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); - server3.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); + server1.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); + server2.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); + server3.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); //Create Cache Servers - Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, - "createCacheServer"); - Integer port2 = (Integer)server2.invoke(PRClientServerTestBase.class, - "createCacheServer"); - Integer port3 = (Integer)server3.invoke(PRClientServerTestBase.class, - "createCacheServer"); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerTestBase.createCacheServer()); + Integer port2 = (Integer)server2.invoke(() -> PRClientServerTestBase.createCacheServer()); + Integer port3 = (Integer)server3.invoke(() -> PRClientServerTestBase.createCacheServer()); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; //Create client cache without regions - client.invoke(QueryUsingFunctionContextDUnitTest.class, "createCacheClientWithoutRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, - port3 }); + client.invoke(() -> QueryUsingFunctionContextDUnitTest.createCacheClientWithoutRegion( NetworkUtils.getServerHostName(server1.getHost()), port1, port2, + port3 )); //Create proxy regions on client. - client.invoke(QueryUsingFunctionContextDUnitTest.class, "createProxyRegions"); + client.invoke(() -> QueryUsingFunctionContextDUnitTest.createProxyRegions()); //Create local Region on servers - server1.invoke(QueryUsingFunctionContextDUnitTest.class, "createLocalRegion"); + server1.invoke(() -> QueryUsingFunctionContextDUnitTest.createLocalRegion()); //Create ReplicatedRegion on servers - server1.invoke(QueryUsingFunctionContextDUnitTest.class, "createReplicatedRegion"); - server2.invoke(QueryUsingFunctionContextDUnitTest.class, "createReplicatedRegion"); - server3.invoke(QueryUsingFunctionContextDUnitTest.class, "createReplicatedRegion"); + server1.invoke(() -> QueryUsingFunctionContextDUnitTest.createReplicatedRegion()); + server2.invoke(() -> QueryUsingFunctionContextDUnitTest.createReplicatedRegion()); + server3.invoke(() -> QueryUsingFunctionContextDUnitTest.createReplicatedRegion()); //Create two colocated PartitionedRegions On Servers. - server1.invoke(QueryUsingFunctionContextDUnitTest.class, "createColocatedPR"); - server2.invoke(QueryUsingFunctionContextDUnitTest.class, "createColocatedPR"); - server3.invoke(QueryUsingFunctionContextDUnitTest.class, "createColocatedPR"); + server1.invoke(() -> QueryUsingFunctionContextDUnitTest.createColocatedPR()); + server2.invoke(() -> QueryUsingFunctionContextDUnitTest.createColocatedPR()); + server3.invoke(() -> QueryUsingFunctionContextDUnitTest.createColocatedPR()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java index d1e42d36a104..4df1f816618a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java @@ -195,7 +195,7 @@ public void run2() throws CacheException { }); - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; @@ -331,7 +331,7 @@ public void run2() throws CacheException { } }); - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; @@ -571,7 +571,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { @@ -660,7 +660,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; @@ -841,7 +841,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -998,8 +998,8 @@ public void run2() throws CacheException { }); // Create client region - final int port0 = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); - final int port1 = vm1.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port0 = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); + final int port1 = vm1.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); @@ -1151,7 +1151,7 @@ public void run2() throws CacheException { } }); - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -1242,7 +1242,7 @@ public void run2() throws CacheException { } }); - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -1362,7 +1362,7 @@ public void run2() throws CacheException { } }); - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + this.rootRegionName + "/" + this.regionName; @@ -1507,7 +1507,7 @@ public void run2() throws CacheException { }); // Create client region - final int port0 = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port0 = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); @@ -1695,7 +1695,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName1 = "/" + rootRegionName + "/" + name+"1"; final String regionName2 = "/" + rootRegionName + "/" + name+"2"; @@ -1792,7 +1792,7 @@ public void run2() throws CacheException { } }); - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; @@ -1940,7 +1940,7 @@ public void afterQueryEvaluation(Object result) { } }); - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName1 = "/" + rootRegionName + "/" + name; @@ -2035,7 +2035,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName = "/" + rootRegionName + "/" + name; @@ -2186,7 +2186,7 @@ public void run2() throws CacheException { } }); - final int port = vm0.invokeInt(QueryUsingPoolDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> QueryUsingPoolDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); final String regionName1 = "/" + rootRegionName + "/" + name; diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java index fc79893b0aa7..09fd94591458 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java @@ -123,7 +123,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> RemoteQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { @@ -266,7 +266,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> RemoteQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { @@ -394,7 +394,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> RemoteQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { @@ -627,7 +627,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> RemoteQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { @@ -714,7 +714,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> RemoteQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { @@ -884,7 +884,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> RemoteQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { @@ -978,7 +978,7 @@ public void run2() throws CacheException { } }); - final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> RemoteQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Create client region in VM1 @@ -1137,7 +1137,7 @@ public void run2() throws CacheException { } }); - final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> RemoteQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Create client region in VM1 @@ -1248,7 +1248,7 @@ public void run2() throws CacheException { } }); - final int port = vm0.invokeInt(RemoteQueryDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> RemoteQueryDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Create client region in VM1 diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java index 552829992df7..ca90f004d5ea 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java @@ -254,8 +254,7 @@ public void run2() throws CacheException { }); - final int port = vm0.invokeInt(ConcurrentIndexInitOnOverflowRegionDUnitTest.class, - "getCacheServerPort"); + final int port = vm0.invoke(() -> ConcurrentIndexInitOnOverflowRegionDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); // Start changing the value in Region which should turn into a deadlock if diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java index fd50e6392f0d..960bd4e125b3 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java @@ -104,7 +104,7 @@ public void run2() throws CacheException { }); // Create client region - final int port = vm0.invokeInt(PutAllWithIndexPerfDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> PutAllWithIndexPerfDUnitTest.getCacheServerPort()); final String host0 = NetworkUtils.getServerHostName(vm0.getHost()); vm1.invoke(new CacheSerializableRunnable("Create region") { public void run2() throws CacheException { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java index 9c35b1bd2c38..879600dc476d 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java @@ -74,7 +74,7 @@ public void run2() throws CacheException { getCache(); } }); - vm.invoke(Bug34387DUnitTest.class, "getVMDistributedMember"); + vm.invoke(() -> Bug34387DUnitTest.getVMDistributedMember()); } private void doCommitOtherVm(final boolean doDestroy) { VM vm = getOtherVm(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java index b889bc7a80c1..f7e17395ca0f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java @@ -62,8 +62,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(CacheMapTxnDUnitTest.class, "createCache"); - vm1.invoke(CacheMapTxnDUnitTest.class, "createCache"); + vm0.invoke(() -> CacheMapTxnDUnitTest.createCache()); + vm1.invoke(() -> CacheMapTxnDUnitTest.createCache()); } @Override @@ -71,8 +71,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(CacheMapTxnDUnitTest.class, "closeCache"); - vm1.invoke(CacheMapTxnDUnitTest.class, "closeCache"); + vm0.invoke(() -> CacheMapTxnDUnitTest.closeCache()); + vm1.invoke(() -> CacheMapTxnDUnitTest.closeCache()); } public static void createCache(){ @@ -105,14 +105,14 @@ public void testCommitTxn() { //this is to test single VM region transactions Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(CacheMapTxnDUnitTest.class, "commitTxn"); + vm0.invoke(() -> CacheMapTxnDUnitTest.commitTxn()); }//end of testCommitTxn public void testRollbackTxn() { //this is to test single VM region transactions Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(CacheMapTxnDUnitTest.class, "rollbackTxn"); + vm0.invoke(() -> CacheMapTxnDUnitTest.rollbackTxn()); }//end of testRollbackTxn public void testRollbackTxnClear() { @@ -129,7 +129,7 @@ public void testRollbackTxnClear() { vm1.invoke(CacheMapTxnDUnitTest.class, "putMethod", objArr); } - vm0.invoke(CacheMapTxnDUnitTest.class, "rollbackTxnClear"); + vm0.invoke(() -> CacheMapTxnDUnitTest.rollbackTxnClear()); i=3; objArr [0] = ""+i; @@ -144,9 +144,9 @@ public void testMiscMethods() throws Throwable{ Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(CacheMapTxnDUnitTest.class, "miscMethodsOwner"); - AsyncInvocation o2 = vm0.invokeAsync(CacheMapTxnDUnitTest.class, "miscMethodsNotOwner");//invoke in same vm but in seperate thread - AsyncInvocation o3 = vm1.invokeAsync(CacheMapTxnDUnitTest.class, "miscMethodsNotOwner");//invoke in another vm + vm0.invoke(() -> CacheMapTxnDUnitTest.miscMethodsOwner()); + AsyncInvocation o2 = vm0.invokeAsync(() -> CacheMapTxnDUnitTest.miscMethodsNotOwner());//invoke in same vm but in seperate thread + AsyncInvocation o3 = vm1.invokeAsync(() -> CacheMapTxnDUnitTest.miscMethodsNotOwner());//invoke in another vm ThreadUtils.join(o2, 30 * 1000); ThreadUtils.join(o3, 30 * 1000); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java index c0a1fc4af91b..c3f97f70ad1f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java @@ -57,7 +57,7 @@ public void run2() throws CacheException { getCache(); } }); - vm.invoke(CachedAllEventsDUnitTest.class, "getVMDistributedMember"); + vm.invoke(() -> CachedAllEventsDUnitTest.getVMDistributedMember()); } private void doCreateOtherVm() { VM vm = getOtherVm(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java index 49e38c05afc9..f0bae93995c7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java @@ -68,7 +68,7 @@ public void run2() throws CacheException { getCache(); } }); - vm.invoke(CallbackArgDUnitTest.class, "getVMDistributedMember"); + vm.invoke(() -> CallbackArgDUnitTest.getVMDistributedMember()); } private void doCommitOtherVm() { VM vm = getOtherVm(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java index 1d5b621aa554..e748a4209843 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java @@ -67,8 +67,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(ClearMultiVmCallBkDUnitTest.class, "createCache"); - vm1.invoke(ClearMultiVmCallBkDUnitTest.class, "createCache"); + vm0.invoke(() -> ClearMultiVmCallBkDUnitTest.createCache()); + vm1.invoke(() -> ClearMultiVmCallBkDUnitTest.createCache()); LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } @@ -77,8 +77,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(ClearMultiVmCallBkDUnitTest.class, "closeCache"); - vm1.invoke(ClearMultiVmCallBkDUnitTest.class, "closeCache"); + vm0.invoke(() -> ClearMultiVmCallBkDUnitTest.closeCache()); + vm1.invoke(() -> ClearMultiVmCallBkDUnitTest.closeCache()); } public static void createCache(){ @@ -134,13 +134,13 @@ public void testClearSingleVM(){ } LogWriterUtils.getLogWriter().fine("Did all puts successfully"); - vm0.invoke(ClearMultiVmCallBkDUnitTest.class,"clearMethod"); + vm0.invoke(() -> ClearMultiVmCallBkDUnitTest.clearMethod()); LogWriterUtils.getLogWriter().fine("Did clear successfully"); while(afterClear){ } - int Regsize = vm0.invokeInt(ClearMultiVmCallBkDUnitTest.class, "sizeMethod"); + int Regsize = vm0.invoke(() -> ClearMultiVmCallBkDUnitTest.sizeMethod()); assertEquals(1, Regsize); @@ -159,14 +159,14 @@ public void testClearMultiVM(){ vm1.invoke(ClearMultiVmCallBkDUnitTest.class, "getMethod", objArr); } LogWriterUtils.getLogWriter().fine("Did all puts successfully"); - //vm0.invoke(ClearMultiVmCallBkDUnitTest.class,"putMethod"); - vm1.invoke(ClearMultiVmCallBkDUnitTest.class,"clearMethod"); + //vm0.invoke(() -> ClearMultiVmCallBkDUnitTest.putMethod()); + vm1.invoke(() -> ClearMultiVmCallBkDUnitTest.clearMethod()); LogWriterUtils.getLogWriter().fine("Did clear successfully"); while(afterClear){ } - int Regsize = vm0.invokeInt(ClearMultiVmCallBkDUnitTest.class, "sizeMethod"); + int Regsize = vm0.invoke(() -> ClearMultiVmCallBkDUnitTest.sizeMethod()); assertEquals(1, Regsize); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java index 8553fe6b979c..955b24ffdd70 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java @@ -71,8 +71,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(ClearMultiVmDUnitTest.class, "createCache"); - vm1.invoke(ClearMultiVmDUnitTest.class, "createCache"); + vm0.invoke(() -> ClearMultiVmDUnitTest.createCache()); + vm1.invoke(() -> ClearMultiVmDUnitTest.createCache()); } @Override @@ -80,8 +80,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(ClearMultiVmDUnitTest.class, "closeCache"); - vm1.invoke(ClearMultiVmDUnitTest.class, "closeCache"); + vm0.invoke(() -> ClearMultiVmDUnitTest.closeCache()); + vm1.invoke(() -> ClearMultiVmDUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } @@ -212,8 +212,8 @@ public void testClearMultiVM() throws Throwable{ vm1.invoke(ClearMultiVmDUnitTest.class, "getMethod", objArr); } - AsyncInvocation as1 = vm0.invokeAsync(ClearMultiVmDUnitTest.class, "firstVM"); - AsyncInvocation as2 = vm1.invokeAsync(ClearMultiVmDUnitTest.class, "secondVM"); + AsyncInvocation as1 = vm0.invokeAsync(() -> ClearMultiVmDUnitTest.firstVM()); + AsyncInvocation as2 = vm1.invokeAsync(() -> ClearMultiVmDUnitTest.secondVM()); ThreadUtils.join(as1, 30 * 1000); ThreadUtils.join(as2, 30 * 1000); @@ -225,10 +225,10 @@ public void testClearMultiVM() throws Throwable{ Assert.fail("as2 failed", as2.getException()); } - int j = vm0.invokeInt(ClearMultiVmDUnitTest.class, "sizeMethod"); + int j = vm0.invoke(() -> ClearMultiVmDUnitTest.sizeMethod()); assertEquals(0, j); - j = vm1.invokeInt(ClearMultiVmDUnitTest.class, "sizeMethod"); + j = vm1.invoke(() -> ClearMultiVmDUnitTest.sizeMethod()); assertEquals(1, j); @@ -249,7 +249,7 @@ public void testClearExceptions(){ VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm1.invoke(ClearMultiVmDUnitTest.class, "localDestroyRegionMethod"); + vm1.invoke(() -> ClearMultiVmDUnitTest.localDestroyRegionMethod()); vm0.invoke(new CacheSerializableRunnable ("exception in vm0"){ public void run2() throws CacheException { try{ diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java index dbbaaa8474a5..23386a7a2d17 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java @@ -793,15 +793,12 @@ public void run2() throws CacheException { }); // gather details for later creation of ConnectionPool... - ports[0] = vm0.invokeInt(ClientMembershipDUnitTest.class, - "getTestClientMembershipEventsInClient_port"); + ports[0] = vm0.invoke(() -> ClientMembershipDUnitTest.getTestClientMembershipEventsInClient_port()); assertTrue(ports[0] != 0); - DistributedMember serverMember = (DistributedMember) vm0.invoke(ClientMembershipDUnitTest.class, - "getDistributedMember"); + DistributedMember serverMember = (DistributedMember) vm0.invoke(() -> ClientMembershipDUnitTest.getDistributedMember()); - String serverMemberId = (String) vm0.invoke(ClientMembershipDUnitTest.class, - "getMemberId"); + String serverMemberId = (String) vm0.invoke(() -> ClientMembershipDUnitTest.getMemberId()); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] ports[0]=" + ports[0]); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] serverMember=" + serverMember); @@ -1078,10 +1075,8 @@ public void run2() throws CacheException { // create bridge client in vm0... vm0.invoke(createConnectionPool); - String clientMemberId = (String) vm0.invoke(ClientMembershipDUnitTest.class, - "getMemberId"); - DistributedMember clientMember = (DistributedMember) vm0.invoke(ClientMembershipDUnitTest.class, - "getDistributedMember"); + String clientMemberId = (String) vm0.invoke(() -> ClientMembershipDUnitTest.getMemberId()); + DistributedMember clientMember = (DistributedMember) vm0.invoke(() -> ClientMembershipDUnitTest.getDistributedMember()); synchronized(listener) { if (!fired[JOINED] && !fired[LEFT] && !fired[CRASHED]) { @@ -1144,8 +1139,7 @@ public void run() { // reconnect bridge client to test for crashed event vm0.invoke(createConnectionPool); - clientMemberId = (String) vm0.invoke(ClientMembershipDUnitTest.class, - "getMemberId"); + clientMemberId = (String) vm0.invoke(() -> ClientMembershipDUnitTest.getMemberId()); synchronized(listener) { if (!fired[JOINED] && !fired[LEFT] && !fired[CRASHED]) { @@ -1357,8 +1351,7 @@ public void run2() throws CacheException { final VM vm = Host.getHost(0).getVM(i); System.out.println("creating pool in vm_"+i); vm.invoke(createPool); - clientMemberIdArray[i] = String.valueOf(vm.invoke( - ClientMembershipDUnitTest.class, "getMemberId")); + clientMemberIdArray[i] = String.valueOf(vm.invoke(() -> ClientMembershipDUnitTest.getMemberId())); } Collection clientMemberIds = Arrays.asList(clientMemberIdArray); @@ -1436,8 +1429,7 @@ public void run2() throws CacheException { getDistributedMember()); } }); - ports[whichVM] = vm.invokeInt(ClientMembershipDUnitTest.class, - "getTestGetConnectedServers_port"); + ports[whichVM] = vm.invoke(() -> ClientMembershipDUnitTest.getTestGetConnectedServers_port()); assertTrue(ports[whichVM] != 0); } @@ -1543,8 +1535,7 @@ public void run2() throws CacheException { getMemberId()); } }); - ports[whichVM] = vm.invokeInt(ClientMembershipDUnitTest.class, - "getTestGetNotifiedClients_port"); + ports[whichVM] = vm.invoke(() -> ClientMembershipDUnitTest.getTestGetNotifiedClients_port()); assertTrue(ports[whichVM] != 0); } @@ -1587,8 +1578,7 @@ public void run2() throws CacheException { } } }); - clientCounts[whichVM] = vm.invokeInt(ClientMembershipDUnitTest.class, - "getTestGetNotifiedClients_clientCount"); + clientCounts[whichVM] = vm.invoke(() -> ClientMembershipDUnitTest.getTestGetNotifiedClients_clientCount()); } // only one server should have a notifier for this client... diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java index a734a10bac83..f7e22778ab45 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java @@ -86,8 +86,7 @@ public void run2() throws CacheException { LogWriterUtils.getLogWriter().info("[testBug35381] serverMemberId=" + getMemberId()); } }); - ports[whichVM] = vm.invokeInt(ClientRegisterInterestDUnitTest.class, - "getBridgeServerPort"); + ports[whichVM] = vm.invoke(() -> ClientRegisterInterestDUnitTest.getBridgeServerPort()); assertTrue(ports[whichVM] != 0); LogWriterUtils.getLogWriter().info("[testBug35381] create bridge client"); @@ -208,11 +207,9 @@ public void run2() throws CacheException { }); // get the bridge server ports... - ports[firstServerIdx] = firstServerVM.invokeInt( - ClientRegisterInterestDUnitTest.class, "getBridgeServerPort"); + ports[firstServerIdx] = firstServerVM.invoke(() -> ClientRegisterInterestDUnitTest.getBridgeServerPort()); assertTrue(ports[firstServerIdx] != 0); - ports[secondServerIdx] = secondServerVM.invokeInt( - ClientRegisterInterestDUnitTest.class, "getBridgeServerPort"); + ports[secondServerIdx] = secondServerVM.invoke(() -> ClientRegisterInterestDUnitTest.getBridgeServerPort()); assertTrue(ports[secondServerIdx] != 0); assertTrue(ports[firstServerIdx] != ports[secondServerIdx]); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java index 44f7f0692be0..1b3cd9757d14 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java @@ -76,8 +76,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(DistAckMapMethodsDUnitTest.class, "createCache"); - vm1.invoke(DistAckMapMethodsDUnitTest.class, "createCache"); + vm0.invoke(() -> DistAckMapMethodsDUnitTest.createCache()); + vm1.invoke(() -> DistAckMapMethodsDUnitTest.createCache()); } @Override @@ -85,8 +85,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(DistAckMapMethodsDUnitTest.class, "closeCache"); - vm1.invoke(DistAckMapMethodsDUnitTest.class, "closeCache"); + vm0.invoke(() -> DistAckMapMethodsDUnitTest.closeCache()); + vm1.invoke(() -> DistAckMapMethodsDUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } @@ -214,10 +214,10 @@ public void testRemoveMethodDetails(){ VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(DistAckMapMethodsDUnitTest.class, "createRegionToTestRemove"); - vm1.invoke(DistAckMapMethodsDUnitTest.class, "createRegionToTestRemove"); + vm0.invoke(() -> DistAckMapMethodsDUnitTest.createRegionToTestRemove()); + vm1.invoke(() -> DistAckMapMethodsDUnitTest.createRegionToTestRemove()); - vm0.invoke(DistAckMapMethodsDUnitTest.class, "removeMethodDetails"); + vm0.invoke(() -> DistAckMapMethodsDUnitTest.removeMethodDetails()); vm1.invoke(new CacheSerializableRunnable("testRemoveMethodDetails"){ public void run2() throws CacheException { Object ob1 = remRegion.get(new Integer(1)); @@ -244,13 +244,13 @@ public void testIsEmptyMethod(){ //Integer in = new Integer(i); //objArr[0] = (Object) in; vm0.invoke(DistAckMapMethodsDUnitTest.class, "putMethod", objArr); - boolean val = vm1.invokeBoolean(DistAckMapMethodsDUnitTest.class, "isEmptyMethod"); + boolean val = vm1.invoke(() -> DistAckMapMethodsDUnitTest.isEmptyMethod()); if (!val){//val should be true fail("Failed in region.isEmpty"); } vm1.invoke(DistAckMapMethodsDUnitTest.class, "getMethod", objArr); - boolean val1 = vm1.invokeBoolean(DistAckMapMethodsDUnitTest.class, "isEmptyMethod"); + boolean val1 = vm1.invoke(() -> DistAckMapMethodsDUnitTest.isEmptyMethod()); if (val1){ fail("Failed in region.isEmpty"); } @@ -293,22 +293,22 @@ public void testKeySetMethod(){ //Integer in = new Integer(i); //objArr[0] = (Object) in; vm0.invoke(DistAckMapMethodsDUnitTest.class, "putMethod", objArr); - int temp = vm1.invokeInt(DistAckMapMethodsDUnitTest.class, "keySetMethod"); + int temp = vm1.invoke(() -> DistAckMapMethodsDUnitTest.keySetMethod()); if (temp != 0){ fail("failed in keySetMethodtest method"); } vm1.invoke(DistAckMapMethodsDUnitTest.class, "getMethod", objArr);//to make sure that vm1 region has the entry - temp = vm1.invokeInt(DistAckMapMethodsDUnitTest.class, "keySetMethod"); + temp = vm1.invoke(() -> DistAckMapMethodsDUnitTest.keySetMethod()); if (temp == 0){ fail("failed in keySetMethodtest method"); } //in the above scenarion we can test this for mirrorred region scenarion as well temp=0; - vm0.invoke(DistAckMapMethodsDUnitTest.class, "createMirroredRegion"); - vm1.invoke(DistAckMapMethodsDUnitTest.class, "createMirroredRegion"); + vm0.invoke(() -> DistAckMapMethodsDUnitTest.createMirroredRegion()); + vm1.invoke(() -> DistAckMapMethodsDUnitTest.createMirroredRegion()); vm0.invoke(DistAckMapMethodsDUnitTest.class, "putMethod", objArr); - temp = vm1.invokeInt(DistAckMapMethodsDUnitTest.class, "keySetMethod"); + temp = vm1.invoke(() -> DistAckMapMethodsDUnitTest.keySetMethod()); if (temp == 0){ fail("failed in keySetMethodtest method"); } @@ -326,22 +326,22 @@ public void testEntrySetMethod(){ //Integer in = new Integer(i); //objArr[0] = (Object) in; vm0.invoke(DistAckMapMethodsDUnitTest.class, "putMethod", objArr); - int temp = vm1.invokeInt(DistAckMapMethodsDUnitTest.class, "entrySetMethod"); + int temp = vm1.invoke(() -> DistAckMapMethodsDUnitTest.entrySetMethod()); if (temp != 0){ fail("failed in entrySetMethodtest method"); } vm1.invoke(DistAckMapMethodsDUnitTest.class, "getMethod", objArr);//to make sure that vm1 region has the entry - temp = vm1.invokeInt(DistAckMapMethodsDUnitTest.class, "entrySetMethod"); + temp = vm1.invoke(() -> DistAckMapMethodsDUnitTest.entrySetMethod()); if (temp == 0){ fail("failed in entrySetMethodtest method"); } //in the above scenarion we can test this for mirrorred region scenarion as well temp=0; - vm0.invoke(DistAckMapMethodsDUnitTest.class, "createMirroredRegion"); - vm1.invoke(DistAckMapMethodsDUnitTest.class, "createMirroredRegion"); + vm0.invoke(() -> DistAckMapMethodsDUnitTest.createMirroredRegion()); + vm1.invoke(() -> DistAckMapMethodsDUnitTest.createMirroredRegion()); vm0.invoke(DistAckMapMethodsDUnitTest.class, "putOnMirroredRegion", objArr); - temp = vm1.invokeInt(DistAckMapMethodsDUnitTest.class, "entrySetMethod"); + temp = vm1.invoke(() -> DistAckMapMethodsDUnitTest.entrySetMethod()); if (temp == 0){ fail("failed in entrySetMethodtest method"); } @@ -358,13 +358,13 @@ public void testSizeMethod(){ //Integer in = new Integer(i); //objArr[0] = (Object) in; vm0.invoke(DistAckMapMethodsDUnitTest.class, "putMethod", objArr); - j = vm1.invokeInt(DistAckMapMethodsDUnitTest.class, "sizeMethod"); + j = vm1.invoke(() -> DistAckMapMethodsDUnitTest.sizeMethod()); if( j != 0){ fail("failed in region.size method"); } vm1.invoke(DistAckMapMethodsDUnitTest.class, "getMethod", objArr);//to make sure that vm1 region has the entry - j = vm1.invokeInt(DistAckMapMethodsDUnitTest.class, "sizeMethod"); + j = vm1.invoke(() -> DistAckMapMethodsDUnitTest.sizeMethod()); if( j == 0){ fail("failed in region.size method"); } @@ -373,7 +373,7 @@ public void testSizeMethod(){ public void testallMethodsArgs(){ Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(DistAckMapMethodsDUnitTest.class, "allMethodsArgs"); + vm0.invoke(() -> DistAckMapMethodsDUnitTest.allMethodsArgs()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java index a1cc2cdfbfe2..f6836ae49b34 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java @@ -122,18 +122,18 @@ public void testClearWithManyEventsInFlight() throws Exception { createRegionWithAttribute(vm1, name, false); createRegionWithAttribute(vm2, name, false); createRegionWithAttribute(vm3, name, false); - vm0.invoke(DistributedNoAckRegionCCEDUnitTest.class, "addBlockingListener"); - vm1.invoke(DistributedNoAckRegionCCEDUnitTest.class, "addBlockingListener"); - vm2.invoke(DistributedNoAckRegionCCEDUnitTest.class, "addBlockingListener"); - AsyncInvocation vm0Ops = vm0.invokeAsync(DistributedNoAckRegionCCEDUnitTest.class, "doManyOps"); - AsyncInvocation vm1Ops = vm1.invokeAsync(DistributedNoAckRegionCCEDUnitTest.class, "doManyOps"); - AsyncInvocation vm2Ops = vm2.invokeAsync(DistributedNoAckRegionCCEDUnitTest.class, "doManyOps"); + vm0.invoke(() -> DistributedNoAckRegionCCEDUnitTest.addBlockingListener()); + vm1.invoke(() -> DistributedNoAckRegionCCEDUnitTest.addBlockingListener()); + vm2.invoke(() -> DistributedNoAckRegionCCEDUnitTest.addBlockingListener()); + AsyncInvocation vm0Ops = vm0.invokeAsync(() -> DistributedNoAckRegionCCEDUnitTest.doManyOps()); + AsyncInvocation vm1Ops = vm1.invokeAsync(() -> DistributedNoAckRegionCCEDUnitTest.doManyOps()); + AsyncInvocation vm2Ops = vm2.invokeAsync(() -> DistributedNoAckRegionCCEDUnitTest.doManyOps()); // pause to let a bunch of operations build up Wait.pause(5000); - AsyncInvocation a0 = vm3.invokeAsync(DistributedNoAckRegionCCEDUnitTest.class, "clearRegion"); - vm0.invoke(DistributedNoAckRegionCCEDUnitTest.class, "unblockListener"); - vm1.invoke(DistributedNoAckRegionCCEDUnitTest.class, "unblockListener"); - vm2.invoke(DistributedNoAckRegionCCEDUnitTest.class, "unblockListener"); + AsyncInvocation a0 = vm3.invokeAsync(() -> DistributedNoAckRegionCCEDUnitTest.clearRegion()); + vm0.invoke(() -> DistributedNoAckRegionCCEDUnitTest.unblockListener()); + vm1.invoke(() -> DistributedNoAckRegionCCEDUnitTest.unblockListener()); + vm2.invoke(() -> DistributedNoAckRegionCCEDUnitTest.unblockListener()); waitForAsyncProcessing(a0, ""); waitForAsyncProcessing(vm0Ops, ""); waitForAsyncProcessing(vm1Ops, ""); @@ -144,10 +144,10 @@ public void testClearWithManyEventsInFlight() throws Exception { // } Wait.pause(2000);//this test has with noack, thus we should wait before validating entries // check consistency of the regions - Map r0Contents = (Map)vm0.invoke(this.getClass(), "getCCRegionContents"); - Map r1Contents = (Map)vm1.invoke(this.getClass(), "getCCRegionContents"); - Map r2Contents = (Map)vm2.invoke(this.getClass(), "getCCRegionContents"); - Map r3Contents = (Map)vm3.invoke(this.getClass(), "getCCRegionContents"); + Map r0Contents = (Map)vm0.invoke(() -> this.getCCRegionContents()); + Map r1Contents = (Map)vm1.invoke(() -> this.getCCRegionContents()); + Map r2Contents = (Map)vm2.invoke(() -> this.getCCRegionContents()); + Map r3Contents = (Map)vm3.invoke(() -> this.getCCRegionContents()); for (int i=0; i<10; i++) { String key = "cckey" + i; diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java index d3b065cf8430..7a4d09ec6d71 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java @@ -8093,9 +8093,9 @@ public void run() { } // check consistency of the regions - Map r0Contents = (Map)vm0.invoke(this.getClass(), "getCCRegionContents"); - Map r1Contents = (Map)vm1.invoke(this.getClass(), "getCCRegionContents"); - Map r2Contents = (Map)vm2.invoke(this.getClass(), "getCCRegionContents"); + Map r0Contents = (Map)vm0.invoke(() -> this.getCCRegionContents()); + Map r1Contents = (Map)vm1.invoke(() -> this.getCCRegionContents()); + Map r2Contents = (Map)vm2.invoke(() -> this.getCCRegionContents()); for (int i=0; i<10; i++) { String key = "cckey" + i; @@ -8116,7 +8116,7 @@ public void run() { // now we move on to testing deltas if (!getRegionAttributes().getScope().isDistributedNoAck()) { // no-ack doesn't support deltas - vm0.invoke(this.getClass(), "clearCCRegion"); + vm0.invoke(() -> this.clearCCRegion()); performOps = new SerializableRunnable("perform concurrent delta ops") { public void run() { @@ -8147,9 +8147,9 @@ public void run() { } // check consistency of the regions - r0Contents = (Map)vm0.invoke(this.getClass(), "getCCRegionContents"); - r1Contents = (Map)vm1.invoke(this.getClass(), "getCCRegionContents"); - r2Contents = (Map)vm2.invoke(this.getClass(), "getCCRegionContents"); + r0Contents = (Map)vm0.invoke(() -> this.getCCRegionContents()); + r1Contents = (Map)vm1.invoke(() -> this.getCCRegionContents()); + r2Contents = (Map)vm2.invoke(() -> this.getCCRegionContents()); for (int i=0; i<10; i++) { String key = "cckey" + i; @@ -8168,9 +8168,9 @@ public void run() { // The region version vectors should now all be consistent with the version stamps in the entries. - InternalDistributedMember vm0Id = (InternalDistributedMember)vm0.invoke(this.getClass(), "getMemberId"); - InternalDistributedMember vm1Id = (InternalDistributedMember)vm1.invoke(this.getClass(), "getMemberId"); - InternalDistributedMember vm2Id = (InternalDistributedMember)vm2.invoke(this.getClass(), "getMemberId"); + InternalDistributedMember vm0Id = (InternalDistributedMember)vm0.invoke(() -> this.getMemberId()); + InternalDistributedMember vm1Id = (InternalDistributedMember)vm1.invoke(() -> this.getMemberId()); + InternalDistributedMember vm2Id = (InternalDistributedMember)vm2.invoke(() -> this.getMemberId()); long start = System.currentTimeMillis(); RegionVersionVector vm0vv = getVersionVector(vm0); @@ -8181,9 +8181,9 @@ public void run() { RegionVersionVector vm1vv = getVersionVector(vm1); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("vm1 vector = " + vm1vv); RegionVersionVector vm2vv = getVersionVector(vm2); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("vm2 vector = " + vm2vv); - Map vm0Versions = (Map)vm0.invoke(this.getClass(), "getCCRegionVersions"); - Map vm1Versions = (Map)vm1.invoke(this.getClass(), "getCCRegionVersions"); - Map vm2Versions = (Map)vm2.invoke(this.getClass(), "getCCRegionVersions"); + Map vm0Versions = (Map)vm0.invoke(() -> this.getCCRegionVersions()); + Map vm1Versions = (Map)vm1.invoke(() -> this.getCCRegionVersions()); + Map vm2Versions = (Map)vm2.invoke(() -> this.getCCRegionVersions()); for (Map.Entry entry: vm0Versions.entrySet()) { VersionTag tag = entry.getValue(); @@ -8213,7 +8213,7 @@ public void run() { private RegionVersionVector getVersionVector(VM vm) throws Exception { - byte[] serializedForm = (byte[])vm.invoke(this.getClass(), "getCCRegionVersionVector"); + byte[] serializedForm = (byte[])vm.invoke(() -> this.getCCRegionVersionVector()); DataInputStream dis = new DataInputStream(new ByteArrayInputStream(serializedForm)); return (RegionVersionVector)DataSerializer.readObject(dis); } @@ -8299,9 +8299,9 @@ protected void z_versionTestClearWithConcurrentEvents(boolean syncDiskWrite) thr // } // check consistency of the regions - Map r0Contents = (Map)vm0.invoke(this.getClass(), "getCCRegionContents"); - Map r1Contents = (Map)vm1.invoke(this.getClass(), "getCCRegionContents"); - Map r2Contents = (Map)vm2.invoke(this.getClass(), "getCCRegionContents"); + Map r0Contents = (Map)vm0.invoke(() -> this.getCCRegionContents()); + Map r1Contents = (Map)vm1.invoke(() -> this.getCCRegionContents()); + Map r2Contents = (Map)vm2.invoke(() -> this.getCCRegionContents()); for (int i=0; i<10; i++) { String key = "cckey" + i; @@ -8318,9 +8318,9 @@ protected void z_versionTestClearWithConcurrentEvents(boolean syncDiskWrite) thr } } - vm0.invoke(this.getClass(), "assertNoClearTimeouts"); - vm1.invoke(this.getClass(), "assertNoClearTimeouts"); - vm2.invoke(this.getClass(), "assertNoClearTimeouts"); + vm0.invoke(() -> this.assertNoClearTimeouts()); + vm1.invoke(() -> this.assertNoClearTimeouts()); + vm2.invoke(() -> this.assertNoClearTimeouts()); } @@ -8390,10 +8390,10 @@ public void run() { waitForAsyncProcessing(a1, ""); // check consistency of the regions -// Map r0Contents = (Map)vm0.invoke(this.getClass(), "getCCRegionContents"); empty region - Map r1Contents = (Map)vm1.invoke(this.getClass(), "getCCRegionContents"); // normal region - Map r2Contents = (Map)vm2.invoke(this.getClass(), "getCCRegionContents"); // replicated - Map r3Contents = (Map)vm3.invoke(this.getClass(), "getCCRegionContents"); // replicated +// Map r0Contents = (Map)vm0.invoke(() -> this.getCCRegionContents()); empty region + Map r1Contents = (Map)vm1.invoke(() -> this.getCCRegionContents()); // normal region + Map r2Contents = (Map)vm2.invoke(() -> this.getCCRegionContents()); // replicated + Map r3Contents = (Map)vm3.invoke(() -> this.getCCRegionContents()); // replicated for (int i=0; i<10; i++) { String key = "cckey" + i; @@ -8421,9 +8421,9 @@ public void run() { // their region version vector to dominate the vector sent with the clear() operation. // If they did, then some ops were not properly recorded in the vector and something // is broken. - vm1.invoke(this.getClass(), "assertNoClearTimeouts"); - vm2.invoke(this.getClass(), "assertNoClearTimeouts"); - vm3.invoke(this.getClass(), "assertNoClearTimeouts"); + vm1.invoke(() -> this.assertNoClearTimeouts()); + vm2.invoke(() -> this.assertNoClearTimeouts()); + vm3.invoke(() -> this.assertNoClearTimeouts()); } @@ -8725,9 +8725,9 @@ public void run() { } // check consistency of the regions - Map r1Contents = (Map)vm1.invoke(this.getClass(), "getCCRegionContents"); - Map r2Contents = (Map)vm2.invoke(this.getClass(), "getCCRegionContents"); - Map r3Contents = (Map)vm3.invoke(this.getClass(), "getCCRegionContents"); + Map r1Contents = (Map)vm1.invoke(() -> this.getCCRegionContents()); + Map r2Contents = (Map)vm2.invoke(() -> this.getCCRegionContents()); + Map r3Contents = (Map)vm3.invoke(() -> this.getCCRegionContents()); for (int i=0; i<10; i++) { String key = "cckey" + i; @@ -8906,10 +8906,10 @@ public void run() { } // check consistency of the regions - Map r0Contents = (Map)vm0.invoke(this.getClass(), "getCCRegionContents"); - Map r1Contents = (Map)vm1.invoke(this.getClass(), "getCCRegionContents"); - Map r2Contents = (Map)vm2.invoke(this.getClass(), "getCCRegionContents"); - Map r3Contents = (Map)vm3.invoke(this.getClass(), "getCCRegionContents"); + Map r0Contents = (Map)vm0.invoke(() -> this.getCCRegionContents()); + Map r1Contents = (Map)vm1.invoke(() -> this.getCCRegionContents()); + Map r2Contents = (Map)vm2.invoke(() -> this.getCCRegionContents()); + Map r3Contents = (Map)vm3.invoke(() -> this.getCCRegionContents()); for (int i=0; i<10; i++) { String key = "cckey" + i; diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java index 0408eb7c53f9..bc631bd99f65 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java @@ -547,7 +547,7 @@ public void run() { } }); - boolean success = vm0.invokeBoolean(PoisonedKey.class, "poisonFound"); + boolean success = vm0.invoke(() -> PoisonedKey.poisonFound()); assertTrue("Hash mismatch not found", success); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java index 54554ab7b6e3..8d6c14cc57ce 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java @@ -74,7 +74,7 @@ public void run2() throws CacheException { getCache(); } }); - this.otherId = (DistributedMember)vm.invoke(ProxyDUnitTest.class, "getVMDistributedMember"); + this.otherId = (DistributedMember)vm.invoke(() -> ProxyDUnitTest.getVMDistributedMember()); } private void doCreateOtherVm() { VM vm = getOtherVm(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java index caa8333918c2..01a1f42156fe 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java @@ -82,8 +82,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllCallBkRemoteVMDUnitTest.class, "createCacheForVM0"); - vm1.invoke(PutAllCallBkRemoteVMDUnitTest.class, "createCacheForVM1"); + vm0.invoke(() -> PutAllCallBkRemoteVMDUnitTest.createCacheForVM0()); + vm1.invoke(() -> PutAllCallBkRemoteVMDUnitTest.createCacheForVM1()); LogWriterUtils.getLogWriter().info("Cache created successfully"); } @@ -92,8 +92,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllCallBkRemoteVMDUnitTest.class, "closeCache"); - vm1.invoke(PutAllCallBkRemoteVMDUnitTest.class, "closeCache"); + vm0.invoke(() -> PutAllCallBkRemoteVMDUnitTest.closeCache()); + vm1.invoke(() -> PutAllCallBkRemoteVMDUnitTest.closeCache()); } public static synchronized void createCacheForVM0(){ diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java index 8c85ebd43243..12337cdad5a4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java @@ -72,8 +72,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllCallBkSingleVMDUnitTest.class, "createCache"); - vm1.invoke(PutAllCallBkSingleVMDUnitTest.class, "createCache"); + vm0.invoke(() -> PutAllCallBkSingleVMDUnitTest.createCache()); + vm1.invoke(() -> PutAllCallBkSingleVMDUnitTest.createCache()); LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } @@ -82,8 +82,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllCallBkSingleVMDUnitTest.class, "closeCache"); - vm1.invoke(PutAllCallBkSingleVMDUnitTest.class, "closeCache"); + vm0.invoke(() -> PutAllCallBkSingleVMDUnitTest.closeCache()); + vm1.invoke(() -> PutAllCallBkSingleVMDUnitTest.closeCache()); } public static synchronized void createCache(){ @@ -132,7 +132,7 @@ public void testputAllSingleVM(){ } - vm0.invoke(PutAllCallBkSingleVMDUnitTest.class, "putAllMethod"); + vm0.invoke(() -> PutAllCallBkSingleVMDUnitTest.putAllMethod()); vm0.invoke(new CacheSerializableRunnable("temp1"){ public void run2() throws CacheException{ diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java index 5a37ebffc985..4ec80544da95 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java @@ -69,8 +69,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllMultiVmDUnitTest.class, "createCache"); - vm1.invoke(PutAllMultiVmDUnitTest.class, "createCache"); + vm0.invoke(() -> PutAllMultiVmDUnitTest.createCache()); + vm1.invoke(() -> PutAllMultiVmDUnitTest.createCache()); } @Override @@ -78,8 +78,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllMultiVmDUnitTest.class, "closeCache"); - vm1.invoke(PutAllMultiVmDUnitTest.class, "closeCache"); + vm0.invoke(() -> PutAllMultiVmDUnitTest.closeCache()); + vm1.invoke(() -> PutAllMultiVmDUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java index 0d8057477a86..70c7171d285f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java @@ -821,7 +821,7 @@ public boolean done() { if (!roleLossAsync.isAlive()) { return true; } - Object res = vm0.invoke(ReconnectDUnitTest.class, "reconnectTries"); + Object res = vm0.invoke(() -> ReconnectDUnitTest.reconnectTries()); if (((Integer)res).intValue() != 0) { return true; } @@ -884,7 +884,7 @@ public void run2() LogWriterUtils.getLogWriter().info(startupMessage); WaitCriterion ev = new WaitCriterion() { public boolean done() { - return ((Boolean)otherVM.invoke(ReconnectDUnitTest.class, "isInitialRolePlayerStarted")).booleanValue(); + return ((Boolean)otherVM.invoke(() -> ReconnectDUnitTest.isInitialRolePlayerStarted())).booleanValue(); } public String description() { return null; @@ -1100,7 +1100,7 @@ public void run2() throws CacheException LogWriterUtils.getLogWriter().info("STARTED THE REQUIREDROLES CACHE"); initialRolePlayerStarted = true; - while(!((Boolean)otherVM.invoke(ReconnectDUnitTest.class, "isInitialized")).booleanValue()){ + while(!((Boolean)otherVM.invoke(() -> ReconnectDUnitTest.isInitialized())).booleanValue()){ try{ Thread.sleep(15); }catch(InterruptedException ignor){ diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java index d539b82409e4..0572c7686a98 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java @@ -84,7 +84,7 @@ public void run2() throws CacheException { getCache(); } }); - this.otherId = (DistributedMember)vm.invoke(RegionMembershipListenerDUnitTest.class, "getVMDistributedMember"); + this.otherId = (DistributedMember)vm.invoke(() -> RegionMembershipListenerDUnitTest.getVMDistributedMember()); } protected void createRootOtherVm(final String rName) { VM vm = getOtherVm(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java index f45c40388146..cfd1ce8b4f92 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java @@ -67,8 +67,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(RemoveAllMultiVmDUnitTest.class, "createCache"); - vm1.invoke(RemoveAllMultiVmDUnitTest.class, "createCache"); + vm0.invoke(() -> RemoveAllMultiVmDUnitTest.createCache()); + vm1.invoke(() -> RemoveAllMultiVmDUnitTest.createCache()); } @Override @@ -76,8 +76,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(RemoveAllMultiVmDUnitTest.class, "closeCache"); - vm1.invoke(RemoveAllMultiVmDUnitTest.class, "closeCache"); + vm0.invoke(() -> RemoveAllMultiVmDUnitTest.closeCache()); + vm1.invoke(() -> RemoveAllMultiVmDUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java index e7c0ba7010c7..babbf126befa 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java @@ -176,8 +176,7 @@ public void run2() throws CacheException { timing = finish - begin; } }); - Long timing = (Long) Host.getHost(0).getVM(0).invoke( - RolePerformanceDUnitTest.class, "getTiming", new Object[] {}); + Long timing = (Long) Host.getHost(0).getVM(0).invoke(() -> RolePerformanceDUnitTest.getTiming()); return timing.longValue(); } protected static transient long timing = -1; diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java index 01aa2053146e..f26f94a8a42f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java @@ -592,11 +592,11 @@ public void run() { } public static boolean vmRemoteLoaderInvoked(VM vm) { - Boolean v = (Boolean)vm.invoke(SearchAndLoadDUnitTest.class, "fetchRemoteLoaderInvoked"); + Boolean v = (Boolean)vm.invoke(() -> SearchAndLoadDUnitTest.fetchRemoteLoaderInvoked()); return v.booleanValue(); } public static int vmRemoteLoaderInvokedCount(VM vm) { - Integer v = (Integer)vm.invoke(SearchAndLoadDUnitTest.class, "fetchRemoteLoaderInvokedCount"); + Integer v = (Integer)vm.invoke(() -> SearchAndLoadDUnitTest.fetchRemoteLoaderInvokedCount()); return v.intValue(); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java index 7a306f03bbe2..720da566db72 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java @@ -1158,14 +1158,14 @@ public void run() { // Build sets of System Ids and set them up on VM0 for future batch member checks HashSet txMembers = new HashSet(4); txMembers.add(getSystemId()); - txMembers.add(vm0.invoke(TXDistributedDUnitTest.class, "getSystemId")); - vm0.invoke(TXDistributedDUnitTest.class, "setPreTXSystemIds", new Object[] {txMembers}); - txMembers.add(vm2.invoke(TXDistributedDUnitTest.class, "getSystemId")); - vm0.invoke(TXDistributedDUnitTest.class, "setPostTXSystemIds", new Object[] {txMembers}); + txMembers.add(vm0.invoke(() -> TXDistributedDUnitTest.getSystemId())); + vm0.invoke(() -> TXDistributedDUnitTest.setPreTXSystemIds(txMembers)); + txMembers.add(vm2.invoke(() -> TXDistributedDUnitTest.getSystemId())); + vm0.invoke(() -> TXDistributedDUnitTest.setPostTXSystemIds(txMembers)); // Don't include the tx host in the batch member set(s) - Serializable vm1HostId = (Serializable) vm1.invoke(TXDistributedDUnitTest.class, "getSystemId"); - vm0.invoke(TXDistributedDUnitTest.class, "setTXHostSystemId", new Object[] {vm1HostId}); + Serializable vm1HostId = (Serializable) vm1.invoke(() -> TXDistributedDUnitTest.getSystemId()); + vm0.invoke(() -> TXDistributedDUnitTest.setTXHostSystemId(vm1HostId)); // Create a TX on VM1 (such that it will ask for locks on VM0) that uses the callbacks // to pause and give us time to start a GII process on another VM diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java index a253f09f1a64..b1d7bab34a9f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java @@ -84,7 +84,7 @@ public void run2() throws CacheException { getCache(); } }); - this.otherId = (DistributedMember)vm.invoke(TXOrderDUnitTest.class, "getVMDistributedMember"); + this.otherId = (DistributedMember)vm.invoke(() -> TXOrderDUnitTest.getVMDistributedMember()); } private void doCommitOtherVm() { VM vm = getOtherVm(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java index 545a0eab1ef1..e88f6dddf21f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java @@ -557,7 +557,7 @@ public void run() { locvm.invoke(crashLocator); assertTrue("Distributed system should not have disconnected", - vm1.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + vm1.invoke(() -> LocatorDUnitTest.isSystemConnected())); // ensure quorumLost is properly invoked DistributionManager dm = (DistributionManager)((InternalDistributedSystem)sys).getDistributionManager(); @@ -696,10 +696,10 @@ public void run() { isSystemConnected()); assertTrue("Distributed system should not have disconnected", - vm2.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + vm2.invoke(() -> LocatorDUnitTest.isSystemConnected())); assertTrue("Distributed system should not have disconnected", - locvm.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + locvm.invoke(() -> LocatorDUnitTest.isSystemConnected())); // stop the locator normally. This should also be okay locator.stop(); @@ -711,15 +711,15 @@ public void run() { assertTrue("locator is not stopped", Locator.getLocators().isEmpty()); assertTrue("Distributed system should not have disconnected", - vm2.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + vm2.invoke(() -> LocatorDUnitTest.isSystemConnected())); assertTrue("Distributed system should not have disconnected", - locvm.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + locvm.invoke(() -> LocatorDUnitTest.isSystemConnected())); // the remaining non-locator member should now be the lead member assertEquals("This test sometimes fails. If the log contains " + "'failed to collect all ACKs' it is a false failure.", - mem2, vm2.invoke(LocatorDUnitTest.class, "getLeadMember", new Object[]{})); + mem2, vm2.invoke(() -> LocatorDUnitTest.getLeadMember())); SerializableRunnable disconnect = new SerializableRunnable("Disconnect from " + locators) { @@ -847,10 +847,10 @@ public void run() { isSystemConnected()); assertTrue("Distributed system should not have disconnected", - vm2.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + vm2.invoke(() -> LocatorDUnitTest.isSystemConnected())); assertTrue("Distributed system should not have disconnected", - locvm.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + locvm.invoke(() -> LocatorDUnitTest.isSystemConnected())); vm2.invokeAsync(crashSystem); @@ -984,8 +984,7 @@ public void run() { DistributedMember mem2 = (DistributedMember)vm2.invoke(this.getClass(), "getDistributedMember", connectArgs); - DistributedMember loc1Mbr = (DistributedMember)locvm.invoke(this.getClass(), - "getLocatorDistributedMember", new Object[]{}); + DistributedMember loc1Mbr = (DistributedMember)locvm.invoke(() -> this.getLocatorDistributedMember()); assertLeadMember(mem1, sys, 5000); @@ -999,10 +998,10 @@ public void run() { sys.isConnected()); assertTrue("Distributed system should not have disconnected", - vm1.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + vm1.invoke(() -> LocatorDUnitTest.isSystemConnected())); assertTrue("Distributed system should not have disconnected", - vm2.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + vm2.invoke(() -> LocatorDUnitTest.isSystemConnected())); // disconnect the first vm and demonstrate that the non-lead vm and the // locator notice the failure and continue to run @@ -1010,7 +1009,7 @@ public void run() { Wait.pause(10 * 1000); assertTrue("Distributed system should not have disconnected", - vm2.invokeBoolean(LocatorDUnitTest.class, "isSystemConnected")); + vm2.invoke(() -> LocatorDUnitTest.isSystemConnected())); assertEquals(sys.getDistributedMember(), MembershipManagerHelper.getCoordinator(sys)); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalJUnitTest.java index bf848ff7796f..ee8e2208cd4b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalJUnitTest.java @@ -270,7 +270,7 @@ public void testStartUsingForceOverwritesExistingPidFile() throws Throwable { // create existing pid file this.pidFile = new File(ProcessType.LOCATOR.getPidFileName()); - final int realPid = Host.getHost(0).getVM(3).invokeInt(ProcessUtils.class, "identifyPid"); + final int realPid = Host.getHost(0).getVM(3).invoke(() -> ProcessUtils.identifyPid()); assertFalse(realPid == ProcessUtils.identifyPid()); writePid(this.pidFile, realPid); @@ -415,7 +415,7 @@ public void testStartWithDefaultPortInUseFails() throws Throwable { public void testStartWithExistingPidFileFails() throws Throwable { }/* // create existing pid file - final int realPid = Host.getHost(0).getVM(3).invokeInt(ProcessUtils.class, "identifyPid"); + final int realPid = Host.getHost(0).getVM(3).invoke(() -> ProcessUtils.identifyPid()); assertFalse("Remote pid shouldn't be the same as local pid " + realPid, realPid == ProcessUtils.identifyPid()); this.pidFile = new File(ProcessType.LOCATOR.getPidFileName()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java index ac091f66599b..2b57ca4214a8 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java @@ -537,7 +537,7 @@ public void testStartWithExistingPidFileFails() throws Throwable { // create existing pid file this.pidFile = new File(this.temporaryFolder.getRoot(), ProcessType.LOCATOR.getPidFileName()); - final int realPid = Host.getHost(0).getVM(3).invokeInt(ProcessUtils.class, "identifyPid"); + final int realPid = Host.getHost(0).getVM(3).invoke(() -> ProcessUtils.identifyPid()); assertFalse("Remote pid shouldn't be the same as local pid " + realPid, realPid == ProcessUtils.identifyPid()); writePid(this.pidFile, realPid); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java index a7208fa43919..a472d6a7e544 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java @@ -406,7 +406,7 @@ public void testStartUsingForceOverwritesExistingPidFile() throws Throwable { // create existing pid file this.pidFile = new File(ProcessType.SERVER.getPidFileName()); - final int realPid = Host.getHost(0).getVM(3).invokeInt(ProcessUtils.class, "identifyPid"); + final int realPid = Host.getHost(0).getVM(3).invoke(() -> ProcessUtils.identifyPid()); assertFalse(realPid == ProcessUtils.identifyPid()); writePid(this.pidFile, realPid); @@ -686,7 +686,7 @@ public void testStartWithDefaultPortInUseFails() throws Throwable { public void testStartWithExistingPidFileFails() throws Throwable { }/* // create existing pid file - final int realPid = Host.getHost(0).getVM(3).invokeInt(ProcessUtils.class, "identifyPid"); + final int realPid = Host.getHost(0).getVM(3).invoke(() -> ProcessUtils.identifyPid()); assertFalse("Remote pid shouldn't be the same as local pid " + realPid, realPid == ProcessUtils.identifyPid()); this.pidFile = new File(ProcessType.SERVER.getPidFileName()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java index cbcfb772b186..21dd654633af 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java @@ -914,7 +914,7 @@ public void testStartWithExistingPidFileFails() throws Throwable { // create existing pid file this.pidFile = new File(this.temporaryFolder.getRoot(), ProcessType.SERVER.getPidFileName()); - final int realPid = Host.getHost(0).getVM(3).invokeInt(ProcessUtils.class, "identifyPid"); + final int realPid = Host.getHost(0).getVM(3).invoke(() -> ProcessUtils.identifyPid()); assertFalse("Remote pid shouldn't be the same as local pid " + realPid, realPid == ProcessUtils.identifyPid()); writePid(this.pidFile, realPid); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java index 166d5ac0d053..e9f853962aad 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java @@ -373,7 +373,7 @@ protected void remoteCreateEntry(String regionName, } // private long getConId(VM vm) { -// return vm.invokeLong(this.getClass(), "remoteGetConId"); +// return vm.invoke(() -> this.remoteGetConId()); // } /** * Accessed via reflection. DO NOT REMOVE @@ -384,8 +384,7 @@ protected static long remoteGetConId() { } private boolean acquireDistLock(VM vm, String lockName) { - return vm.invokeBoolean(this.getClass(), "remoteAcquireDistLock", - new Object[]{lockName}); + return vm.invoke(() -> this.remoteAcquireDistLock(lockName)); } /** @@ -425,7 +424,7 @@ private VM findVMForAdminObject(GemFireVM adminObj) { } private InternalDistributedMember getJavaGroupsIdForVM(VM vm) { - return (InternalDistributedMember)vm.invoke(this.getClass(), "remoteGetJavaGroupsIdForVM"); + return (InternalDistributedMember)vm.invoke(() -> this.remoteGetJavaGroupsIdForVM()); } /** diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java index 374136dbefe5..c0e826847887 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java @@ -37,14 +37,14 @@ public void setUp() throws Exception { VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(CacheMapDistTXDUnitTest.class, "setDistributedTX"); - vm1.invoke(CacheMapDistTXDUnitTest.class, "setDistributedTX"); + vm0.invoke(() -> CacheMapDistTXDUnitTest.setDistributedTX()); + vm1.invoke(() -> CacheMapDistTXDUnitTest.setDistributedTX()); super.setUp(); // creates cache // make sure that "distributed-transactions" is true - vm0.invoke(CacheMapDistTXDUnitTest.class, "checkIsDistributedTX"); - vm1.invoke(CacheMapDistTXDUnitTest.class, "checkIsDistributedTX"); + vm0.invoke(() -> CacheMapDistTXDUnitTest.checkIsDistributedTX()); + vm1.invoke(() -> CacheMapDistTXDUnitTest.checkIsDistributedTX()); } public static void setDistributedTX() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java index db36aacb2aa1..dcb9ae7f2711 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java @@ -84,10 +84,10 @@ public static void createCacheInVm() { } protected void createCacheInAllVms() { - dataStore1.invoke(DistTXDebugDUnitTest.class, "createCacheInVm"); - dataStore2.invoke(DistTXDebugDUnitTest.class, "createCacheInVm"); - dataStore3.invoke(DistTXDebugDUnitTest.class, "createCacheInVm"); - accessor.invoke(DistTXDebugDUnitTest.class, "createCacheInVm"); + dataStore1.invoke(() -> DistTXDebugDUnitTest.createCacheInVm()); + dataStore2.invoke(() -> DistTXDebugDUnitTest.createCacheInVm()); + dataStore3.invoke(() -> DistTXDebugDUnitTest.createCacheInVm()); + accessor.invoke(() -> DistTXDebugDUnitTest.createCacheInVm()); } public static void createPR(String partitionedRegionName, Integer redundancy, @@ -280,8 +280,7 @@ public Object call() throws CacheException { accessor.invoke(TxOps); - accessor.invoke(DistTXDebugDUnitTest.class, "destroyPR", - new Object[] { "pregion1" }); + accessor.invoke(() -> DistTXDebugDUnitTest.destroyPR( "pregion1" )); } public void testTXDestroy_invalidate() throws Exception { @@ -365,8 +364,7 @@ public Object call() throws CacheException { dataStore2.invoke(verifySize); dataStore3.invoke(verifySize); - accessor.invoke(DistTXDebugDUnitTest.class, "destroyPR", - new Object[] { "pregion1" }); + accessor.invoke(() -> DistTXDebugDUnitTest.destroyPR( "pregion1" )); } public void testTXPR_RR() throws Exception { @@ -448,8 +446,7 @@ public Object call() throws CacheException { dataStore2.invoke(verifySize); dataStore3.invoke(verifySize); - accessor.invoke(DistTXDebugDUnitTest.class, "destroyPR", - new Object[] { "pregion1" }); + accessor.invoke(() -> DistTXDebugDUnitTest.destroyPR( "pregion1" )); } public void testTXPR2() throws Exception { @@ -546,8 +543,7 @@ public Object call() throws CacheException { accessor.invoke(TxRollbackOps); - accessor.invoke(DistTXDebugDUnitTest.class, "destroyPR", - new Object[] { "pregion1" }); + accessor.invoke(() -> DistTXDebugDUnitTest.destroyPR( "pregion1" )); } public void testTXPRRR2_create() throws Exception { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java index 2eaef9c27e2b..873baa7816aa 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java @@ -1794,7 +1794,7 @@ public Object call() throws Exception { return null; } } - server1.invokeAsync(Ops.class, "call"); + server1.invokeAsync(() -> Ops.call()); // Now create cache on the third server and let it join the distributed system. createPR(new VM[]{server3}); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java index d6ff35cefaf4..df09027641f3 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java @@ -66,8 +66,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(Bug33359DUnitTest.class, "createCacheVM0"); - vm1.invoke(Bug33359DUnitTest.class, "createCacheVM1"); + vm0.invoke(() -> Bug33359DUnitTest.createCacheVM0()); + vm1.invoke(() -> Bug33359DUnitTest.createCacheVM1()); LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } @@ -76,8 +76,8 @@ protected final void preTearDown(){ Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(Bug33359DUnitTest.class, "closeCache"); - vm1.invoke(Bug33359DUnitTest.class, "closeCache"); + vm0.invoke(() -> Bug33359DUnitTest.closeCache()); + vm1.invoke(() -> Bug33359DUnitTest.closeCache()); } public static void createCacheVM0(){ diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java index 5e7903e1e3de..e41d07208165 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java @@ -49,8 +49,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(Bug33726DUnitTest.class, "closeCache"); - vm1.invoke(Bug33726DUnitTest.class, "closeCache"); + vm0.invoke(() -> Bug33726DUnitTest.closeCache()); + vm1.invoke(() -> Bug33726DUnitTest.closeCache()); } public static void closeCache(){ @@ -67,9 +67,9 @@ public void testAfterRegionCreate() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(Bug33726DUnitTest.class, "createCacheAndPopulateRegion1"); - vm1.invoke(Bug33726DUnitTest.class, "createCacheAndRegion2"); - boolean pass = vm1.invokeBoolean(Bug33726DUnitTest.class, "testFlag"); + vm0.invoke(() -> Bug33726DUnitTest.createCacheAndPopulateRegion1()); + vm1.invoke(() -> Bug33726DUnitTest.createCacheAndRegion2()); + boolean pass = vm1.invoke(() -> Bug33726DUnitTest.testFlag()); assertTrue("The test failed", pass); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java index 3726ae828275..788be047d75f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java @@ -75,30 +75,28 @@ public void setUp() throws Exception */ public void testBug37241ForNewDiskRegion() { - server1.invoke(Bug37241DUnitTest.class, "createRegionOnServer1"); + server1.invoke(() -> Bug37241DUnitTest.createRegionOnServer1()); try{ - server2.invoke(Bug37241DUnitTest.class, "createRegionOnServer2", - new Object[]{Scope.DISTRIBUTED_ACK}); + server2.invoke(() -> Bug37241DUnitTest.createRegionOnServer2(Scope.DISTRIBUTED_ACK)); } catch(Exception e){ - server2.invoke(Bug37241DUnitTest.class, "ignoreExceptionInLogs"); - server2.invoke(Bug37241DUnitTest.class, "checkForCleanup"); + server2.invoke(() -> Bug37241DUnitTest.ignoreExceptionInLogs()); + server2.invoke(() -> Bug37241DUnitTest.checkForCleanup()); } } public void testBug37241ForRecreatedDiskRegion() { - server1.invoke(Bug37241DUnitTest.class, "createRegionOnServer1"); - server2.invoke(Bug37241DUnitTest.class, "createRegionOnServer2", new Object[]{Scope.GLOBAL}); - server2.invoke(Bug37241DUnitTest.class, "closeRegion"); + server1.invoke(() -> Bug37241DUnitTest.createRegionOnServer1()); + server2.invoke(() -> Bug37241DUnitTest.createRegionOnServer2(Scope.GLOBAL)); + server2.invoke(() -> Bug37241DUnitTest.closeRegion()); try { - server2.invoke(Bug37241DUnitTest.class, "createRegionOnServer2", - new Object[] {Scope.DISTRIBUTED_ACK }); + server2.invoke(() -> Bug37241DUnitTest.createRegionOnServer2(Scope.DISTRIBUTED_ACK )); } catch (Exception e) { - server2.invoke(Bug37241DUnitTest.class, "ignoreExceptionInLogs"); - server2.invoke(Bug37241DUnitTest.class, "checkForCleanupAfterRecreation"); + server2.invoke(() -> Bug37241DUnitTest.ignoreExceptionInLogs()); + server2.invoke(() -> Bug37241DUnitTest.checkForCleanupAfterRecreation()); } } @@ -225,8 +223,8 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { - server1.invoke(Bug37241DUnitTest.class, "closeCache"); - server2.invoke(Bug37241DUnitTest.class, "closeCache"); + server1.invoke(() -> Bug37241DUnitTest.closeCache()); + server2.invoke(() -> Bug37241DUnitTest.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java index 532b806786f1..61015205f54a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java @@ -100,8 +100,8 @@ public void setUp() throws Exception { vm0 = host.getVM(0); vm1 = host.getVM(1); - vm0.invoke(Bug39079DUnitTest.class, "ignorePreAllocate", new Object[] { Boolean.TRUE }); - vm1.invoke(Bug39079DUnitTest.class, "ignorePreAllocate", new Object[] { Boolean.TRUE }); + vm0.invoke(() -> Bug39079DUnitTest.ignorePreAllocate( Boolean.TRUE )); + vm1.invoke(() -> Bug39079DUnitTest.ignorePreAllocate( Boolean.TRUE )); } @@ -182,8 +182,8 @@ public void run2() { protected final void postTearDownCacheTestCase() throws Exception { disconnectAllFromDS(); - vm0.invoke(Bug39079DUnitTest.class, "ignorePreAllocate", new Object[] { Boolean.FALSE }); - vm1.invoke(Bug39079DUnitTest.class, "ignorePreAllocate", new Object[] { Boolean.FALSE }); + vm0.invoke(() -> Bug39079DUnitTest.ignorePreAllocate( Boolean.FALSE )); + vm1.invoke(() -> Bug39079DUnitTest.ignorePreAllocate( Boolean.FALSE )); } static void ignorePreAllocate(boolean flag) throws Exception { @@ -303,18 +303,17 @@ public static RegionEntryFactory getEntryFactory() { public void testBridgeServerStoppingInSynchPersistOnlyForIOExceptionCase() throws Exception { // create server cache - Integer port = (Integer)vm0.invoke(Bug39079DUnitTest.class, "createServerCache"); + Integer port = (Integer)vm0.invoke(() -> Bug39079DUnitTest.createServerCache()); //create cache client - vm1.invoke(Bug39079DUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(vm0.getHost()), port}); + vm1.invoke(() -> Bug39079DUnitTest.createClientCache( NetworkUtils.getServerHostName(vm0.getHost()), port)); // validate - vm0.invoke(Bug39079DUnitTest.class, "validateRuningBridgeServerList"); + vm0.invoke(() -> Bug39079DUnitTest.validateRuningBridgeServerList()); // close server cache - vm0.invoke(Bug39079DUnitTest.class, "closeCache"); + vm0.invoke(() -> Bug39079DUnitTest.closeCache()); // close client cache - vm1.invoke(Bug39079DUnitTest.class, "closeCache"); + vm1.invoke(() -> Bug39079DUnitTest.closeCache()); } public static Integer createServerCache() throws Exception diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java index 58179f2f5d21..cbd503f15536 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java @@ -133,7 +133,7 @@ public void run() { public void beforeProcessMessage(DistributionManager dm, DistributionMessage message) { if(message instanceof ManageBucketMessage) { - vm0.invoke(DistributedTestCase.class, "disconnectFromDS"); + vm0.invoke(() -> DistributedTestCase.disconnectFromDS()); } } }); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java index dabc277ba7bd..4c79202aa262 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java @@ -71,8 +71,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0ID = (DistributedMember)vm0.invoke(ClearDAckDUnitTest.class, "createCacheVM0"); - vm1ID = (DistributedMember)vm1.invoke(ClearDAckDUnitTest.class, "createCacheVM1"); + vm0ID = (DistributedMember)vm0.invoke(() -> ClearDAckDUnitTest.createCacheVM0()); + vm1ID = (DistributedMember)vm1.invoke(() -> ClearDAckDUnitTest.createCacheVM1()); LogWriterUtils.getLogWriter().info("Cache created in successfully"); } @@ -82,10 +82,10 @@ protected final void preTearDown() throws Exception { VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); VM vm2 = host.getVM(2); - vm0.invoke(ClearDAckDUnitTest.class, "closeCache"); - vm1.invoke(ClearDAckDUnitTest.class, "resetClearCallBack"); - vm1.invoke(ClearDAckDUnitTest.class, "closeCache"); - vm2.invoke(ClearDAckDUnitTest.class, "closeCache"); + vm0.invoke(() -> ClearDAckDUnitTest.closeCache()); + vm1.invoke(() -> ClearDAckDUnitTest.resetClearCallBack()); + vm1.invoke(() -> ClearDAckDUnitTest.closeCache()); + vm2.invoke(() -> ClearDAckDUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } @@ -212,23 +212,23 @@ public void testClearMultiVM(){ } LogWriterUtils.getLogWriter().info("Did all puts successfully"); - long regionVersion = (Long)vm1.invoke(ClearDAckDUnitTest.class, "getRegionVersion", new Object[]{vm0ID}); + long regionVersion = (Long)vm1.invoke(() -> ClearDAckDUnitTest.getRegionVersion(vm0ID)); - vm0.invoke(ClearDAckDUnitTest.class,"clearMethod"); + vm0.invoke(() -> ClearDAckDUnitTest.clearMethod()); - boolean flag = vm1.invokeBoolean(ClearDAckDUnitTest.class,"getVM1Flag"); + boolean flag = vm1.invoke(() -> ClearDAckDUnitTest.getVM1Flag()); LogWriterUtils.getLogWriter().fine("Flag in VM1="+ flag); assertTrue(flag); - long newRegionVersion = (Long)vm1.invoke(ClearDAckDUnitTest.class, "getRegionVersion", new Object[]{vm0ID}); + long newRegionVersion = (Long)vm1.invoke(() -> ClearDAckDUnitTest.getRegionVersion(vm0ID)); assertEquals("expected clear() to increment region version by 1 for " + vm0ID, regionVersion+1, newRegionVersion); // test that localClear does not distribute VM vm2 = host.getVM(2); - vm2.invoke(ClearDAckDUnitTest.class, "createCacheVM2AndLocalClear"); + vm2.invoke(() -> ClearDAckDUnitTest.createCacheVM2AndLocalClear()); - flag = vm1.invokeBoolean(ClearDAckDUnitTest.class,"getVM1Flag"); + flag = vm1.invoke(() -> ClearDAckDUnitTest.getVM1Flag()); LogWriterUtils.getLogWriter().fine("Flag in VM1="+ flag); assertFalse(flag); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java index 54df82228aa5..0c947954c661 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java @@ -80,14 +80,14 @@ public void setUp()throws Exception { super.setUp(); Host host = Host.getHost(0); server1 = host.getVM(0); - server1.invoke(ClearGlobalDUnitTest.class, "createCacheServer1"); + server1.invoke(() -> ClearGlobalDUnitTest.createCacheServer1()); createCacheServer2(); LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } @Override protected final void preTearDown() throws Exception { - server1.invoke(ClearGlobalDUnitTest.class, "closeCache"); + server1.invoke(() -> ClearGlobalDUnitTest.closeCache()); resetClearCallBack(); closeCache(); } @@ -113,7 +113,7 @@ public void testClearGlobalMultiVM() throws Exception objArr[0] = "" + i; server1.invoke(ClearGlobalDUnitTest.class, "putMethod", objArr); } - server1.invoke(ClearGlobalDUnitTest.class,"clearMethod"); + server1.invoke(() -> ClearGlobalDUnitTest.clearMethod()); checkTestResults(); }// end of test case diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java index 9a501463b8b1..7ef1a0deb8c3 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java @@ -158,33 +158,32 @@ public void setUp() throws Exception { VM2 = host.getVM(2); VM3 = host.getVM(3); - VM0.invoke(DeltaPropagationDUnitTest.class, "resetAll"); - VM1.invoke(DeltaPropagationDUnitTest.class, "resetAll"); - VM2.invoke(DeltaPropagationDUnitTest.class, "resetAll"); - VM3.invoke(DeltaPropagationDUnitTest.class, "resetAll"); + VM0.invoke(() -> DeltaPropagationDUnitTest.resetAll()); + VM1.invoke(() -> DeltaPropagationDUnitTest.resetAll()); + VM2.invoke(() -> DeltaPropagationDUnitTest.resetAll()); + VM3.invoke(() -> DeltaPropagationDUnitTest.resetAll()); DeltaPropagationDUnitTest.resetAll(); } @Override protected final void preTearDown() throws Exception { DeltaPropagationDUnitTest.closeCache(); - VM2.invoke(DeltaPropagationDUnitTest.class, "closeCache"); - VM3.invoke(DeltaPropagationDUnitTest.class, "closeCache"); + VM2.invoke(() -> DeltaPropagationDUnitTest.closeCache()); + VM3.invoke(() -> DeltaPropagationDUnitTest.closeCache()); // Unset the isSlowStartForTesting flag - VM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - VM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + VM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + VM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); // then close the servers - VM0.invoke(DeltaPropagationDUnitTest.class, "closeCache"); - VM1.invoke(DeltaPropagationDUnitTest.class, "closeCache"); + VM0.invoke(() -> DeltaPropagationDUnitTest.closeCache()); + VM1.invoke(() -> DeltaPropagationDUnitTest.closeCache()); disconnectAllFromDS(); } public void testS2CSuccessfulDeltaPropagationWithCompression() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", new Object[] { + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_NONE, new Integer(1), - new Integer(NO_LISTENER), Boolean.FALSE, compressor })).intValue(); + new Integer(NO_LISTENER), Boolean.FALSE, compressor ))).intValue(); VM0.invoke(new SerializableRunnable() { public void run() { assertTrue(cache.getRegion(regionName).getAttributes().getCompressor() != null); } @@ -195,14 +194,14 @@ HARegionQueue.HA_EVICTION_POLICY_NONE, new Integer(1), registerInterestListAll(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "createAndUpdateDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.createAndUpdateDeltas()); waitForLastKey(); - long toDeltas = ((Long)VM0.invoke(DeltaTestImpl.class, "getToDeltaInvokations")); + long toDeltas = ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaInvokations())); long fromDeltas = DeltaTestImpl.getFromDeltaInvokations(); assertTrue((EVENTS_SIZE - 1) + " deltas were to be sent but were " + toDeltas, toDeltas == (EVENTS_SIZE - 1)); @@ -214,22 +213,20 @@ HARegionQueue.HA_EVICTION_POLICY_NONE, new Integer(1), } public void testS2CSuccessfulDeltaPropagation() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); createClientCache(new Integer(PORT1), new Integer(-1), "0", new Integer( CLIENT_LISTENER)); registerInterestListAll(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "createAndUpdateDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.createAndUpdateDeltas()); waitForLastKey(); - long toDeltas = ((Long)VM0.invoke(DeltaTestImpl.class, "getToDeltaInvokations")); + long toDeltas = ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaInvokations())); long fromDeltas = DeltaTestImpl.getFromDeltaInvokations(); assertTrue((EVENTS_SIZE - 1) + " deltas were to be sent but were " + toDeltas, toDeltas == (EVENTS_SIZE - 1)); @@ -241,25 +238,22 @@ public void testS2CSuccessfulDeltaPropagation() throws Exception { } public void testS2CFailureInToDeltaMethod() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); createClientCache(new Integer(PORT1), new Integer(-1), "0", new Integer( CLIENT_LISTENER_2)); registerInterestListAll(); - VM0.invoke(DeltaPropagationDUnitTest.class, - "prepareErroneousDeltasForToDelta"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareErroneousDeltasForToDelta()); prepareErroneousDeltasForToDelta(); - VM0.invoke(DeltaPropagationDUnitTest.class, "createAndUpdateDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.createAndUpdateDeltas()); waitForLastKey(); - long toDeltas = ((Long)VM0.invoke(DeltaTestImpl.class, "getToDeltaInvokations")); + long toDeltas = ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaInvokations())); long fromDeltas = DeltaTestImpl.getFromDeltaInvokations(); - long toDeltafailures = ((Long)VM0.invoke(DeltaTestImpl.class, "getToDeltaFailures")); + long toDeltafailures = ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaFailures())); assertTrue((EVENTS_SIZE - 1) + " deltas were to be sent but were " + toDeltas, toDeltas == (EVENTS_SIZE - 1)); assertTrue( @@ -278,23 +272,20 @@ public void testS2CFailureInToDeltaMethod() throws Exception { } public void testS2CFailureInFromDeltaMethod() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); createClientCache(new Integer(PORT1), new Integer(-1), "0", new Integer( CLIENT_LISTENER)); registerInterestListAll(); - VM0.invoke(DeltaPropagationDUnitTest.class, - "prepareErroneousDeltasForFromDelta"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareErroneousDeltasForFromDelta()); prepareErroneousDeltasForFromDelta(); - VM0.invoke(DeltaPropagationDUnitTest.class, "createAndUpdateDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.createAndUpdateDeltas()); waitForLastKey(); - long toDeltas = ((Long)VM0.invoke(DeltaTestImpl.class, "getToDeltaInvokations")); + long toDeltas = ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaInvokations())); long fromDeltas = DeltaTestImpl.getFromDeltaInvokations(); long fromDeltafailures = DeltaTestImpl.getFromDeltaFailures(); assertTrue((EVENTS_SIZE - 1) + " deltas were to be sent but were " @@ -309,9 +300,7 @@ public void testS2CFailureInFromDeltaMethod() throws Exception { } public void testS2CWithOldValueAtClientOverflownToDisk() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); EvictionAttributes evAttr = EvictionAttributes.createLRUEntryAttributes(1, EvictionAction.OVERFLOW_TO_DISK); @@ -320,20 +309,19 @@ public void testS2CWithOldValueAtClientOverflownToDisk() throws Exception { Boolean.TRUE/* add listener */, evAttr); registerInterestListAll(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "createDelta"); - VM0.invoke(DeltaPropagationDUnitTest.class, "createAnEntry"); + VM0.invoke(() -> DeltaPropagationDUnitTest.createDelta()); + VM0.invoke(() -> DeltaPropagationDUnitTest.createAnEntry()); Thread.sleep(5000); // TODO: Find a better 'n reliable alternative // assert overflow occured on client vm verifyOverflowOccured(1L, 2); - VM0.invoke(DeltaPropagationDUnitTest.class, "updateDelta"); + VM0.invoke(() -> DeltaPropagationDUnitTest.updateDelta()); waitForLastKey(); - long toDeltas = ((Long)VM0.invoke(DeltaTestImpl.class, - "getToDeltaInvokations")).longValue(); + long toDeltas = ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaInvokations())).longValue(); long fromDeltas = DeltaTestImpl.getFromDeltaInvokations().longValue(); assertTrue((EVENTS_SIZE - 1) + " deltas were to be sent but were " @@ -346,9 +334,7 @@ public void testS2CWithOldValueAtClientOverflownToDisk() throws Exception { } public void testS2CWithLocallyDestroyedOldValueAtClient() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); EvictionAttributes evAttr = EvictionAttributes.createLRUEntryAttributes(1, EvictionAction.LOCAL_DESTROY); @@ -357,20 +343,19 @@ public void testS2CWithLocallyDestroyedOldValueAtClient() throws Exception { Boolean.TRUE/* add listener */, evAttr); registerInterestListAll(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "createDelta"); - VM0.invoke(DeltaPropagationDUnitTest.class, "createAnEntry"); + VM0.invoke(() -> DeltaPropagationDUnitTest.createDelta()); + VM0.invoke(() -> DeltaPropagationDUnitTest.createAnEntry()); Thread.sleep(5000); // TODO: Find a better 'n reliable alternative // assert overflow occured on client vm verifyOverflowOccured(1L, 1); - VM0.invoke(DeltaPropagationDUnitTest.class, "updateDelta"); + VM0.invoke(() -> DeltaPropagationDUnitTest.updateDelta()); waitForLastKey(); - long toDeltas = ((Long)VM0.invoke(DeltaTestImpl.class, - "getToDeltaInvokations")).longValue(); + long toDeltas = ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaInvokations())).longValue(); long fromDeltas = DeltaTestImpl.getFromDeltaInvokations().longValue(); assertTrue((EVENTS_SIZE - 1) + " deltas were to be sent but were " @@ -383,25 +368,22 @@ public void testS2CWithLocallyDestroyedOldValueAtClient() throws Exception { } public void testS2CWithInvalidatedOldValueAtClient() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); createClientCache(new Integer(PORT1), new Integer(-1), "0", new Integer( CLIENT_LISTENER)); registerInterestListAll(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "createDelta"); - VM0.invoke(DeltaPropagationDUnitTest.class, "invalidateDelta"); - VM0.invoke(DeltaPropagationDUnitTest.class, "updateDelta"); + VM0.invoke(() -> DeltaPropagationDUnitTest.createDelta()); + VM0.invoke(() -> DeltaPropagationDUnitTest.invalidateDelta()); + VM0.invoke(() -> DeltaPropagationDUnitTest.updateDelta()); waitForLastKey(); - long toDeltas = ((Long)VM0.invoke(DeltaTestImpl.class, - "getToDeltaInvokations")).longValue(); + long toDeltas = ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaInvokations())).longValue(); long fromDeltas = DeltaTestImpl.getFromDeltaInvokations().longValue(); assertTrue((EVENTS_SIZE - 1) + " deltas were to be sent but were " @@ -415,18 +397,16 @@ public void testS2CWithInvalidatedOldValueAtClient() throws Exception { } public void testS2CDeltaPropagationWithClientConflationON() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); createClientCache(new Integer(PORT1), new Integer(-1), "0", DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_ON, new Integer( LAST_KEY_LISTENER), null, null); registerInterestListAll(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); - VM0.invoke(DeltaPropagationDUnitTest.class, "createAndUpdateDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.createAndUpdateDeltas()); waitForLastKey(); @@ -436,53 +416,48 @@ DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_ON, new Integer( } public void testS2CDeltaPropagationWithServerConflationON() throws Exception { - VM0.invoke(DeltaPropagationDUnitTest.class, "closeCache"); - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", new Object[] { + VM0.invoke(() -> DeltaPropagationDUnitTest.closeCache()); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY, Integer.valueOf(1), - Integer.valueOf(NO_LISTENER), Boolean.TRUE /* conflate */, null})) + Integer.valueOf(NO_LISTENER), Boolean.TRUE /* conflate */, null))) .intValue(); createClientCache(new Integer(PORT1), new Integer(-1), "0", DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_DEFAULT, new Integer( LAST_KEY_LISTENER), null, null); - VM3.invoke(DeltaPropagationDUnitTest.class, "createClientCache", - new Object[] { new Integer(PORT1), new Integer(-1), "0", + VM3.invoke(() -> DeltaPropagationDUnitTest.createClientCache( new Integer(PORT1), new Integer(-1), "0", DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_OFF, - new Integer(LAST_KEY_LISTENER), null, null }); + new Integer(LAST_KEY_LISTENER), null, null )); registerInterestListAll(); - VM3.invoke(DeltaPropagationDUnitTest.class, "registerInterestListAll"); + VM3.invoke(() -> DeltaPropagationDUnitTest.registerInterestListAll()); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); - VM0.invoke(DeltaPropagationDUnitTest.class, "createAndUpdateDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); + VM0.invoke(() -> DeltaPropagationDUnitTest.createAndUpdateDeltas()); waitForLastKey(); - VM3.invoke(DeltaPropagationDUnitTest.class, "waitForLastKey"); + VM3.invoke(() -> DeltaPropagationDUnitTest.waitForLastKey()); // TODO: (Amogh) use CCPStats. assertTrue("Delta Propagation feature used.", DeltaTestImpl .getFromDeltaInvokations().longValue() == 0); - long fromDeltaInvocations = (Long)VM3.invoke(DeltaTestImpl.class, "getFromDeltaInvokations"); + long fromDeltaInvocations = (Long)VM3.invoke(() -> DeltaTestImpl.getFromDeltaInvokations()); assertTrue("Expected " + (EVENTS_SIZE - 1) + " fromDelta() invocations but found " + "", (fromDeltaInvocations == (EVENTS_SIZE - 1))); } public void testS2CDeltaPropagationWithOnlyCreateEvents() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); createClientCache(new Integer(PORT1), new Integer(-1), "0", new Integer( LAST_KEY_LISTENER)); registerInterestListAll(); - VM0.invoke(DeltaPropagationDUnitTest.class, "createDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.createDeltas()); waitForLastKey(); - assertTrue("Delta Propagation feature used.", ((Long)VM0.invoke( - DeltaTestImpl.class, "getToDeltaInvokations")).longValue() == 0); + assertTrue("Delta Propagation feature used.", ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaInvokations())).longValue() == 0); assertTrue("Delta Propagation feature used.", DeltaTestImpl .getFromDeltaInvokations().longValue() == 0); } @@ -496,20 +471,18 @@ public void testS2CDeltaPropagationWithOnlyCreateEvents() throws Exception { */ public void testC2S2SDeltaPropagation() throws Exception { prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); - VM1.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); + VM1.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); DeltaTestImpl val = deltaPut[1]; - VM0.invoke(DeltaPropagationDUnitTest.class, "closeCache"); + VM0.invoke(() -> DeltaPropagationDUnitTest.closeCache()); - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", new Object[] { + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY, new Integer(1), - new Integer(C2S2S_SERVER_LISTENER) })).intValue(); - PORT2 = ((Integer)VM1.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", new Object[] { + new Integer(C2S2S_SERVER_LISTENER) ))).intValue(); + PORT2 = ((Integer)VM1.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY, new Integer(1), - new Integer(C2S2S_SERVER_LISTENER) })).intValue(); + new Integer(C2S2S_SERVER_LISTENER) ))).intValue(); createClientCache(new Integer(PORT1), new Integer(-1), "0", new Integer( NO_LISTENER)); @@ -520,51 +493,45 @@ HARegionQueue.HA_EVICTION_POLICY_MEMORY, new Integer(1), r.create(DELTA_KEY, deltaPut[0]); // Invalidate the value at both the servers. - VM0.invoke(DeltaPropagationDUnitTest.class, "doLocalOp", new Object[] { - INVALIDATE, regionName, DELTA_KEY }); - VM1.invoke(DeltaPropagationDUnitTest.class, "doLocalOp", new Object[] { - INVALIDATE, regionName, DELTA_KEY }); + VM0.invoke(() -> DeltaPropagationDUnitTest.doLocalOp( + INVALIDATE, regionName, DELTA_KEY )); + VM1.invoke(() -> DeltaPropagationDUnitTest.doLocalOp( + INVALIDATE, regionName, DELTA_KEY )); - VM0.invoke(DeltaPropagationDUnitTest.class, "assertOp", new Object[] { - INVALIDATE, new Integer(1) }); - VM1.invoke(DeltaPropagationDUnitTest.class, "assertOp", new Object[] { - INVALIDATE, new Integer(1) }); + VM0.invoke(() -> DeltaPropagationDUnitTest.assertOp( + INVALIDATE, new Integer(1) )); + VM1.invoke(() -> DeltaPropagationDUnitTest.assertOp( + INVALIDATE, new Integer(1) )); r.put(DELTA_KEY, val); Thread.sleep(5000); // Assert that VM0 distributed val as full value to VM1. - VM1.invoke(DeltaPropagationDUnitTest.class, "assertValue", new Object[] { - regionName, DELTA_KEY, val }); + VM1.invoke(() -> DeltaPropagationDUnitTest.assertValue( + regionName, DELTA_KEY, val )); - assertTrue("Delta Propagation feature used.", !((Boolean)VM0.invoke( - DeltaTestImpl.class, "deltaFeatureUsed")).booleanValue()); - assertTrue("Delta Propagation feature used.", !((Boolean)VM1.invoke( - DeltaTestImpl.class, "deltaFeatureUsed")).booleanValue()); + assertTrue("Delta Propagation feature used.", !((Boolean)VM0.invoke(() -> DeltaTestImpl.deltaFeatureUsed())).booleanValue()); + assertTrue("Delta Propagation feature used.", !((Boolean)VM1.invoke(() -> DeltaTestImpl.deltaFeatureUsed())).booleanValue()); assertTrue("Delta Propagation feature NOT used.", DeltaTestImpl .deltaFeatureUsed()); } public void testS2S2CDeltaPropagationWithHAOverflow() throws Exception { prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); - VM1.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); + VM1.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); - VM0.invoke(DeltaPropagationDUnitTest.class, "closeCache"); + VM0.invoke(() -> DeltaPropagationDUnitTest.closeCache()); - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", new Object[] { - HARegionQueue.HA_EVICTION_POLICY_NONE, new Integer(1) })) + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( + HARegionQueue.HA_EVICTION_POLICY_NONE, new Integer(1) ))) .intValue(); - PORT2 = ((Integer)VM1.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", new Object[] { - HARegionQueue.HA_EVICTION_POLICY_ENTRY, new Integer(1) })) + PORT2 = ((Integer)VM1.invoke(() -> DeltaPropagationDUnitTest.createServerCache( + HARegionQueue.HA_EVICTION_POLICY_ENTRY, new Integer(1) ))) .intValue(); - VM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); - VM1.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); + VM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); + VM1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); createClientCache(new Integer(PORT2), new Integer(-1), "0", new Integer( CLIENT_LISTENER)); @@ -573,20 +540,16 @@ HARegionQueue.HA_EVICTION_POLICY_ENTRY, new Integer(1) })) assertNotNull(r); r.registerInterest("ALL_KEYS"); - VM0.invoke(DeltaPropagationDUnitTest.class, "createAndUpdateDeltas"); - VM1.invoke(DeltaPropagationDUnitTest.class, "confirmEviction", - new Object[] { new Integer(PORT2) }); + VM0.invoke(() -> DeltaPropagationDUnitTest.createAndUpdateDeltas()); + VM1.invoke(() -> DeltaPropagationDUnitTest.confirmEviction( new Integer(PORT2) )); - VM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + VM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); waitForLastKey(); - long toDeltasOnServer1 = ((Long)VM0.invoke(DeltaTestImpl.class, - "getToDeltaInvokations")).longValue(); - long fromDeltasOnServer2 = ((Long)VM1.invoke(DeltaTestImpl.class, - "getFromDeltaInvokations")).longValue(); - long toDeltasOnServer2 = ((Long)VM1.invoke(DeltaTestImpl.class, - "getToDeltaInvokations")).longValue(); + long toDeltasOnServer1 = ((Long)VM0.invoke(() -> DeltaTestImpl.getToDeltaInvokations())).longValue(); + long fromDeltasOnServer2 = ((Long)VM1.invoke(() -> DeltaTestImpl.getFromDeltaInvokations())).longValue(); + long toDeltasOnServer2 = ((Long)VM1.invoke(() -> DeltaTestImpl.getToDeltaInvokations())).longValue(); long fromDeltasOnClient = DeltaTestImpl.getFromDeltaInvokations() .longValue(); @@ -602,33 +565,27 @@ HARegionQueue.HA_EVICTION_POLICY_ENTRY, new Integer(1) })) public void testS2CDeltaPropagationWithGIIAndFailover() throws Exception { prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); - VM1.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); - VM2.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); + VM1.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); + VM2.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); - VM0.invoke(DeltaPropagationDUnitTest.class, "closeCache"); + VM0.invoke(() -> DeltaPropagationDUnitTest.closeCache()); - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", new Object[] { + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_NONE, new Integer(1), - new Integer(NO_LISTENER) })).intValue(); - PORT2 = ((Integer)VM1.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", new Object[] { + new Integer(NO_LISTENER) ))).intValue(); + PORT2 = ((Integer)VM1.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_NONE, new Integer(1), - new Integer(NO_LISTENER) })).intValue(); - int port3 = ((Integer)VM2.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", new Object[] { + new Integer(NO_LISTENER) ))).intValue(); + int port3 = ((Integer)VM2.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_NONE, new Integer(1), - new Integer(NO_LISTENER) })).intValue(); + new Integer(NO_LISTENER) ))).intValue(); // Do puts after slowing the dispatcher. try { - VM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); - VM1.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); - VM2.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); + VM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); + VM1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); + VM2.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); createClientCache(new int[] { PORT1, PORT2, port3 }, "1", DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_DEFAULT, new Integer( @@ -640,20 +597,20 @@ DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_DEFAULT, new Integer( VM primary = (((PoolImpl)pool).getPrimaryPort() == PORT1) ? VM0 : ((((PoolImpl)pool).getPrimaryPort() == PORT2) ? VM1 : VM2); - primary.invoke(DeltaPropagationDUnitTest.class, "createAndUpdateDeltas"); + primary.invoke(() -> DeltaPropagationDUnitTest.createAndUpdateDeltas()); Thread.sleep(5000); - primary.invoke(DeltaPropagationDUnitTest.class, "closeCache"); + primary.invoke(() -> DeltaPropagationDUnitTest.closeCache()); Thread.sleep(5000); primary = (((PoolImpl)pool).getPrimaryPort() == PORT1) ? VM0 : ((((PoolImpl)pool).getPrimaryPort() == PORT2) ? VM1 : VM2); - VM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - VM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - VM2.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + VM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + VM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + VM2.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); - primary.invoke(DeltaPropagationDUnitTest.class, "closeCache"); + primary.invoke(() -> DeltaPropagationDUnitTest.closeCache()); Thread.sleep(5000); primary = (((PoolImpl)pool).getPrimaryPort() == PORT1) ? VM0 @@ -668,16 +625,14 @@ DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_DEFAULT, new Integer( + fromDeltasOnClient, fromDeltasOnClient == (EVENTS_SIZE - 1)); } finally { - VM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - VM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - VM2.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + VM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + VM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + VM2.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); } } public void testBug40165ClientReconnects() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); /** * 1. Create a cache server with slow dispatcher @@ -694,12 +649,11 @@ public void testBug40165ClientReconnects() throws Exception { // Step 0 prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); // Step 1 try { - VM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); + VM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); // Step 2 String durableClientId = getName() + "_client"; @@ -719,10 +673,10 @@ public void testBug40165ClientReconnects() throws Exception { regionName, properties, new Integer(DURABLE_CLIENT_LISTENER), Boolean.TRUE); // Step 3 - VM0.invoke(DeltaPropagationDUnitTest.class, "doPuts"); + VM0.invoke(() -> DeltaPropagationDUnitTest.doPuts()); // Step 4 - VM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + VM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); // Step 5 //verifyDurableClientDisconnected(); @@ -742,15 +696,13 @@ public void testBug40165ClientReconnects() throws Exception { + fromDeltasOnClient, fromDeltasOnClient < 1); } finally { // Step 4 - VM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + VM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); } } public void testBug40165ClientFailsOver() throws Exception { - PORT1 = ((Integer)VM0.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); + PORT1 = ((Integer)VM0.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); /** * 1. Create two cache servers with slow dispatcher @@ -765,18 +717,14 @@ public void testBug40165ClientFailsOver() throws Exception { // Step 0 prepareDeltas(); - VM0.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); - VM1.invoke(DeltaPropagationDUnitTest.class, "prepareDeltas"); + VM0.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); + VM1.invoke(() -> DeltaPropagationDUnitTest.prepareDeltas()); try { // Step 1 - VM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); - PORT2 = ((Integer)VM1.invoke(DeltaPropagationDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); - VM1.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); + VM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); + PORT2 = ((Integer)VM1.invoke(() -> DeltaPropagationDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); + VM1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); // Step 2 String durableClientId = getName() + "_client"; @@ -798,11 +746,11 @@ public void testBug40165ClientFailsOver() throws Exception { regionName, properties, new Integer(DURABLE_CLIENT_LISTENER), Boolean.FALSE); // Step 3 - VM0.invoke(DeltaPropagationDUnitTest.class, "doPuts"); + VM0.invoke(() -> DeltaPropagationDUnitTest.doPuts()); } finally { // Step 4 - VM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - VM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + VM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + VM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); } // Step 5 @@ -812,7 +760,7 @@ public void testBug40165ClientFailsOver() throws Exception { } // Step 6 - pVM.invoke(DeltaPropagationDUnitTest.class, "closeCache"); + pVM.invoke(() -> DeltaPropagationDUnitTest.closeCache()); Thread.sleep(5000); // Step 7 diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java index 8c249bef4917..f3831993de12 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java @@ -97,15 +97,15 @@ public void setUp() throws Exception { @Override protected final void preTearDown() throws Exception { lastKeyReceived = false; - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "resetLastKeyReceived"); - vm1.invoke(DeltaPropagationStatsDUnitTest.class, "resetLastKeyReceived"); - vm2.invoke(DeltaPropagationStatsDUnitTest.class, "resetLastKeyReceived"); - vm3.invoke(DeltaPropagationStatsDUnitTest.class, "resetLastKeyReceived"); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.resetLastKeyReceived()); + vm1.invoke(() -> DeltaPropagationStatsDUnitTest.resetLastKeyReceived()); + vm2.invoke(() -> DeltaPropagationStatsDUnitTest.resetLastKeyReceived()); + vm3.invoke(() -> DeltaPropagationStatsDUnitTest.resetLastKeyReceived()); closeCache(); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "closeCache"); - vm1.invoke(DeltaPropagationStatsDUnitTest.class, "closeCache"); - vm2.invoke(DeltaPropagationStatsDUnitTest.class, "closeCache"); - vm3.invoke(DeltaPropagationStatsDUnitTest.class, "closeCache"); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.closeCache()); + vm1.invoke(() -> DeltaPropagationStatsDUnitTest.closeCache()); + vm2.invoke(() -> DeltaPropagationStatsDUnitTest.closeCache()); + vm3.invoke(() -> DeltaPropagationStatsDUnitTest.closeCache()); } public static void resetLastKeyReceived() { @@ -134,15 +134,13 @@ public void testS2CDeltaPropagationCleanStats() throws Exception { createClientCache(NetworkUtils.getServerHostName(vm0.getHost()), port); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putCleanDelta", - new Object[] {Integer.valueOf(numOfKeys), Long.valueOf(updates)}); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putLastKey"); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putCleanDelta(Integer.valueOf(numOfKeys), Long.valueOf(updates))); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putLastKey()); waitForLastKey(); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "verifyDeltaSenderStats", - new Object[] {Integer.valueOf(SERVER_TO_CLIENT), - Long.valueOf(numOfKeys * updates)}); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaSenderStats(Integer.valueOf(SERVER_TO_CLIENT), + Long.valueOf(numOfKeys * updates))); verifyDeltaReceiverStats(SERVER_TO_CLIENT, numOfKeys * updates, 0L); } @@ -162,19 +160,16 @@ public void testS2CDeltaPropagationFailedStats1() throws Exception { createClientCache(NetworkUtils.getServerHostName(vm0.getHost()), port); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, - "putErrorDeltaForReceiver", new Object[] {Integer.valueOf(numOfKeys), - Long.valueOf(updates), Long.valueOf(errors)}); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putErrorDeltaForSender", - new Object[] {Integer.valueOf(numOfKeys), Long.valueOf(updates), - Long.valueOf(errors2), Boolean.FALSE}); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putLastKey"); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putErrorDeltaForReceiver(Integer.valueOf(numOfKeys), + Long.valueOf(updates), Long.valueOf(errors))); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putErrorDeltaForSender(Integer.valueOf(numOfKeys), Long.valueOf(updates), + Long.valueOf(errors2), Boolean.FALSE)); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putLastKey()); waitForLastKey(); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "verifyDeltaSenderStats", - new Object[] {Integer.valueOf(SERVER_TO_CLIENT), - Long.valueOf(2 * numOfKeys * updates - errors2)}); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaSenderStats(Integer.valueOf(SERVER_TO_CLIENT), + Long.valueOf(2 * numOfKeys * updates - errors2))); verifyDeltaReceiverStats(SERVER_TO_CLIENT, 2 * numOfKeys * updates - errors - errors2, errors); } @@ -201,22 +196,18 @@ public void testP2PDeltaPropagationCleanStats() throws Exception { vm1.invoke(DeltaPropagationStatsDUnitTest.class, "createServerCache", args); vm2.invoke(DeltaPropagationStatsDUnitTest.class, "createServerCache", args); // Only delta should get sent to vm1 and vm2 - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putCleanDelta", - new Object[] {Integer.valueOf(numOfKeys), Long.valueOf(updates)}); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putLastKey"); - - vm1.invoke(DeltaPropagationStatsDUnitTest.class, "waitForLastKey"); - vm2.invoke(DeltaPropagationStatsDUnitTest.class, "waitForLastKey"); - - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "verifyDeltaSenderStats", - new Object[] {Integer.valueOf(PEER_TO_PEER), - Long.valueOf(numOfKeys * updates)}); - vm1.invoke(DeltaPropagationStatsDUnitTest.class, - "verifyDeltaReceiverStats", new Object[] {Integer.valueOf(PEER_TO_PEER), - Long.valueOf(numOfKeys * updates), Long.valueOf(0)}); - vm2.invoke(DeltaPropagationStatsDUnitTest.class, - "verifyDeltaReceiverStats", new Object[] {Integer.valueOf(PEER_TO_PEER), - Long.valueOf(numOfKeys * updates), Long.valueOf(0)}); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putCleanDelta(Integer.valueOf(numOfKeys), Long.valueOf(updates))); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putLastKey()); + + vm1.invoke(() -> DeltaPropagationStatsDUnitTest.waitForLastKey()); + vm2.invoke(() -> DeltaPropagationStatsDUnitTest.waitForLastKey()); + + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaSenderStats(Integer.valueOf(PEER_TO_PEER), + Long.valueOf(numOfKeys * updates))); + vm1.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaReceiverStats(Integer.valueOf(PEER_TO_PEER), + Long.valueOf(numOfKeys * updates), Long.valueOf(0))); + vm2.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaReceiverStats(Integer.valueOf(PEER_TO_PEER), + Long.valueOf(numOfKeys * updates), Long.valueOf(0))); } /** @@ -234,30 +225,25 @@ public void testP2PDeltaPropagationFailedStats1() throws Exception { vm1.invoke(DeltaPropagationStatsDUnitTest.class, "createServerCache", args); vm2.invoke(DeltaPropagationStatsDUnitTest.class, "createServerCache", args); // Only delta should get sent to vm1 and vm2 - vm0.invoke(DeltaPropagationStatsDUnitTest.class, - "putErrorDeltaForReceiver", new Object[] {Integer.valueOf(numOfKeys), - Long.valueOf(updates), Long.valueOf(errors)}); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putErrorDeltaForSender", - new Object[] {Integer.valueOf(numOfkeys2), Long.valueOf(updates2), - Long.valueOf(errors2), Boolean.FALSE}); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putLastKey"); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putErrorDeltaForReceiver(Integer.valueOf(numOfKeys), + Long.valueOf(updates), Long.valueOf(errors))); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putErrorDeltaForSender(Integer.valueOf(numOfkeys2), Long.valueOf(updates2), + Long.valueOf(errors2), Boolean.FALSE)); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.putLastKey()); - vm1.invoke(DeltaPropagationStatsDUnitTest.class, "waitForLastKey"); - vm2.invoke(DeltaPropagationStatsDUnitTest.class, "waitForLastKey"); + vm1.invoke(() -> DeltaPropagationStatsDUnitTest.waitForLastKey()); + vm2.invoke(() -> DeltaPropagationStatsDUnitTest.waitForLastKey()); long deltasSent = (numOfKeys * updates) + (numOfkeys2 * updates2) - errors2; long deltasProcessed = deltasSent - errors; - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "verifyDeltaSenderStats", - new Object[] {Integer.valueOf(PEER_TO_PEER), Long.valueOf(deltasSent)}); - vm1.invoke(DeltaPropagationStatsDUnitTest.class, - "verifyDeltaReceiverStats", new Object[] { + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaSenderStats(Integer.valueOf(PEER_TO_PEER), Long.valueOf(deltasSent))); + vm1.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaReceiverStats( Integer.valueOf(PEER_TO_PEER), Long.valueOf(deltasProcessed), - Long.valueOf(errors)}); - vm2.invoke(DeltaPropagationStatsDUnitTest.class, - "verifyDeltaReceiverStats", new Object[] { + Long.valueOf(errors))); + vm2.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaReceiverStats( Integer.valueOf(PEER_TO_PEER), Long.valueOf(deltasProcessed), - Long.valueOf(errors)}); + Long.valueOf(errors))); } /** @@ -286,21 +272,18 @@ public void testC2SDeltaPropagationCleanStats() throws Exception { putCleanDelta(numOfKeys, updates); putLastKey(); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "waitForLastKey"); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.waitForLastKey()); verifyDeltaSenderStats(CLIENT_TO_SERVER, numOfKeys * updates); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, - "verifyDeltaReceiverStats", new Object[] { + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaReceiverStats( Integer.valueOf(CLIENT_TO_SERVER), - Long.valueOf(numOfKeys * updates), Long.valueOf(0)}); + Long.valueOf(numOfKeys * updates), Long.valueOf(0))); // Unrelated to Delta feature. Piggy-backing on existing test code // to validate fix for #49539. - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "doPuts", - new Object[] { numOfKeys }); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.doPuts( numOfKeys )); long clientOriginatedEvents = numOfKeys * updates + numOfKeys + 1; - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "verifyCCPStatsBug49539", - new Object[] { clientOriginatedEvents }); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.verifyCCPStatsBug49539( clientOriginatedEvents )); } /** @@ -326,13 +309,12 @@ public void testC2SDeltaPropagationFailedStats1() throws Exception { long deltasSent = 2 * (numOfKeys * updates) - errors2; long deltasProcessed = deltasSent - errors; - vm0.invoke(DeltaPropagationStatsDUnitTest.class, "waitForLastKey"); + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.waitForLastKey()); verifyDeltaSenderStats(CLIENT_TO_SERVER, deltasSent); - vm0.invoke(DeltaPropagationStatsDUnitTest.class, - "verifyDeltaReceiverStats", new Object[] { + vm0.invoke(() -> DeltaPropagationStatsDUnitTest.verifyDeltaReceiverStats( Integer.valueOf(CLIENT_TO_SERVER), Long.valueOf(deltasProcessed), - Long.valueOf(errors)}); + Long.valueOf(errors))); } /** diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java index f42c020d11c2..a49dbec66d42 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java @@ -85,8 +85,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(DiskRegByteArrayDUnitTest.class, "createCacheForVM0"); - vm1.invoke(DiskRegByteArrayDUnitTest.class, "createCacheForVM1"); + vm0.invoke(() -> DiskRegByteArrayDUnitTest.createCacheForVM0()); + vm1.invoke(() -> DiskRegByteArrayDUnitTest.createCacheForVM1()); } @Override @@ -99,10 +99,10 @@ protected final void postTearDownCacheTestCase() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(DiskRegByteArrayDUnitTest.class, "deleteFiles"); - vm1.invoke(DiskRegByteArrayDUnitTest.class, "deleteFiles"); - vm0.invoke(DiskRegByteArrayDUnitTest.class, "closeCache"); - vm1.invoke(DiskRegByteArrayDUnitTest.class, "closeCache"); + vm0.invoke(() -> DiskRegByteArrayDUnitTest.deleteFiles()); + vm1.invoke(() -> DiskRegByteArrayDUnitTest.deleteFiles()); + vm0.invoke(() -> DiskRegByteArrayDUnitTest.closeCache()); + vm1.invoke(() -> DiskRegByteArrayDUnitTest.closeCache()); }*/ public static void createCacheForVM0(){ @@ -170,7 +170,7 @@ public void testPutGetByteArray(){ //Put in vm0 vm0.invoke(DiskRegByteArrayDUnitTest.class, "putMethod", objArr); //forceflush data to disk - vm1.invoke(DiskRegByteArrayDUnitTest.class, "flushMethod"); + vm1.invoke(() -> DiskRegByteArrayDUnitTest.flushMethod()); /* get the val from disk * verify that the value retrieved from disk represents a byte[] * diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java index 4c46a557a376..99abf4948b8a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java @@ -80,8 +80,7 @@ protected void setUp(boolean createLocalCache) throws Exception { for (int v = 0; v < host.getVMCount(); v++) { VM vm = host.getVM(v); - vm.invoke(this.getClass(), "remoteCreateCache", - new Object[] {}); + vm.invoke(() -> this.remoteCreateCache()); } } } @@ -129,7 +128,7 @@ protected final void preTearDown() throws Exception { for (int v = 0; v < host.getVMCount(); v++) { VM vm = host.getVM(v); boolean exceptionInThreads = - vm.invokeBoolean(this.getClass(), "remoteCloseCache"); + vm.invoke(() -> this.remoteCloseCache()); if (exceptionInThreads) { String s = "An exception occurred in GemFire system"; problems.append(s); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java index 09fc8821d79c..5fbc53741405 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java @@ -160,7 +160,7 @@ public void run2() throws CacheException { }); // Create Create Region in the client - final int port = serverVM.invokeInt(EventTrackerDUnitTest.class, "getCacheServerPort"); + final int port = serverVM.invoke(() -> EventTrackerDUnitTest.getCacheServerPort()); final String hostName = NetworkUtils.getServerHostName(host); clientVM.invoke(new CacheSerializableRunnable("Create client") { public void run2() throws CacheException { @@ -233,7 +233,7 @@ public void run2() throws CacheException { }); // Create Create Region in the client - final int port = serverVM.invokeInt(EventTrackerDUnitTest.class, "getCacheServerPort"); + final int port = serverVM.invoke(() -> EventTrackerDUnitTest.getCacheServerPort()); final String hostName = NetworkUtils.getServerHostName(host); clientVM.invoke(new CacheSerializableRunnable("Create client") { public void run2() throws CacheException { @@ -311,7 +311,7 @@ public void run() { vm1.invoke(createRegion); // Create Create Region in the client - final int port = vm0.invokeInt(EventTrackerDUnitTest.class, "getCacheServerPort"); + final int port = vm0.invoke(() -> EventTrackerDUnitTest.getCacheServerPort()); final String hostName = NetworkUtils.getServerHostName(host); vm2.invoke(new CacheSerializableRunnable("Create client") { public void run2() throws CacheException { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java index a31e1e7ba030..819afdff9286 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java @@ -504,11 +504,9 @@ private long getPRCounter(String prRegionName) { final long ONE_MEG = 1024L * 1024L; long sizeOfPR = 0; sizeOfPR = sizeOfPR - + (Long)dataStore1.invoke(EvictionStatsDUnitTest.class, - "getPartionRegionCounter", new Object[] { prRegionName }); + + (Long)dataStore1.invoke(() -> EvictionStatsDUnitTest.getPartionRegionCounter( prRegionName )); sizeOfPR = sizeOfPR - + (Long)dataStore2.invoke(EvictionStatsDUnitTest.class, - "getPartionRegionCounter", new Object[] { prRegionName }); + + (Long)dataStore2.invoke(() -> EvictionStatsDUnitTest.getPartionRegionCounter( prRegionName )); return sizeOfPR / ONE_MEG; } @@ -523,11 +521,9 @@ private long getCounterForBucketsOfPR(String prRegionName) { final long ONE_MEG = 1024L * 1024L; long totalBucketSize = 0; totalBucketSize = totalBucketSize - + (Long)dataStore1.invoke(EvictionStatsDUnitTest.class, - "getCounterForBuckets", new Object[] { prRegionName }); + + (Long)dataStore1.invoke(() -> EvictionStatsDUnitTest.getCounterForBuckets( prRegionName )); totalBucketSize = totalBucketSize - + (Long)dataStore2.invoke(EvictionStatsDUnitTest.class, - "getCounterForBuckets", new Object[] { prRegionName }); + + (Long)dataStore2.invoke(() -> EvictionStatsDUnitTest.getCounterForBuckets( prRegionName )); return totalBucketSize / ONE_MEG; } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java index 67267476ca25..541686254d7e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java @@ -150,8 +150,8 @@ public void run() { } }); - dataStore3.invoke(EvictionTestBase.class, "setTolerance"); - dataStore4.invoke(EvictionTestBase.class, "setTolerance"); + dataStore3.invoke(() -> EvictionTestBase.setTolerance()); + dataStore4.invoke(() -> EvictionTestBase.setTolerance()); dataStore3.invoke(new SerializableRunnable() { @Override @@ -508,7 +508,7 @@ public Object call() throws Exception { } public void killVm() { - dataStore4.invoke(EvictionTestBase.class, "close"); + dataStore4.invoke(() -> EvictionTestBase.close()); } @@ -543,8 +543,7 @@ public void run() { } public int getPRSize(String string) { - Integer prSize = (Integer)dataStore4.invoke(EvictionTestBase.class, - "returnPRSize", new Object[] { string }); + Integer prSize = (Integer)dataStore4.invoke(() -> EvictionTestBase.returnPRSize( string )); return prSize; } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java index 86376d9295e4..4276a6070fdf 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java @@ -111,55 +111,45 @@ public void testNoClientConnected() { fpaList.add(FixedPartitionAttributes.createFixedPartition("Q2", 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q3", 3)); - datastoreServer.invoke(FixedPRSinglehopDUnitTest.class, "createServer", - new Object[] { false, fpaList }); + datastoreServer.invoke(() -> FixedPRSinglehopDUnitTest.createServer( false, fpaList )); fpaList.clear(); - accessorServer.invoke(FixedPRSinglehopDUnitTest.class, "createServer", - new Object[] { true, fpaList }); + accessorServer.invoke(() -> FixedPRSinglehopDUnitTest.createServer( true, fpaList )); fpaList.clear(); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q2", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q3", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q4", 3)); - peer1.invoke(FixedPRSinglehopDUnitTest.class, "createPeer", new Object[] { - false, fpaList }); + peer1.invoke(() -> FixedPRSinglehopDUnitTest.createPeer( + false, fpaList )); fpaList.clear(); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q4", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q1", 3)); - peer2.invoke(FixedPRSinglehopDUnitTest.class, "createPeer", new Object[] { - false, fpaList }); - - datastoreServer.invoke(FixedPRSinglehopDUnitTest.class, - "putIntoPartitionedRegions"); - accessorServer.invoke(FixedPRSinglehopDUnitTest.class, - "putIntoPartitionedRegions"); - peer1.invoke(FixedPRSinglehopDUnitTest.class, "putIntoPartitionedRegions"); - peer2.invoke(FixedPRSinglehopDUnitTest.class, "putIntoPartitionedRegions"); - - datastoreServer.invoke(FixedPRSinglehopDUnitTest.class, - "getFromPartitionedRegions"); - accessorServer.invoke(FixedPRSinglehopDUnitTest.class, - "getFromPartitionedRegions"); - peer1.invoke(FixedPRSinglehopDUnitTest.class, "getFromPartitionedRegions"); - peer2.invoke(FixedPRSinglehopDUnitTest.class, "getFromPartitionedRegions"); - - datastoreServer.invoke(FixedPRSinglehopDUnitTest.class, - "verifyEmptyMetadata"); - accessorServer.invoke(FixedPRSinglehopDUnitTest.class, - "verifyEmptyMetadata"); - peer1.invoke(FixedPRSinglehopDUnitTest.class, "verifyEmptyMetadata"); - peer2.invoke(FixedPRSinglehopDUnitTest.class, "verifyEmptyMetadata"); - - datastoreServer.invoke(FixedPRSinglehopDUnitTest.class, - "verifyEmptyStaticData"); - accessorServer.invoke(FixedPRSinglehopDUnitTest.class, - "verifyEmptyStaticData"); - peer1.invoke(FixedPRSinglehopDUnitTest.class, "verifyEmptyStaticData"); - peer2.invoke(FixedPRSinglehopDUnitTest.class, "verifyEmptyStaticData"); + peer2.invoke(() -> FixedPRSinglehopDUnitTest.createPeer( + false, fpaList )); + + datastoreServer.invoke(() -> FixedPRSinglehopDUnitTest.putIntoPartitionedRegions()); + accessorServer.invoke(() -> FixedPRSinglehopDUnitTest.putIntoPartitionedRegions()); + peer1.invoke(() -> FixedPRSinglehopDUnitTest.putIntoPartitionedRegions()); + peer2.invoke(() -> FixedPRSinglehopDUnitTest.putIntoPartitionedRegions()); + + datastoreServer.invoke(() -> FixedPRSinglehopDUnitTest.getFromPartitionedRegions()); + accessorServer.invoke(() -> FixedPRSinglehopDUnitTest.getFromPartitionedRegions()); + peer1.invoke(() -> FixedPRSinglehopDUnitTest.getFromPartitionedRegions()); + peer2.invoke(() -> FixedPRSinglehopDUnitTest.getFromPartitionedRegions()); + + datastoreServer.invoke(() -> FixedPRSinglehopDUnitTest.verifyEmptyMetadata()); + accessorServer.invoke(() -> FixedPRSinglehopDUnitTest.verifyEmptyMetadata()); + peer1.invoke(() -> FixedPRSinglehopDUnitTest.verifyEmptyMetadata()); + peer2.invoke(() -> FixedPRSinglehopDUnitTest.verifyEmptyMetadata()); + + datastoreServer.invoke(() -> FixedPRSinglehopDUnitTest.verifyEmptyStaticData()); + accessorServer.invoke(() -> FixedPRSinglehopDUnitTest.verifyEmptyStaticData()); + peer1.invoke(() -> FixedPRSinglehopDUnitTest.verifyEmptyStaticData()); + peer2.invoke(() -> FixedPRSinglehopDUnitTest.verifyEmptyStaticData()); } // 2 AccessorServers, 2 Peers @@ -174,25 +164,23 @@ public void testClientConnectedToAccessors() { List fpaList = new ArrayList(); - Integer port0 = (Integer)accessorServer1.invoke( - FixedPRSinglehopDUnitTest.class, "createServer", new Object[] { true, - fpaList }); + Integer port0 = (Integer)accessorServer1.invoke(() -> FixedPRSinglehopDUnitTest.createServer( true, + fpaList )); - Integer port1 = (Integer)accessorServer2.invoke( - FixedPRSinglehopDUnitTest.class, "createServer", new Object[] { true, - fpaList }); + Integer port1 = (Integer)accessorServer2.invoke(() -> FixedPRSinglehopDUnitTest.createServer( true, + fpaList )); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q4", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q1", true, 3)); - peer1.invoke(FixedPRSinglehopDUnitTest.class, "createPeer", new Object[] { - false, fpaList }); + peer1.invoke(() -> FixedPRSinglehopDUnitTest.createPeer( + false, fpaList )); fpaList.clear(); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q2", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q3", true, 3)); - peer2.invoke(FixedPRSinglehopDUnitTest.class, "createPeer", new Object[] { - false, fpaList }); + peer2.invoke(() -> FixedPRSinglehopDUnitTest.createPeer( + false, fpaList )); createClient(port0, port1); @@ -221,30 +209,26 @@ public void test_MetadataContents() { fpaList.add(FixedPartitionAttributes.createFixedPartition("Q1", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q2", false, 3)); - Integer port1 = (Integer)server1.invoke( - FixedPRSinglehopDUnitTest.class, "createServer", new Object[] { false, - fpaList }); + Integer port1 = (Integer)server1.invoke(() -> FixedPRSinglehopDUnitTest.createServer( false, + fpaList )); fpaList.clear(); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q3", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q4", false, 3)); - Integer port2 = (Integer)server2.invoke( - FixedPRSinglehopDUnitTest.class, "createServer", new Object[] { false, - fpaList }); + Integer port2 = (Integer)server2.invoke(() -> FixedPRSinglehopDUnitTest.createServer( false, + fpaList )); fpaList.clear(); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q2", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q3", false, 3)); - Integer port3 = (Integer)server3.invoke( - FixedPRSinglehopDUnitTest.class, "createServer", new Object[] { false, - fpaList }); + Integer port3 = (Integer)server3.invoke(() -> FixedPRSinglehopDUnitTest.createServer( false, + fpaList )); fpaList.clear(); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q4", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q1", false, 3)); - Integer port4 = (Integer)server4.invoke( - FixedPRSinglehopDUnitTest.class, "createServer", new Object[] { false, - fpaList }); + Integer port4 = (Integer)server4.invoke(() -> FixedPRSinglehopDUnitTest.createServer( false, + fpaList )); createClient(port1, port2, port3, port4); @@ -252,16 +236,16 @@ public void test_MetadataContents() { getFromPartitionedRegions(); - server1.invoke(FixedPRSinglehopDUnitTest.class, "printView"); - server2.invoke(FixedPRSinglehopDUnitTest.class, "printView"); - server3.invoke(FixedPRSinglehopDUnitTest.class, "printView"); - server4.invoke(FixedPRSinglehopDUnitTest.class, "printView"); + server1.invoke(() -> FixedPRSinglehopDUnitTest.printView()); + server2.invoke(() -> FixedPRSinglehopDUnitTest.printView()); + server3.invoke(() -> FixedPRSinglehopDUnitTest.printView()); + server4.invoke(() -> FixedPRSinglehopDUnitTest.printView()); int totalBucketOnServer = 0; - totalBucketOnServer += (Integer)server1.invoke(FixedPRSinglehopDUnitTest.class, "totalNumBucketsCreated"); - totalBucketOnServer += (Integer)server2.invoke(FixedPRSinglehopDUnitTest.class, "totalNumBucketsCreated"); - totalBucketOnServer += (Integer)server3.invoke(FixedPRSinglehopDUnitTest.class, "totalNumBucketsCreated"); - totalBucketOnServer += (Integer)server4.invoke(FixedPRSinglehopDUnitTest.class, "totalNumBucketsCreated"); + totalBucketOnServer += (Integer)server1.invoke(() -> FixedPRSinglehopDUnitTest.totalNumBucketsCreated()); + totalBucketOnServer += (Integer)server2.invoke(() -> FixedPRSinglehopDUnitTest.totalNumBucketsCreated()); + totalBucketOnServer += (Integer)server3.invoke(() -> FixedPRSinglehopDUnitTest.totalNumBucketsCreated()); + totalBucketOnServer += (Integer)server4.invoke(() -> FixedPRSinglehopDUnitTest.totalNumBucketsCreated()); verifyMetadata(totalBucketOnServer,2); updateIntoSinglePR(); @@ -286,8 +270,7 @@ public void test_FPAmetadataFetch() { final int portLocator = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String hostLocator = NetworkUtils.getServerHostName(server1.getHost()); final String locator = hostLocator + "[" + portLocator + "]"; - server3.invoke(FixedPRSinglehopDUnitTest.class, - "startLocatorInVM", new Object[] { portLocator }); + server3.invoke(() -> FixedPRSinglehopDUnitTest.startLocatorInVM( portLocator )); try { List fpaList = new ArrayList(); @@ -295,15 +278,13 @@ public void test_FPAmetadataFetch() { fpaList.add(FixedPartitionAttributes.createFixedPartition("Q1", true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q2", false, 3)); - Integer port1 = (Integer)server1.invoke( - FixedPRSinglehopDUnitTest.class, "createServerWithLocator", new Object[] { locator, false, - fpaList, simpleFPR}); + Integer port1 = (Integer)server1.invoke(() -> FixedPRSinglehopDUnitTest.createServerWithLocator( locator, false, + fpaList, simpleFPR)); fpaList.clear(); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q3", true, 3)); - Integer port2 = (Integer)server2.invoke( - FixedPRSinglehopDUnitTest.class, "createServerWithLocator", new Object[] { locator, false, - fpaList , simpleFPR}); + Integer port2 = (Integer)server2.invoke(() -> FixedPRSinglehopDUnitTest.createServerWithLocator( locator, false, + fpaList , simpleFPR)); fpaList.clear(); createClientWithLocator(hostLocator, portLocator); @@ -313,12 +294,12 @@ public void test_FPAmetadataFetch() { getFromPartitionedRegionsFor3Qs(); Wait.pause(2000); // TODO: Verify that all the fpa's are in the map - server1.invoke(FixedPRSinglehopDUnitTest.class, "printView"); - server2.invoke(FixedPRSinglehopDUnitTest.class, "printView"); + server1.invoke(() -> FixedPRSinglehopDUnitTest.printView()); + server2.invoke(() -> FixedPRSinglehopDUnitTest.printView()); int totalBucketOnServer = 0; - totalBucketOnServer += (Integer)server1.invoke(FixedPRSinglehopDUnitTest.class, "totalNumBucketsCreated"); - totalBucketOnServer += (Integer)server2.invoke(FixedPRSinglehopDUnitTest.class, "totalNumBucketsCreated"); + totalBucketOnServer += (Integer)server1.invoke(() -> FixedPRSinglehopDUnitTest.totalNumBucketsCreated()); + totalBucketOnServer += (Integer)server2.invoke(() -> FixedPRSinglehopDUnitTest.totalNumBucketsCreated()); int currentRedundancy = 1; verifyMetadata(totalBucketOnServer,currentRedundancy); updateIntoSinglePRFor3Qs(); @@ -330,9 +311,8 @@ public void test_FPAmetadataFetch() { fpaList.add(FixedPartitionAttributes.createFixedPartition("Q1", false, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition("Q3", false, 3)); - Integer port4 = (Integer)server4.invoke( - FixedPRSinglehopDUnitTest.class, "createServerWithLocator", new Object[] { locator, false, - fpaList, simpleFPR }); + Integer port4 = (Integer)server4.invoke(() -> FixedPRSinglehopDUnitTest.createServerWithLocator( locator, false, + fpaList, simpleFPR )); Wait.pause(2000); putIntoPartitionedRegions(); @@ -341,18 +321,18 @@ public void test_FPAmetadataFetch() { getFromPartitionedRegions(); Wait.pause(2000); - server1.invoke(FixedPRSinglehopDUnitTest.class, "printView"); - server2.invoke(FixedPRSinglehopDUnitTest.class, "printView"); - server4.invoke(FixedPRSinglehopDUnitTest.class, "printView"); + server1.invoke(() -> FixedPRSinglehopDUnitTest.printView()); + server2.invoke(() -> FixedPRSinglehopDUnitTest.printView()); + server4.invoke(() -> FixedPRSinglehopDUnitTest.printView()); totalBucketOnServer = 0; - totalBucketOnServer += (Integer)server1.invoke(FixedPRSinglehopDUnitTest.class, "totalNumBucketsCreated"); - totalBucketOnServer += (Integer)server2.invoke(FixedPRSinglehopDUnitTest.class, "totalNumBucketsCreated"); - totalBucketOnServer += (Integer)server4.invoke(FixedPRSinglehopDUnitTest.class, "totalNumBucketsCreated"); + totalBucketOnServer += (Integer)server1.invoke(() -> FixedPRSinglehopDUnitTest.totalNumBucketsCreated()); + totalBucketOnServer += (Integer)server2.invoke(() -> FixedPRSinglehopDUnitTest.totalNumBucketsCreated()); + totalBucketOnServer += (Integer)server4.invoke(() -> FixedPRSinglehopDUnitTest.totalNumBucketsCreated()); updateIntoSinglePR(); } finally { - server3.invoke(FixedPRSinglehopDUnitTest.class, "stopLocator"); + server3.invoke(() -> FixedPRSinglehopDUnitTest.stopLocator()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java index 1e714f1ade41..e8dbe562d777 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java @@ -110,10 +110,10 @@ public static void setRegionName(String testName) { @Override protected final void preTearDownCacheTestCase() throws Exception { - P.invoke(GIIDeltaDUnitTest.class, "resetSlowGII"); - R.invoke(GIIDeltaDUnitTest.class, "resetSlowGII"); - P.invoke(InitialImageOperation.class, "resetAllGIITestHooks"); - R.invoke(InitialImageOperation.class, "resetAllGIITestHooks"); + P.invoke(() -> GIIDeltaDUnitTest.resetSlowGII()); + R.invoke(() -> GIIDeltaDUnitTest.resetSlowGII()); + P.invoke(() -> InitialImageOperation.resetAllGIITestHooks()); + R.invoke(() -> InitialImageOperation.resetAllGIITestHooks()); changeUnfinishedOperationLimit(R, 10000); changeForceFullGII(R, false, false); changeForceFullGII(P, false, false); @@ -201,8 +201,8 @@ private void createConflictOperationsP2R3() { final DiskStoreID memberR = getMemberID(R); final long blocklist[] = {2,3}; - P.invoke(GIIDeltaDUnitTest.class, "slowGII", new Object[] {blocklist}); - R.invoke(GIIDeltaDUnitTest.class, "slowGII", new Object[] {blocklist}); + P.invoke(() -> GIIDeltaDUnitTest.slowGII(blocklist)); + R.invoke(() -> GIIDeltaDUnitTest.slowGII(blocklist)); AsyncInvocation async1 = doOnePutAsync(P, 2, "key1"); AsyncInvocation async2 = doOnePutAsync(R, 3, "key1"); @@ -213,8 +213,8 @@ private void createConflictOperationsP2R3() { waitForToVerifyRVV(R, memberR, 3, null, 0); // P's rvv=r2, gc=0 // new Object[] { memberP, 2, 3, 0, 0, false } - P.invoke(GIIDeltaDUnitTest.class, "resetSlowGII"); - R.invoke(GIIDeltaDUnitTest.class, "resetSlowGII"); + P.invoke(() -> GIIDeltaDUnitTest.resetSlowGII()); + R.invoke(() -> GIIDeltaDUnitTest.resetSlowGII()); // should wait for async calls to finish before going on checkAsyncCall(async1); @@ -237,7 +237,7 @@ private void createUnfinishedOperationsR4R5() { final long[] exceptionlist = {4,5}; // let r6 to succeed, r4,r5 to be blocked - R.invoke(GIIDeltaDUnitTest.class, "slowGII", new Object[] {exceptionlist}); + R.invoke(() -> GIIDeltaDUnitTest.slowGII(exceptionlist)); AsyncInvocation async1 = doOnePutAsync(R, 4, "key4"); waitForToVerifyRVV(R, memberR, 4, null, 0); // P's rvv=r4, gc=0 @@ -482,7 +482,7 @@ public void run() { // 2 waitForCallbackStarted(R, GIITestHookType.AfterRequestRVV); forceGC(R, 1); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterRequestRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterRequestRVV, true)); async3.join(MAX_WAIT); @@ -608,7 +608,7 @@ public void run() { checkIfFullGII(P, REGION_NAME, R_rvv_bytes, true); // let GII continue - P.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterReceivedRequestImage, true}); + P.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterReceivedRequestImage, true)); async3.join(MAX_WAIT); waitForToVerifyRVV(R, memberP, 7, null, 4); // R's rvv=p7, gc=4 @@ -772,7 +772,7 @@ public void testFullGIINotDorminatedByProviderRVVGC() throws Throwable { final long[] exceptionlist2 = {8}; // let p9 to succeed, p8 to be blocked - P.invoke(GIIDeltaDUnitTest.class, "slowGII", new Object[] {exceptionlist2}); + P.invoke(() -> GIIDeltaDUnitTest.slowGII(exceptionlist2)); AsyncInvocation async1 = doOneDestroyAsync(P, 8, "key1"); waitForToVerifyRVV(P, memberP, 8, null, 0); doOnePut(P, 9, "key3"); @@ -815,7 +815,7 @@ public void testUnfinishedOpsWithoutExceptionList() throws Throwable { VersionTag expect_tag = getVersionTag(R, "key5"); final long[] exceptionlist = {4,5}; - R.invoke(GIIDeltaDUnitTest.class, "slowGII", new Object[] {exceptionlist}); + R.invoke(() -> GIIDeltaDUnitTest.slowGII(exceptionlist)); AsyncInvocation async1 = doOnePutAsync(R, 4, "key4"); waitForToVerifyRVV(R, memberR, 4, null, 0); // P's rvv=r4, gc=0 @@ -906,9 +906,9 @@ public void run() { doOneDestroy(P, 4, "key2"); doOnePut(P, 5, "key1"); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.BeforeSavedReceivedRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.BeforeSavedReceivedRVV, true)); waitForCallbackStarted(R, GIITestHookType.AfterSavedReceivedRVV); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterSavedReceivedRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterSavedReceivedRVV, true)); async3.join(MAX_WAIT); waitForToVerifyRVV(R, memberP, 5, null, 0); // P's rvv=r5, gc=0 changeForceFullGII(R, true, true); @@ -959,9 +959,9 @@ public void run() { doOneDestroy(P, 4, "key2"); doOnePut(P, 5, "key1"); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterCalculatedUnfinishedOps, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterCalculatedUnfinishedOps, true)); waitForCallbackStarted(R, GIITestHookType.AfterSavedReceivedRVV); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterSavedReceivedRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterSavedReceivedRVV, true)); async3.join(MAX_WAIT); waitForToVerifyRVV(R, memberP, 5, null, 0); // P's rvv=r5, gc=0 verifyDeltaSizeFromStats(R, 2, 1); @@ -985,7 +985,7 @@ public void testHooks() throws Throwable { VersionTag expect_tag = getVersionTag(R, "key5"); final long[] exceptionlist = {4,5}; - R.invoke(GIIDeltaDUnitTest.class, "slowGII", new Object[] {exceptionlist}); + R.invoke(() -> GIIDeltaDUnitTest.slowGII(exceptionlist)); AsyncInvocation async1 = doOnePutAsync(R, 4, "key4"); waitForToVerifyRVV(R, memberR, 4, null, 0); // P's rvv=r4, gc=0 @@ -1119,46 +1119,46 @@ public void run() { // 1 waitForCallbackStarted(R, GIITestHookType.BeforeRequestRVV); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.BeforeRequestRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.BeforeRequestRVV, true)); // 2 waitForCallbackStarted(R, GIITestHookType.AfterRequestRVV); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterRequestRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterRequestRVV, true)); // 3 waitForCallbackStarted(R, GIITestHookType.AfterCalculatedUnfinishedOps); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterCalculatedUnfinishedOps, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterCalculatedUnfinishedOps, true)); // 4 waitForCallbackStarted(R, GIITestHookType.BeforeSavedReceivedRVV); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.BeforeSavedReceivedRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.BeforeSavedReceivedRVV, true)); // 5 waitForCallbackStarted(R, GIITestHookType.AfterSavedReceivedRVV); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterSavedReceivedRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterSavedReceivedRVV, true)); // 6 waitForCallbackStarted(R, GIITestHookType.AfterSentRequestImage); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterSentRequestImage, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterSentRequestImage, true)); // 7 waitForCallbackStarted(P, GIITestHookType.AfterReceivedRequestImage); - P.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterReceivedRequestImage, true}); + P.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterReceivedRequestImage, true)); // 8 waitForCallbackStarted(P, GIITestHookType.DuringPackingImage); - P.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.DuringPackingImage, true}); + P.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.DuringPackingImage, true)); // 9 waitForCallbackStarted(P, GIITestHookType.AfterSentImageReply); - P.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterSentImageReply, true}); + P.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterSentImageReply, true)); // 10 waitForCallbackStarted(R, GIITestHookType.AfterReceivedImageReply); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterReceivedImageReply, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterReceivedImageReply, true)); // 11 waitForCallbackStarted(R, GIITestHookType.DuringApplyDelta); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.DuringApplyDelta, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.DuringApplyDelta, true)); // 12 waitForCallbackStarted(R, GIITestHookType.BeforeCleanExpiredTombstones); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.BeforeCleanExpiredTombstones, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.BeforeCleanExpiredTombstones, true)); // 13 waitForCallbackStarted(R, GIITestHookType.AfterSavedRVVEnd); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterSavedRVVEnd, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterSavedRVVEnd, true)); async3.join(MAX_WAIT); @@ -1182,7 +1182,7 @@ public void run() { waitForToVerifyRVV(R, memberR, 6, exceptionlist, 0); // R's rvv=r6, gc=0 waitForToVerifyRVV(P, memberR, 6, exceptionlist, 0); // P's rvv=r6(3-6), gc=0 - P.invoke(InitialImageOperation.class, "resetAllGIITestHooks"); + P.invoke(() -> InitialImageOperation.resetAllGIITestHooks()); } /** @@ -1266,8 +1266,8 @@ public String description() { waitForToVerifyRVV(P, memberP, 7, null, 0); // P's rvv=p7, gc=0 // let GII continue - P.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.DuringPackingImage, false}); - P.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.DuringPackingImage, true}); + P.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.DuringPackingImage, false)); + P.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.DuringPackingImage, true)); WaitCriterion ev2 = new WaitCriterion() { public boolean done() { @@ -1316,7 +1316,7 @@ public String description() { waitToVerifyKey(R, "key5", generateValue(R)); VersionTag tag = getVersionTag(R, "key5"); assertTrue(expect_tag.equals(tag)); - // P.invoke(InitialImageOperation.class, "resetAllGIITestHooks"); + // P.invoke(() -> InitialImageOperation.resetAllGIITestHooks()); } /** @@ -1393,7 +1393,7 @@ public String description() { forceGC(P, 3); // let GII continue - P.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.DuringPackingImage, true}); + P.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.DuringPackingImage, true)); async3.join(MAX_WAIT*2); count = getDeltaGIICount(P); assertEquals(0, count); @@ -1581,7 +1581,7 @@ public void run() { waitForCallbackStarted(R, GIITestHookType.AfterReceivedImageReply); doOneClear(P, 8); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterReceivedImageReply, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterReceivedImageReply, true)); async3.getResult(MAX_WAIT); // clear() increased P's version with 1 to P8 @@ -1649,7 +1649,7 @@ public void run() { waitForCallbackStarted(R, GIITestHookType.AfterSavedReceivedRVV); doOneClear(P, 8); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterSavedReceivedRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterSavedReceivedRVV, true)); async3.join(MAX_WAIT); // clear() increased P's version with 1 to P8 @@ -1802,7 +1802,7 @@ public void run() { // kill and restart R closeCache(R); async3.join(MAX_WAIT); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterSavedReceivedRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterSavedReceivedRVV, true)); createDistributedRegion(R); waitForToVerifyRVV(P, memberP, 7, null, 0); // P's rvv=r8, gc=0 @@ -1868,7 +1868,7 @@ public void run() { // from P. doOnePut(P, 7, "key1"); - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.BeforeSavedReceivedRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.BeforeSavedReceivedRVV, true)); // Wait until the new RVV is applied waitForCallbackStarted(R, GIITestHookType.AfterSavedReceivedRVV); @@ -1878,7 +1878,7 @@ public void run() { destroyRegion(P); //Allow the GII to continue. - R.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterSavedReceivedRVV, true}); + R.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterSavedReceivedRVV, true)); async3.join(MAX_WAIT); @@ -1963,7 +1963,7 @@ public void afterProcessMessage(DistributionManager dm, DistributionMessage message) { if(message instanceof TombstoneMessage && ((TombstoneMessage) message).regionPath.contains(REGION_NAME)) { System.err.println("DAN DEBUG P has processed the tombstone message, allowing R to proceed with the GII"); - vmR.invoke(InitialImageOperation.class, "resetGIITestHook", new Object[] {GIITestHookType.AfterCalculatedUnfinishedOps, true}); + vmR.invoke(() -> InitialImageOperation.resetGIITestHook(GIITestHookType.AfterCalculatedUnfinishedOps, true)); DistributionMessageObserver.setInstance(null); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java index a590aef5fe4d..3268b68ade0f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java @@ -108,16 +108,12 @@ public void setUp() throws Exception { // client 2 VM client2 = host.getVM(3); - PORT1 = ((Integer)server1.invoke(HABug36773DUnitTest.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)server2.invoke(HABug36773DUnitTest.class, - "createServerCache")).intValue(); - client1.invoke(HABug36773DUnitTest.class, "disableShufflingOfEndpoints"); - client2.invoke(HABug36773DUnitTest.class, "disableShufflingOfEndpoints"); - client1.invoke(HABug36773DUnitTest.class, "createClientCache", - new Object[] { new Integer(PORT1), new Integer(PORT2) }); - client2.invoke(HABug36773DUnitTest.class, "createClientCache", - new Object[] { new Integer(PORT1), new Integer(PORT2) }); + PORT1 = ((Integer)server1.invoke(() -> HABug36773DUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)server2.invoke(() -> HABug36773DUnitTest.createServerCache())).intValue(); + client1.invoke(() -> HABug36773DUnitTest.disableShufflingOfEndpoints()); + client2.invoke(() -> HABug36773DUnitTest.disableShufflingOfEndpoints()); + client1.invoke(() -> HABug36773DUnitTest.createClientCache( new Integer(PORT1), new Integer(PORT2) )); + client2.invoke(() -> HABug36773DUnitTest.createClientCache( new Integer(PORT1), new Integer(PORT2) )); } @@ -136,24 +132,22 @@ public static void disableShufflingOfEndpoints() public void _testBug36773() throws Exception { //First create entries on both servers via the two client - client1.invoke(HABug36773DUnitTest.class, "createEntriesK1andK2"); - client2.invoke(HABug36773DUnitTest.class, "createEntriesK1andK2"); - client1.invoke(HABug36773DUnitTest.class, "registerKeysK1andK2"); - client2.invoke(HABug36773DUnitTest.class, "registerKeysK1andK2"); + client1.invoke(() -> HABug36773DUnitTest.createEntriesK1andK2()); + client2.invoke(() -> HABug36773DUnitTest.createEntriesK1andK2()); + client1.invoke(() -> HABug36773DUnitTest.registerKeysK1andK2()); + client2.invoke(() -> HABug36773DUnitTest.registerKeysK1andK2()); server1.invoke(checkSizeRegion(2)); server2.invoke(checkSizeRegion(2)); client1.invoke(checkSizeRegion(2)); client2.invoke(checkSizeRegion(2)); - server1.invoke(HABug36773DUnitTest.class, "waitOnTheKeyEntry"); - client1.invoke(HABug36773DUnitTest.class, - "acquireConnectionsAndPut", new Object[] {new Integer(PORT2)}); - client1.invoke(HABug36773DUnitTest.class, - "acquireConnectionsAndPut", new Object[] {new Integer(PORT1)}); - client2.invoke(HABug36773DUnitTest.class, "verifyEntries", new Object[] {new String(KEY2), new String (VALUE2)}); - server1.invoke(HABug36773DUnitTest.class, "notfiyThread"); - client2.invoke(HABug36773DUnitTest.class, "verifyEntries", new Object[] {new String(KEY1), new String (VALUE1)}); + server1.invoke(() -> HABug36773DUnitTest.waitOnTheKeyEntry()); + client1.invoke(() -> HABug36773DUnitTest.acquireConnectionsAndPut(new Integer(PORT2))); + client1.invoke(() -> HABug36773DUnitTest.acquireConnectionsAndPut(new Integer(PORT1))); + client2.invoke(() -> HABug36773DUnitTest.verifyEntries(new String(KEY2), new String (VALUE2))); + server1.invoke(() -> HABug36773DUnitTest.notfiyThread()); + client2.invoke(() -> HABug36773DUnitTest.verifyEntries(new String(KEY1), new String (VALUE1))); } @@ -360,11 +354,11 @@ public void run() @Override protected final void preTearDown() throws Exception { //close client - client1.invoke(HABug36773DUnitTest.class, "closeCache"); - client2.invoke(HABug36773DUnitTest.class, "closeCache"); + client1.invoke(() -> HABug36773DUnitTest.closeCache()); + client2.invoke(() -> HABug36773DUnitTest.closeCache()); //close server - server1.invoke(HABug36773DUnitTest.class, "closeCache"); - server2.invoke(HABug36773DUnitTest.class, "closeCache"); + server1.invoke(() -> HABug36773DUnitTest.closeCache()); + server2.invoke(() -> HABug36773DUnitTest.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java index 371d8f903aba..e98df038168d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java @@ -96,9 +96,9 @@ public void setUp() throws Exception { @Override protected final void preTearDown() throws Exception { - serverVM.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - client.invoke(HAOverflowMemObjectSizerDUnitTest.class, "closeCache"); - serverVM.invoke(HAOverflowMemObjectSizerDUnitTest.class, "closeCache"); + serverVM.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + client.invoke(() -> HAOverflowMemObjectSizerDUnitTest.closeCache()); + serverVM.invoke(() -> HAOverflowMemObjectSizerDUnitTest.closeCache()); } public static void cleanUp(Long limit) { @@ -181,22 +181,15 @@ public static void createCacheClient(Integer port1, String host) */ public void testSizerImplementationofMemCapacityControllerWhenNotificationBySubscriptionIsTrue() { - Integer port1 = (Integer)serverVM.invoke( - HAOverflowMemObjectSizerDUnitTest.class, "createCacheServer", - new Object[] { new Boolean(true) }); + Integer port1 = (Integer)serverVM.invoke(() -> HAOverflowMemObjectSizerDUnitTest.createCacheServer( new Boolean(true) )); serverPort1 = port1; - serverVM.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "15000" }); - - client.invoke(HAOverflowMemObjectSizerDUnitTest.class, - "createCacheClient", - new Object[] { port1, - NetworkUtils.getServerHostName(client.getHost()) }); - - serverVM.invoke(HAOverflowMemObjectSizerDUnitTest.class, "performPut", - new Object[] { new Long(0L), new Long(100L) }); - serverVM.invoke(HAOverflowMemObjectSizerDUnitTest.class, - "sizerTestForMemCapacityController", new Object[] { serverPort1 }); + serverVM.invoke(() -> ConflationDUnitTest.setIsSlowStart( "15000" )); + + client.invoke(() -> HAOverflowMemObjectSizerDUnitTest.createCacheClient( port1, + NetworkUtils.getServerHostName(client.getHost()) )); + + serverVM.invoke(() -> HAOverflowMemObjectSizerDUnitTest.performPut( new Long(0L), new Long(100L) )); + serverVM.invoke(() -> HAOverflowMemObjectSizerDUnitTest.sizerTestForMemCapacityController( serverPort1 )); } /** @@ -206,23 +199,16 @@ public void testSizerImplementationofMemCapacityControllerWhenNotificationBySubs * equal to the size calculated by memCapacity controller
*/ public void testSizerImplementationofMemCapacityControllerWhenNotificationBySubscriptionIsFalse() { - Integer port2 = (Integer)serverVM.invoke( - HAOverflowMemObjectSizerDUnitTest.class, "createCacheServer", - new Object[] { new Boolean(false) }); + Integer port2 = (Integer)serverVM.invoke(() -> HAOverflowMemObjectSizerDUnitTest.createCacheServer( new Boolean(false) )); serverPort2 = port2; - serverVM.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "15000" }); + serverVM.invoke(() -> ConflationDUnitTest.setIsSlowStart( "15000" )); - client.invoke(HAOverflowMemObjectSizerDUnitTest.class, - "createCacheClient", - new Object[] { port2, - NetworkUtils.getServerHostName(client.getHost()) }); + client.invoke(() -> HAOverflowMemObjectSizerDUnitTest.createCacheClient( port2, + NetworkUtils.getServerHostName(client.getHost()) )); - serverVM.invoke(HAOverflowMemObjectSizerDUnitTest.class, "performPut", - new Object[] { new Long(101L), new Long(200L) }); - serverVM.invoke(HAOverflowMemObjectSizerDUnitTest.class, - "sizerTestForMemCapacityController", new Object[] { serverPort2 }); + serverVM.invoke(() -> HAOverflowMemObjectSizerDUnitTest.performPut( new Long(101L), new Long(200L) )); + serverVM.invoke(() -> HAOverflowMemObjectSizerDUnitTest.sizerTestForMemCapacityController( serverPort2 )); } /** diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java index 3aeceec9dbc2..9343e605f0ff 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java @@ -61,8 +61,8 @@ public void setUp() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(MapClearGIIDUnitTest.class, "createCacheVM0"); - vm1.invoke(MapClearGIIDUnitTest.class, "createCacheVM1"); + vm0.invoke(() -> MapClearGIIDUnitTest.createCacheVM0()); + vm1.invoke(() -> MapClearGIIDUnitTest.createCacheVM1()); System.out.println("Cache created in successfully"); }*/ /* @@ -70,8 +70,8 @@ public void tearDown() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(MapClearGIIDUnitTest.class, "closeCache"); - vm1.invoke(MapClearGIIDUnitTest.class, "closeCache"); + vm0.invoke(() -> MapClearGIIDUnitTest.closeCache()); + vm1.invoke(() -> MapClearGIIDUnitTest.closeCache()); }*/ /* public static void createCacheVM0() throws Exception { @@ -180,7 +180,7 @@ public void testClearImageStateFlag() throws Throwable { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - //vm0.invoke(MapClearGIIDUnitTest.class, "createCacheVM0"); + //vm0.invoke(() -> MapClearGIIDUnitTest.createCacheVM0()); vm0.invoke(new CacheSerializableRunnable("createCacheVM0") { public void run2() throws CacheException @@ -220,8 +220,7 @@ public void run2() throws CacheException }); LogWriterUtils.getLogWriter().info("Cache created in VM1 successfully"); try { - AsyncInvocation asyncGII = vm0.invokeAsync(MapClearGIIDUnitTest.class, - "createRegionInVm0"); + AsyncInvocation asyncGII = vm0.invokeAsync(() -> MapClearGIIDUnitTest.createRegionInVm0()); // wait until vm0's gii has done 20 slow image sleeps (10ms*20 = 200ms) // before starting the clear vm0.invoke(new CacheSerializableRunnable("wait for sleeps") { @@ -238,7 +237,7 @@ public String description() { } }); // now that the gii has received some entries do the clear - vm1.invoke(MapClearGIIDUnitTest.class, "clearRegionInVm1"); + vm1.invoke(() -> MapClearGIIDUnitTest.clearRegionInVm1()); // wait for GII to complete ThreadUtils.join(asyncGII, 30 * 1000); if (asyncGII.exceptionOccurred()) { @@ -246,7 +245,7 @@ public String description() { Assert.fail("createRegionInVM0 failed", t); } assertTrue(vm0 - .invokeBoolean(MapClearGIIDUnitTest.class, "checkImageStateFlag")); + .invoke(() -> MapClearGIIDUnitTest.checkImageStateFlag())); if (asyncGII.exceptionOccurred()) { Assert.fail("asyncGII failed", asyncGII.getException()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java index 3f814d4a51ce..4889f0fc6087 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java @@ -98,10 +98,10 @@ public void testP2PDeltaPropagationEnableScopeDAck() throws Exception server2.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache",args); server3.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache",args); //only delta should get send to server2 and server3 - server1.invoke(P2PDeltaPropagationDUnitTest.class, "put"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.put()); Thread.sleep(5000); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "getOnDeltaEnabledServer"); - server3.invoke(P2PDeltaPropagationDUnitTest.class, "getOnDeltaEnabledServer"); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaEnabledServer()); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaEnabledServer()); } @@ -116,10 +116,10 @@ public void testP2PDeltaPropagationEnableScopeGlobal() throws Exception server1.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache",args); server2.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache",args); server3.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache",args); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "put"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.put()); Thread.sleep(5000); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "getOnDeltaEnabledServer"); - server3.invoke(P2PDeltaPropagationDUnitTest.class, "getOnDeltaEnabledServer"); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaEnabledServer()); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaEnabledServer()); } /* @@ -127,20 +127,17 @@ public void testP2PDeltaPropagationEnableScopeGlobal() throws Exception */ public void testP2PDACKInvalidDeltaException() throws Exception { - server1.invoke(P2PDeltaPropagationDUnitTest.class, - "createServerCache", new Object[] {Boolean.TRUE}); - server2.invoke(P2PDeltaPropagationDUnitTest.class, - "createServerCache",new Object[] {Boolean.TRUE}); - server3.invoke(P2PDeltaPropagationDUnitTest.class, - "createServerCache",new Object[] {Boolean.TRUE}); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.createServerCache(Boolean.TRUE)); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.createServerCache(Boolean.TRUE)); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.createServerCache(Boolean.TRUE)); //Delta apply should fail on server2 and server3 as values are not there - server2.invoke(P2PDeltaPropagationDUnitTest.class, "invalidate"); - server3.invoke(P2PDeltaPropagationDUnitTest.class, "destroy"); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "putDelta"); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.invalidate()); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.destroy()); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.putDelta()); Thread.sleep(5000); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "getOnDeltaEnabledWithInvalidate");//Full object - server3.invoke(P2PDeltaPropagationDUnitTest.class, "getOnDeltaEnabledWithDestroy"); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaEnabledWithInvalidate());//Full object + server3.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaEnabledWithDestroy()); } /* @@ -156,7 +153,7 @@ public void testP2PDeltaPropagationEnableDirectAckTrue() throws Exception server1.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache",args); put(); Thread.sleep(5000); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "getOnDeltaEnabledServer"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaEnabledServer()); ConnectionTable.threadWantsSharedResources(); } @@ -170,9 +167,9 @@ public void testP2PDeltaPropagationEnableScopeDNoAck()throws Exception Scope.DISTRIBUTED_NO_ACK, Boolean.FALSE }; server1.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache",args); server2.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache",args); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "put"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.put()); Thread.sleep(5000); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "getOnDeltaDisabledServer"); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaDisabledServer()); } @@ -181,12 +178,10 @@ public void testP2PDeltaPropagationEnableScopeDNoAck()throws Exception */ public void testP2PDeltaPropagationDisable() throws Exception { - server1.invoke(P2PDeltaPropagationDUnitTest.class, - "createServerCache", new Object[] {Boolean.FALSE}); - server2.invoke(P2PDeltaPropagationDUnitTest.class, - "createServerCache",new Object[] {Boolean.FALSE}); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "put"); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "getOnDeltaDisabledServer"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.createServerCache(Boolean.FALSE)); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.createServerCache(Boolean.FALSE)); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.put()); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaDisabledServer()); } /* @@ -205,12 +200,10 @@ public void testP2PDeltaPropagationEnableScopeDAckDataPolicyEmpty() server3.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache", args); // only delta should get send to server2 and server3 - server1.invoke(P2PDeltaPropagationDUnitTest.class, "put"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.put()); Thread.sleep(5000); - server2.invoke(P2PDeltaPropagationDUnitTest.class, - "getOnDeltaEnabledServer"); - server3.invoke(P2PDeltaPropagationDUnitTest.class, - "getOnDeltaEnabledServer"); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaEnabledServer()); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.getOnDeltaEnabledServer()); } /* @@ -229,17 +222,15 @@ public void testP2PDeltaPropagationEnableScopeDAckDataPolicyEmptyWithRegionsCrea server3.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache", args); /* clean flags */ - server1.invoke(P2PDeltaPropagationDUnitTest.class,"resetFlags"); - server2.invoke(P2PDeltaPropagationDUnitTest.class,"resetFlags"); - server3.invoke(P2PDeltaPropagationDUnitTest.class,"resetFlags"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.resetFlags()); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.resetFlags()); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.resetFlags()); // only delta should get send to server2 and server3 - server1.invoke(P2PDeltaPropagationDUnitTest.class, "create"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.create()); - server2.invoke(P2PDeltaPropagationDUnitTest.class, - "verifyNoFailurePeer"); - server3.invoke(P2PDeltaPropagationDUnitTest.class, - "verifyNoFailurePeer"); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.verifyNoFailurePeer()); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.verifyNoFailurePeer()); } public void testPeerWithEmptyRegionIterestPolicyALLReceivesNoDelta() throws Exception { @@ -260,12 +251,10 @@ public void testPeerWithEmptyRegionIterestPolicyALLReceivesNoDelta() throws Exce server3.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache", empty); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "put"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.put()); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "verifyDeltaReceived", - new Object[] { Integer.valueOf(3) }); - server3.invoke(P2PDeltaPropagationDUnitTest.class, "verifyNoDeltaReceived", - new Object[] { Integer.valueOf(3) }); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.verifyDeltaReceived( Integer.valueOf(3) )); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.verifyNoDeltaReceived( Integer.valueOf(3) )); } public void testPeerWithEmptyRegionDefaultIterestPolicyReceivesNoEvents() throws Exception { @@ -286,12 +275,10 @@ public void testPeerWithEmptyRegionDefaultIterestPolicyReceivesNoEvents() throws server3.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache", empty); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "put"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.put()); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "verifyDeltaReceived", - new Object[] { Integer.valueOf(3) }); - server3.invoke(P2PDeltaPropagationDUnitTest.class, "verifyNoDeltaReceived", - new Object[] { Integer.valueOf(0/* no events */) }); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.verifyDeltaReceived( Integer.valueOf(3) )); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.verifyNoDeltaReceived( Integer.valueOf(0/* no events */) )); } public void testPeerWithEmptyRegionAndNoCacheServerReceivesOnlyFullValue() throws Exception { @@ -319,12 +306,10 @@ public void testPeerWithEmptyRegionAndNoCacheServerReceivesOnlyFullValue() throw server3.invoke(P2PDeltaPropagationDUnitTest.class, "createServerCache", emptyWithoutServer); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "put"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.put()); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "verifyDeltaBytesReceived", - new Object[] { Integer.valueOf(2) }); - server3.invoke(P2PDeltaPropagationDUnitTest.class, "verifyDeltaBytesReceived", - new Object[] { Integer.valueOf(0) }); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.verifyDeltaBytesReceived( Integer.valueOf(2) )); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.verifyDeltaBytesReceived( Integer.valueOf(0) )); } public static void put() throws Exception @@ -423,9 +408,9 @@ public void setUp() throws Exception server2 = host.getVM(1); server3 = host.getVM(2); resetFlags(); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "resetFlags"); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "resetFlags"); - server3.invoke(P2PDeltaPropagationDUnitTest.class, "resetFlags"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.resetFlags()); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.resetFlags()); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.resetFlags()); } private Cache createCache(Properties props) throws Exception @@ -513,9 +498,9 @@ public void afterUpdate(EntryEvent event) { @Override protected final void preTearDown() throws Exception { closeCache(); - server1.invoke(P2PDeltaPropagationDUnitTest.class, "closeCache"); - server2.invoke(P2PDeltaPropagationDUnitTest.class, "closeCache"); - server3.invoke(P2PDeltaPropagationDUnitTest.class, "closeCache"); + server1.invoke(() -> P2PDeltaPropagationDUnitTest.closeCache()); + server2.invoke(() -> P2PDeltaPropagationDUnitTest.closeCache()); + server3.invoke(() -> P2PDeltaPropagationDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java index 55fed01df64c..558dd0b1c230 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java @@ -252,65 +252,41 @@ public static void clearMetadata() { // 2 peers 2 servers 1 accessor.No client.Should work without any exceptions. public void test_NoClient() { - member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); - member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "createPeer"); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "createPeer"); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPeer()); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPeer()); createAccessorServer(); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, - "clearMetadata"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, - "clearMetadata"); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, - "clearMetadata"); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, - "clearMetadata"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.clearMetadata()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.clearMetadata()); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.clearMetadata()); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.clearMetadata()); clearMetadata(); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, - "putIntoPartitionedRegions"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, - "putIntoPartitionedRegions"); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, - "putIntoPartitionedRegions"); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, - "putIntoPartitionedRegions"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoPartitionedRegions()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoPartitionedRegions()); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoPartitionedRegions()); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoPartitionedRegions()); putIntoPartitionedRegions(); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, - "getFromPartitionedRegions"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, - "getFromPartitionedRegions"); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, - "getFromPartitionedRegions"); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, - "getFromPartitionedRegions"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.getFromPartitionedRegions()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.getFromPartitionedRegions()); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.getFromPartitionedRegions()); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.getFromPartitionedRegions()); getFromPartitionedRegions(); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, - "verifyEmptyMetadata"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, - "verifyEmptyMetadata"); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, - "verifyEmptyMetadata"); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, - "verifyEmptyMetadata"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyEmptyMetadata()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyEmptyMetadata()); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyEmptyMetadata()); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyEmptyMetadata()); verifyEmptyMetadata(); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, - "verifyEmptyStaticData"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, - "verifyEmptyStaticData"); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, - "verifyEmptyStaticData"); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, - "verifyEmptyStaticData"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyEmptyStaticData()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyEmptyStaticData()); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyEmptyStaticData()); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyEmptyStaticData()); verifyEmptyStaticData(); } @@ -318,14 +294,12 @@ public void test_NoClient() { // 1 Client connected to 2 AccessorServers. Hence metadata should not be // fetched. public void test_ClientConnectedToAccessors() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createAccessorServer"); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createAccessorServer"); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createAccessorServer()); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createAccessorServer()); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "createPeer"); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPeer()); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "createPeer"); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPeer()); createClient(port0, port1); @@ -341,15 +315,12 @@ public void test_ClientConnectedToAccessors() { // 1 server 2 accesorservers 2 peers.i client connected to the server // Since only 1 server hence Metadata should not be fetched. public void test_ClientConnectedTo1Server() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "createPeer"); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "createPeer"); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPeer()); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPeer()); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, - "createAccessorServer"); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createAccessorServer()); createClient(port0); @@ -367,28 +338,20 @@ public void test_ClientConnectedTo1Server() { // Now verify that metadata has all 8 buckets info. // Now update and ensure the fetch service is never called. public void test_MetadataContents() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); - Integer port2 = (Integer)member2.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); - Integer port3 = (Integer)member3.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); + Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); + Integer port3 = (Integer)member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); createClient(port0, port1, port2, port3); putIntoPartitionedRegions(); getFromPartitionedRegions(); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); verifyMetadata(); updateIntoSinglePR(); @@ -400,22 +363,17 @@ public void test_MetadataContents() { // fetchservice has to be triggered. // Now put again from c2.There should be no hop at all. public void test_MetadataServiceCallAccuracy() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); - - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "createClient", - new Object[] { port0 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); + + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createClient( port0 )); createClient(port1); member2 - .invoke(PartitionedRegionSingleHopDUnitTest.class, "putIntoSinglePR"); + .invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoSinglePR()); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); final ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); cms.satisfyRefreshMetadata_TEST_ONLY(false); @@ -459,22 +417,17 @@ public String description() { } public void test_MetadataServiceCallAccuracy_FromDestroyOp() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 4 }); - - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "createClient", - new Object[] { port0 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 )); + + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createClient( port0 )); createClient(port1); member2 - .invoke(PartitionedRegionSingleHopDUnitTest.class, "putIntoSinglePR"); + .invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoSinglePR()); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); final ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); cms.satisfyRefreshMetadata_TEST_ONLY(false); @@ -500,22 +453,16 @@ public String description() { } public void test_MetadataServiceCallAccuracy_FromGetOp() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 4 }); - - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "createClient", - new Object[] { port0 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 )); + + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createClient( port0 )); createClient(port1); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, - "putIntoSinglePR"); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoSinglePR()); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); final ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); cms.satisfyRefreshMetadata_TEST_ONLY(false); @@ -552,18 +499,10 @@ public String description() { } public void test_SingleHopWithHA() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 8 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 8 }); - Integer port2 = (Integer)member2.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 8 }); - Integer port3 = (Integer)member3.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 8 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 8 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 8 )); + Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 8 )); + Integer port3 = (Integer)member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 8 )); createClient(port0, port1, port2, port3); final ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); cms.satisfyRefreshMetadata_TEST_ONLY(false); @@ -593,7 +532,7 @@ public String description() { Wait.waitForCriterion(wc, 60000, 1000, true); // kill server - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "stopServer"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer()); // again update for (int i = 1; i <= 16; i++) { @@ -605,19 +544,12 @@ public void test_SingleHopWithHAWithLocator() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.startLocatorInVM( port3 )); try { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServerWithLocator", - new Object[] { locator, 0, 8 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServerWithLocator", - new Object[] { locator, 0, 8 }); - Integer port2 = (Integer)member2.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServerWithLocator", - new Object[] { locator, 0, 8 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServerWithLocator( locator, 0, 8 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServerWithLocator( locator, 0, 8 )); + Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServerWithLocator( locator, 0, 8 )); createClientWithLocator(host0, port3); @@ -632,7 +564,7 @@ public void test_SingleHopWithHAWithLocator() { } // kill server - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "stopServer"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer()); // again update for (int i = 1; i <= 16; i++) { @@ -640,29 +572,23 @@ public void test_SingleHopWithHAWithLocator() { } } finally { - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopLocator()); } } public void test_NoMetadataServiceCall_ForGetOp() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 4 }); - - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "createClientWithoutPRSingleHopEnabled", - new Object[] { port0 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 )); + + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createClientWithoutPRSingleHopEnabled( port0 )); createClientWithoutPRSingleHopEnabled(port1); ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); cms.satisfyRefreshMetadata_TEST_ONLY(false); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, - "putIntoSinglePR"); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoSinglePR()); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); region.get(new Integer(0)); region.get(new Integer(1)); @@ -683,24 +609,19 @@ public void test_NoMetadataServiceCall_ForGetOp() { public void test_NoMetadataServiceCall() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 1, 4 }); - - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "createClientWithoutPRSingleHopEnabled", - new Object[] { port0 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 1, 4 )); + + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createClientWithoutPRSingleHopEnabled( port0 )); createClientWithoutPRSingleHopEnabled(port1); member2 - .invoke(PartitionedRegionSingleHopDUnitTest.class, "putIntoSinglePR"); + .invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoSinglePR()); ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); cms.satisfyRefreshMetadata_TEST_ONLY(false); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); region.put(new Integer(0), "create0"); @@ -737,22 +658,17 @@ public void test_NoMetadataServiceCall() { } public void test_NoMetadataServiceCall_ForDestroyOp() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 0, 4 }); - - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "createClientWithoutPRSingleHopEnabled", - new Object[] { port0 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 )); + + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createClientWithoutPRSingleHopEnabled( port0 )); createClientWithoutPRSingleHopEnabled(port1); member2 - .invoke(PartitionedRegionSingleHopDUnitTest.class, "putIntoSinglePR"); + .invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoSinglePR()); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "printView"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView()); ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); cms.satisfyRefreshMetadata_TEST_ONLY(false); region.destroy(new Integer(0)); @@ -764,18 +680,10 @@ public void test_NoMetadataServiceCall_ForDestroyOp() { } public void testServerLocationRemovalThroughPing() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port2 = (Integer)member2.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port3 = (Integer)member3.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port3 = (Integer)member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); createClient(port0, port1, port2, port3); putIntoPartitionedRegions(); getFromPartitionedRegions(); @@ -794,8 +702,8 @@ public void testServerLocationRemovalThroughPing() { for (Entry entry : prMetaData.getBucketServerLocationsMap_TEST_ONLY().entrySet()) { assertEquals(4, ((List)entry.getValue()).size()); } - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "stopServer"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "stopServer"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer()); Wait.pause(5000);//make sure that ping detects the dead servers getFromPartitionedRegions(); verifyDeadServer(regionMetaData, customerRegion, port0, port1); @@ -805,18 +713,10 @@ public void testServerLocationRemovalThroughPing() { public void testMetadataFetchOnlyThroughFunctions() { //Workaround for 52004 IgnoredException.addIgnoredException("InternalFunctionInvocationTargetException"); - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port2 = (Integer)member2.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port3 = (Integer)member3.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port3 = (Integer)member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); createClient(port0, port1, port2, port3); executeFunctions(); ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); @@ -870,18 +770,10 @@ public String description() { } public void testMetadataFetchOnlyThroughputAll() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port2 = (Integer)member2.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port3 = (Integer)member3.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port3 = (Integer)member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); createClient(port0, port1, port2, port3); putAll(); ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); @@ -916,24 +808,16 @@ public String description() { @Ignore("Bug 47950") public void DISABLED_testMetadataIsSameOnAllServersAndClients() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port2 = (Integer)member2.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); - Integer port3 = (Integer)member3.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 3, 4 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); + Integer port3 = (Integer)member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 )); createClient(port0, port1, port2, port3); put(); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService(); @@ -958,21 +842,21 @@ public String description() { for (Entry entry : clientMap.entrySet()) { assertEquals(4, ((List)entry.getValue()).size()); } - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "stopServer"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "stopServer"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer()); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "startServerOnPort", new Object[] { port0 }); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "startServerOnPort", new Object[] { port1 }); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.startServerOnPort( port0 )); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.startServerOnPort( port1 )); put(); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); cms = ((GemFireCacheImpl)cache).getClientMetadataService(); @@ -1024,16 +908,16 @@ public String description() { assertEquals(4, ((List)entry.getValue()).size()); } - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "closeCache"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "closeCache"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); -// member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "createServerOnPort", new Object[] {3,4,port0 }); -// member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "createServerOnPort", new Object[] {3,4,port1 }); +// member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServerOnPort(3,4,port0 )); +// member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServerOnPort(3,4,port1 )); put(); member2.invoke(new CacheSerializableRunnable("aba") { @Override @@ -1053,10 +937,10 @@ public void run2() throws CacheException { } }); -// member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); -// member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); +// member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); +// member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); cms = ((GemFireCacheImpl)cache).getClientMetadataService(); cms.getClientPRMetadata((LocalRegion)region); @@ -1085,10 +969,10 @@ public String description() { public boolean done() { try { - //member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{fclientMap}); - //member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{fclientMap}); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{fclientMap}); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{fclientMap}); + //member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(fclientMap)); + //member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(fclientMap)); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(fclientMap)); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(fclientMap)); } catch (Exception e) { LogWriterUtils.getLogWriter().info("verification failed", e); return false; @@ -1104,12 +988,8 @@ public String description() { } public void testMetadataIsSameOnAllServersAndClientsHA() { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 2, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createServer", - new Object[] { 2, 4 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 2, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 2, 4 )); createClient(port0, port1, port0, port1); put(); @@ -1166,17 +1046,17 @@ public String description() { for (Entry entry : clientMap.entrySet()) { assertEquals(2, ((List)entry.getValue()).size()); } - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "stopServer"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer()); put(); cms = ((GemFireCacheImpl)cache).getClientMetadataService(); cms.getClientPRMetadata((LocalRegion)region); - //member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "verifyMetadata", new Object[]{clientMap}); + //member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); assertEquals(4/*numBuckets*/, clientMap.size()); for (Entry entry : clientMap.entrySet()) { @@ -1220,37 +1100,29 @@ public String description() { // This test is disabled due to intermittent failures in unit test runs // Please see ticket #52203 public void disabledtestClientMetadataForPersistentPrs() throws Exception { - Integer port0 = (Integer)member0.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createPersistentPrsAndServer", - new Object[] { 3, 4 }); - Integer port1 = (Integer)member1.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createPersistentPrsAndServer", - new Object[] { 3, 4 }); - Integer port2 = (Integer)member2.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createPersistentPrsAndServer", - new Object[] { 3, 4 }); - Integer port3 = (Integer)member3.invoke( - PartitionedRegionSingleHopDUnitTest.class, "createPersistentPrsAndServer", - new Object[] { 3, 4 }); + Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServer( 3, 4 )); + Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServer( 3, 4 )); + Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServer( 3, 4 )); + Integer port3 = (Integer)member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServer( 3, 4 )); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "putIntoPartitionedRegions"); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoPartitionedRegions()); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "waitForLocalBucketsCreation", new Object[]{4}); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4)); createClient(port0, port1, port2, port3); fetchAndValidateMetadata(); - member0.invoke(PartitionedRegionSingleHopDUnitTest.class, "closeCache"); - member1.invoke(PartitionedRegionSingleHopDUnitTest.class, "closeCache"); - member2.invoke(PartitionedRegionSingleHopDUnitTest.class, "closeCache"); - member3.invoke(PartitionedRegionSingleHopDUnitTest.class, "closeCache"); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); Wait.pause(1000); //let client detect that servers are dead through ping - AsyncInvocation m3 = member3.invokeAsync(PartitionedRegionSingleHopDUnitTest.class, "createPersistentPrsAndServerOnPort",new Object[] { 3, 4,port3 }); - AsyncInvocation m2 = member2.invokeAsync(PartitionedRegionSingleHopDUnitTest.class, "createPersistentPrsAndServerOnPort",new Object[] { 3, 4,port2 }); - AsyncInvocation m1 = member1.invokeAsync(PartitionedRegionSingleHopDUnitTest.class, "createPersistentPrsAndServerOnPort",new Object[] { 3, 4,port1 }); - AsyncInvocation m0 = member0.invokeAsync(PartitionedRegionSingleHopDUnitTest.class, "createPersistentPrsAndServerOnPort",new Object[] { 3, 4,port0 }); + AsyncInvocation m3 = member3.invokeAsync(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServerOnPort( 3, 4,port3 )); + AsyncInvocation m2 = member2.invokeAsync(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServerOnPort( 3, 4,port2 )); + AsyncInvocation m1 = member1.invokeAsync(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServerOnPort( 3, 4,port1 )); + AsyncInvocation m0 = member0.invokeAsync(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServerOnPort( 3, 4,port0 )); m3.join(); m2.join(); m1.join(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java index 87738b8002bd..5c9e643fa2b8 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java @@ -128,10 +128,10 @@ public void setUp() throws Exception { @Override protected final void preTearDownCacheTestCase() throws Exception { // close the clients first - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, "closeCache"); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, "closeCache"); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, "closeCache"); - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, "closeCache"); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCache()); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCache()); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCache()); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCache()); closeCache(); } @@ -179,16 +179,12 @@ public void test_SingleHopWith2ServerGroup() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); setHonourServerGroupsInPRSingleHop(); createClientWithLocator(host0, port3, "group1"); @@ -205,7 +201,7 @@ public void test_SingleHopWith2ServerGroup() { resetHonourServerGroupsInPRSingleHop(); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -213,16 +209,12 @@ public void test_SingleHopWith2ServerGroup2() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1" }); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1" )); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); setHonourServerGroupsInPRSingleHop(); createClientWithLocator(host0, port3, "group1"); @@ -239,7 +231,7 @@ public void test_SingleHopWith2ServerGroup2() { resetHonourServerGroupsInPRSingleHop(); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -247,16 +239,12 @@ public void test_SingleHopWith2ServerGroup2WithoutSystemProperty() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1" }); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1" )); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); createClientWithLocator(host0, port3, "group1"); @@ -268,7 +256,7 @@ public void test_SingleHopWith2ServerGroup2WithoutSystemProperty() { verifyMetadata(4,3); } finally{ - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -276,16 +264,12 @@ public void test_SingleHopWithServerGroupAccessor() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 0,2, 8, "group1" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 0,2, 8, "group1" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); setHonourServerGroupsInPRSingleHop(); createClientWithLocator(host0, port3, "group1"); @@ -301,7 +285,7 @@ public void test_SingleHopWithServerGroupAccessor() { resetHonourServerGroupsInPRSingleHop(); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -309,19 +293,15 @@ public void test_SingleHopWithServerGroupOneServerInTwoGroups() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100, - 2, 8, "group1" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100, - 2, 8, "group1" }); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100, - 2, 8, "group1,group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100, + 2, 8, "group1" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100, + 2, 8, "group1" )); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100, + 2, 8, "group1,group2" )); setHonourServerGroupsInPRSingleHop(); createClientWithLocator(host0, port3, "group1"); @@ -337,8 +317,7 @@ public void test_SingleHopWithServerGroupOneServerInTwoGroups() { resetHonourServerGroupsInPRSingleHop(); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } @@ -348,16 +327,12 @@ public void test_SingleHopWithServerGroupWithOneDefaultServer() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "" )); setHonourServerGroupsInPRSingleHop(); createClientWithLocator(host0, port3, "group1"); @@ -373,7 +348,7 @@ public void test_SingleHopWithServerGroupWithOneDefaultServer() { resetHonourServerGroupsInPRSingleHop(); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -381,16 +356,12 @@ public void test_SingleHopWithServerGroupClientServerGroupNull() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group3" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group3" )); setHonourServerGroupsInPRSingleHop(); createClientWithLocator(host0, port3, ""); @@ -405,8 +376,7 @@ public void test_SingleHopWithServerGroupClientServerGroupNull() { resetHonourServerGroupsInPRSingleHop(); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -414,46 +384,36 @@ public void test_SingleHopWithServerGroupTwoClientServerGroup() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "setHonourServerGroupsInPRSingleHop", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.setHonourServerGroupsInPRSingleHop()); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createClientWithLocator", new Object[] {host0,port3,"group1"}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createClientWithLocator(host0,port3,"group1")); setHonourServerGroupsInPRSingleHop(); createClientWithLocator(host0, port3, ""); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "putIntoPartitionedRegions", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.putIntoPartitionedRegions()); putIntoPartitionedRegions(); getFromPartitionedRegions(); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "getFromPartitionedRegions", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.getFromPartitionedRegions()); try { verifyMetadata(4, 2); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "verifyMetadata", new Object[] {new Integer(4),new Integer(1)}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.verifyMetadata(new Integer(4),new Integer(1))); } finally { resetHonourServerGroupsInPRSingleHop(); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "resetHonourServerGroupsInPRSingleHop", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.resetHonourServerGroupsInPRSingleHop()); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -461,43 +421,33 @@ public void test_SingleHopWithServerGroupTwoClientServerGroup2() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1,group2" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1,group2" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "setHonourServerGroupsInPRSingleHop", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.setHonourServerGroupsInPRSingleHop()); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createClientWithLocator", new Object[] {host0,port3,"group1"}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createClientWithLocator(host0,port3,"group1")); setHonourServerGroupsInPRSingleHop(); createClientWithLocator(host0, port3, "group2"); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "putIntoPartitionedRegions", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.putIntoPartitionedRegions()); putIntoPartitionedRegions(); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "getFromPartitionedRegions", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.getFromPartitionedRegions()); getFromPartitionedRegions(); try { verifyMetadata(4, 2); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "verifyMetadata", new Object[] {new Integer(4),new Integer(1)}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.verifyMetadata(new Integer(4),new Integer(1))); } finally { resetHonourServerGroupsInPRSingleHop(); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "resetHonourServerGroupsInPRSingleHop", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.resetHonourServerGroupsInPRSingleHop()); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -505,38 +455,30 @@ public void test_SingleHopWithServerGroupTwoClientOneWithOneWithoutServerGroup() int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1,group2" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1,group2" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createClientWithLocator", new Object[] {host0,port3,"group1"}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createClientWithLocator(host0,port3,"group1")); setHonourServerGroupsInPRSingleHop(); createClientWithLocator(host0, port3, "group2"); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "putIntoPartitionedRegions", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.putIntoPartitionedRegions()); putIntoPartitionedRegions(); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "getFromPartitionedRegions", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.getFromPartitionedRegions()); getFromPartitionedRegions(); try { verifyMetadata(4, 2); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "verifyMetadata", new Object[] {new Integer(4),new Integer(2)}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.verifyMetadata(new Integer(4),new Integer(2))); } finally { resetHonourServerGroupsInPRSingleHop(); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -544,43 +486,33 @@ public void test_SingleHopWithServerGroup2ClientInOneVMServerGroup() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup2Regions", new Object[] { locator, 100,2, 8, "group1,group2" }); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup2Regions", new Object[] { locator, 100,2, 8, "group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup2Regions( locator, 100,2, 8, "group1,group2" )); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup2Regions( locator, 100,2, 8, "group2" )); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "setHonourServerGroupsInPRSingleHop", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.setHonourServerGroupsInPRSingleHop()); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "create2ClientWithLocator", new Object[] {host0,port3,"group1",""}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.create2ClientWithLocator(host0,port3,"group1","")); setHonourServerGroupsInPRSingleHop(); create2ClientWithLocator(host0, port3, "group2","group1"); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "putIntoPartitionedRegions2Client", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.putIntoPartitionedRegions2Client()); putIntoPartitionedRegions2Client(); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "getFromPartitionedRegions2Client", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.getFromPartitionedRegions2Client()); getFromPartitionedRegions2Client(); try { verifyMetadataFor2ClientsInOneVM(8, 2, 1); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "verifyMetadataFor2ClientsInOneVM", new Object[] {new Integer(8),new Integer(1), new Integer(2)}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.verifyMetadataFor2ClientsInOneVM(new Integer(8),new Integer(1), new Integer(2))); } finally { resetHonourServerGroupsInPRSingleHop(); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "resetHonourServerGroupsInPRSingleHop", new Object[] {}); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.resetHonourServerGroupsInPRSingleHop()); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } @@ -588,18 +520,14 @@ public void test_SingleHopWithServerGroupColocatedRegionsInDifferentGroup() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); final String host0 = NetworkUtils.getServerHostName(member3.getHost()); final String locator = host0 + "[" + port3 + "]"; - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "startLocatorInVM", new Object[] { port3 }); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.startLocatorInVM( port3 )); try { - member0.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group1,group2" }); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group1,group2" )); - member1.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group2" }); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group2" )); - member2.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "createServerWithLocatorAndServerGroup", new Object[] { locator, 100,2, 8, "group3" }); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.createServerWithLocatorAndServerGroup( locator, 100,2, 8, "group3" )); setHonourServerGroupsInPRSingleHop(); createClientWith3PoolLocator(host0, port3, "group2","group1",""); @@ -612,8 +540,7 @@ public void test_SingleHopWithServerGroupColocatedRegionsInDifferentGroup() { resetHonourServerGroupsInPRSingleHop(); } } finally { - member3.invoke(PartitionedRegionSingleHopWithServerGroupDUnitTest.class, - "stopLocator"); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.stopLocator()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java index 7fd0c162f1bb..ba8fd6648733 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java @@ -71,8 +71,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllDAckDUnitTest.class, "createCacheForVM0"); - vm1.invoke(PutAllDAckDUnitTest.class, "createCacheForVM1"); + vm0.invoke(() -> PutAllDAckDUnitTest.createCacheForVM0()); + vm1.invoke(() -> PutAllDAckDUnitTest.createCacheForVM1()); LogWriterUtils.getLogWriter().fine("Cache created successfully"); } @@ -81,8 +81,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllDAckDUnitTest.class, "closeCache"); - vm1.invoke(PutAllDAckDUnitTest.class, "closeCache"); + vm0.invoke(() -> PutAllDAckDUnitTest.closeCache()); + vm1.invoke(() -> PutAllDAckDUnitTest.closeCache()); } public static void createCacheForVM0() throws Exception { @@ -124,8 +124,8 @@ public void testputAllRemoteVM(){ objArr[0] = ""+i; vm0.invoke(PutAllDAckDUnitTest.class, "putMethod", objArr); } - vm0.invoke(PutAllDAckDUnitTest.class, "putAllMethod"); - flag = vm1.invokeBoolean(PutAllDAckDUnitTest.class,"getFlagVM1"); + vm0.invoke(() -> PutAllDAckDUnitTest.putAllMethod()); + flag = vm1.invoke(() -> PutAllDAckDUnitTest.getFlagVM1()); vm1.invoke(new CacheSerializableRunnable("temp1"){ public void run2() throws CacheException{ diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java index c8f0d390f114..8326ec59168f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java @@ -87,8 +87,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllGlobalDUnitTest.class, "createCacheForVM0"); - vm1.invoke(PutAllGlobalDUnitTest.class, "createCacheForVM1"); + vm0.invoke(() -> PutAllGlobalDUnitTest.createCacheForVM0()); + vm1.invoke(() -> PutAllGlobalDUnitTest.createCacheForVM1()); LogWriterUtils.getLogWriter().fine("Cache created successfully"); } @@ -97,8 +97,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(PutAllGlobalDUnitTest.class, "closeCache"); - vm1.invoke(PutAllGlobalDUnitTest.class, "closeCache"); + vm0.invoke(() -> PutAllGlobalDUnitTest.closeCache()); + vm1.invoke(() -> PutAllGlobalDUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } @@ -156,9 +156,9 @@ public void testputAllGlobalRemoteVM() throws Throwable { VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - final int socketPort = vm0.invokeInt(this.getClass(), "openSocket"); + final int socketPort = vm0.invoke(() -> this.openSocket()); - AsyncInvocation async1 = vm0.invokeAsync(this.getClass(),"putAllMethod"); + AsyncInvocation async1 = vm0.invokeAsync(() -> this.putAllMethod()); AsyncInvocation async2 = vm1.invokeAsync( new CacheSerializableRunnable("put from another vm") { public void run2() throws CacheException { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java index 9184d947d5c5..5f51cbd9cf4d 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java @@ -68,8 +68,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(RemoveAllDAckDUnitTest.class, "createCacheForVM0"); - vm1.invoke(RemoveAllDAckDUnitTest.class, "createCacheForVM1"); + vm0.invoke(() -> RemoveAllDAckDUnitTest.createCacheForVM0()); + vm1.invoke(() -> RemoveAllDAckDUnitTest.createCacheForVM1()); LogWriterUtils.getLogWriter().fine("Cache created successfully"); } @@ -78,8 +78,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(RemoveAllDAckDUnitTest.class, "closeCache"); - vm1.invoke(RemoveAllDAckDUnitTest.class, "closeCache"); + vm0.invoke(() -> RemoveAllDAckDUnitTest.closeCache()); + vm1.invoke(() -> RemoveAllDAckDUnitTest.closeCache()); } public static void createCacheForVM0() throws Exception { @@ -121,8 +121,8 @@ public void testRemoveAllRemoteVM() { objArr[0] = ""+i; vm0.invoke(RemoveAllDAckDUnitTest.class, "putMethod", objArr); } - vm0.invoke(RemoveAllDAckDUnitTest.class, "removeAllMethod"); - flag = vm1.invokeBoolean(RemoveAllDAckDUnitTest.class,"getFlagVM1"); + vm0.invoke(() -> RemoveAllDAckDUnitTest.removeAllMethod()); + flag = vm1.invoke(() -> RemoveAllDAckDUnitTest.getFlagVM1()); assertEquals(true, flag); vm1.invoke(new CacheSerializableRunnable("temp1"){ diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java index 4b9216157c7a..5f60779181da 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java @@ -64,8 +64,8 @@ public void setUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(RemoveDAckDUnitTest.class, "createCacheVM0"); - vm1.invoke(RemoveDAckDUnitTest.class, "createCacheVM1"); + vm0.invoke(() -> RemoveDAckDUnitTest.createCacheVM0()); + vm1.invoke(() -> RemoveDAckDUnitTest.createCacheVM1()); LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } @@ -74,8 +74,8 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - vm0.invoke(RemoveDAckDUnitTest.class, "closeCache"); - vm1.invoke(RemoveDAckDUnitTest.class, "closeCache"); + vm0.invoke(() -> RemoveDAckDUnitTest.closeCache()); + vm1.invoke(() -> RemoveDAckDUnitTest.closeCache()); } public static void createCacheVM0(){ @@ -141,7 +141,7 @@ public void run2() throws CacheException{ objArr[0] = new Integer(i); vm0.invoke(RemoveDAckDUnitTest.class,"removeMethod", objArr); - int Regsize = vm1.invokeInt(RemoveDAckDUnitTest.class, "sizeMethod"); + int Regsize = vm1.invoke(() -> RemoveDAckDUnitTest.sizeMethod()); assertEquals(3, Regsize); }//end of test case diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java index 5d6131c71598..c25c24d4b0cc 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java @@ -69,16 +69,16 @@ public void setUp() throws Exception { Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); - vm0.invoke(RemoveGlobalDUnitTest.class, "createCache"); - vm1.invoke(RemoveGlobalDUnitTest.class, "createCache"); + vm0.invoke(() -> RemoveGlobalDUnitTest.createCache()); + vm1.invoke(() -> RemoveGlobalDUnitTest.createCache()); } @Override protected final void preTearDown() throws Exception { - vm0.invoke(RemoveGlobalDUnitTest.class, "resetFlag"); - vm1.invoke(RemoveGlobalDUnitTest.class, "resetFlag"); - vm0.invoke(RemoveGlobalDUnitTest.class, "closeCache"); - vm1.invoke(RemoveGlobalDUnitTest.class, "closeCache"); + vm0.invoke(() -> RemoveGlobalDUnitTest.resetFlag()); + vm1.invoke(() -> RemoveGlobalDUnitTest.resetFlag()); + vm0.invoke(() -> RemoveGlobalDUnitTest.closeCache()); + vm1.invoke(() -> RemoveGlobalDUnitTest.closeCache()); } public static void resetFlag() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java index 4b016a4c10e4..01522bff9294 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java @@ -114,10 +114,10 @@ public void setUp() throws Exception { @Override protected final void preTearDownCacheTestCase() throws Exception { // close the clients first - member0.invoke(SingleHopStatsDUnitTest.class, "closeCache"); - member1.invoke(SingleHopStatsDUnitTest.class, "closeCache"); - member2.invoke(SingleHopStatsDUnitTest.class, "closeCache"); - member3.invoke(SingleHopStatsDUnitTest.class, "closeCache"); + member0.invoke(() -> SingleHopStatsDUnitTest.closeCache()); + member1.invoke(() -> SingleHopStatsDUnitTest.closeCache()); + member2.invoke(() -> SingleHopStatsDUnitTest.closeCache()); + member3.invoke(() -> SingleHopStatsDUnitTest.closeCache()); closeCache(); } @@ -150,34 +150,20 @@ public void testClientStatsPR(){ VM server3 = member2; VM client1 = member3; - Integer port0 = (Integer)member0.invoke( - SingleHopStatsDUnitTest.class, "createServerForStats", - new Object[] { 0, 113,"No_Colocation"}); - Integer port1 = (Integer)member1.invoke( - SingleHopStatsDUnitTest.class, "createServerForStats", - new Object[] { 0, 113,"No_Colocation"}); - Integer port2 = (Integer)member2.invoke( - SingleHopStatsDUnitTest.class, "createServerForStats", - new Object[] { 0, 113,"No_Colocation"}); - client1.invoke( - SingleHopStatsDUnitTest.class, "createClient", - new Object[] {port0, port1, port2,"No_Colocation"}); + Integer port0 = (Integer)member0.invoke(() -> SingleHopStatsDUnitTest.createServerForStats( 0, 113,"No_Colocation")); + Integer port1 = (Integer)member1.invoke(() -> SingleHopStatsDUnitTest.createServerForStats( 0, 113,"No_Colocation")); + Integer port2 = (Integer)member2.invoke(() -> SingleHopStatsDUnitTest.createServerForStats( 0, 113,"No_Colocation")); + client1.invoke(() -> SingleHopStatsDUnitTest.createClient(port0, port1, port2,"No_Colocation")); createClient(port0, port1, port2, "No_Colocation"); - client1.invoke( - SingleHopStatsDUnitTest.class, "createPR", - new Object[] {"FirstClient", "No_Colocation"}); + client1.invoke(() -> SingleHopStatsDUnitTest.createPR("FirstClient", "No_Colocation")); createPR("SecondClient", "No_Colocation"); - client1.invoke( - SingleHopStatsDUnitTest.class, "getPR", - new Object[] {"FirstClient", "No_Colocation"}); + client1.invoke(() -> SingleHopStatsDUnitTest.getPR("FirstClient", "No_Colocation")); getPR("SecondClient", "No_Colocation"); - client1.invoke( - SingleHopStatsDUnitTest.class, "updatePR", - new Object[] {"FirstClient", "No_Colocation"}); + client1.invoke(() -> SingleHopStatsDUnitTest.updatePR("FirstClient", "No_Colocation")); } public void testClientStatsColocationPR(){ @@ -186,27 +172,15 @@ public void testClientStatsColocationPR(){ VM server3 = member2; VM client1 = member3; - Integer port0 = (Integer)member0.invoke( - SingleHopStatsDUnitTest.class, "createServerForStats", - new Object[] { 0, 4, "Colocation" }); - Integer port1 = (Integer)member1.invoke( - SingleHopStatsDUnitTest.class, "createServerForStats", - new Object[] { 0, 4, "Colocation" }); - Integer port2 = (Integer)member2.invoke( - SingleHopStatsDUnitTest.class, "createServerForStats", - new Object[] { 0, 4, "Colocation"}); - client1.invoke( - SingleHopStatsDUnitTest.class, "createClient", - new Object[] {port0, port1, port2, "Colocation"}); + Integer port0 = (Integer)member0.invoke(() -> SingleHopStatsDUnitTest.createServerForStats( 0, 4, "Colocation" )); + Integer port1 = (Integer)member1.invoke(() -> SingleHopStatsDUnitTest.createServerForStats( 0, 4, "Colocation" )); + Integer port2 = (Integer)member2.invoke(() -> SingleHopStatsDUnitTest.createServerForStats( 0, 4, "Colocation")); + client1.invoke(() -> SingleHopStatsDUnitTest.createClient(port0, port1, port2, "Colocation")); createClient(port0, port1, port2, "Colocation"); - client1.invoke( - SingleHopStatsDUnitTest.class, "createPR", - new Object[] {"FirstClient", "Colocation"}); + client1.invoke(() -> SingleHopStatsDUnitTest.createPR("FirstClient", "Colocation")); - client1.invoke( - SingleHopStatsDUnitTest.class, "getPR", - new Object[] {"FirstClient", "Colocation"}); + client1.invoke(() -> SingleHopStatsDUnitTest.getPR("FirstClient", "Colocation")); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java index e47892e1e6bd..43fc6a5976fe 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java @@ -392,7 +392,7 @@ private void resetVM() { private boolean doVerifyConnected() { Host host = Host.getHost(0); VM vm = host.getVM(0); - Object o = vm.invoke(this.getClass(), "verifyConnected"); + Object o = vm.invoke(() -> this.verifyConnected()); return ((Boolean)o).booleanValue(); } @@ -424,7 +424,7 @@ protected static Boolean verifyConnected() { private boolean doVerifyDisconnected() { Host host = Host.getHost(0); VM vm = host.getVM(0); - return ((Boolean)vm.invoke(this.getClass(), "verifyDisconnected")) + return ((Boolean)vm.invoke(() -> this.verifyDisconnected())) .booleanValue(); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java index 74f5e7fd17e5..8a83417b00a0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java @@ -73,8 +73,8 @@ public void setUp() throws Exception { @Override protected final void preTearDown() throws Exception { closeCache(); - server0.invoke(Bug51193DUnitTest.class, "closeCache"); - client0.invoke(Bug51193DUnitTest.class, "closeCache"); + server0.invoke(() -> Bug51193DUnitTest.closeCache()); + client0.invoke(() -> Bug51193DUnitTest.closeCache()); } public static void closeCache() { @@ -172,17 +172,15 @@ public static void doPutsAndGet(Integer num) { public void doTest(boolean createPR, int timeout, String mode) throws Throwable { // start server - int port = (Integer) server0.invoke(Bug51193DUnitTest.class, - "createServerCache", new Object[] { createPR }); + int port = (Integer) server0.invoke(() -> Bug51193DUnitTest.createServerCache( createPR )); // start client - client0.invoke(Bug51193DUnitTest.class, "createClientCache", new Object[] { - client0.getHost().getHostName(), port, timeout }); + client0.invoke(() -> Bug51193DUnitTest.createClientCache( + client0.getHost().getHostName(), port, timeout )); // do puts and get server0 - .invoke(Bug51193DUnitTest.class, "doPutsAndGet", new Object[] { 10 }); + .invoke(() -> Bug51193DUnitTest.doPutsAndGet( 10 )); // execute function & verify timeout has been received at server. - client0.invoke(Bug51193DUnitTest.class, - "executeFunction", new Object[] { mode, timeout }); + client0.invoke(() -> Bug51193DUnitTest.executeFunction( mode, timeout )); } public void testExecuteFunctionReadsDefaultTimeout() throws Throwable { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java index 3890498a8faf..800b33bf83d5 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java @@ -72,8 +72,7 @@ public void test_Bug_43126_Function_Not_Registered() throws InterruptedException { createScenario(); try { - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "executeRegisteredFunction"); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.executeRegisteredFunction()); } catch (Exception e) { assertEquals(true, (e.getCause() instanceof ServerOperationException)); @@ -86,8 +85,7 @@ public void test_Bug43126() throws InterruptedException { createScenario(); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); registerFunctionAtServer(function); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "executeRegisteredFunction"); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.executeRegisteredFunction()); } /* @@ -103,10 +101,8 @@ public void testServerExecution_byName() { isByName = new Boolean(true); toRegister = new Boolean(true); LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "serverExecution", new Object[] { isByName, function, toRegister}); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "allServerExecution", new Object[] { isByName, function, toRegister}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecution( isByName, function, toRegister)); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.allServerExecution( isByName, function, toRegister)); } @@ -120,10 +116,8 @@ public void testServerExecution_sendException() { isByName = new Boolean(true); toRegister = new Boolean(true); LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "serverExecution_SendException", new Object[] { isByName, function, toRegister}); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "allServerExecution_SendException", new Object[] { isByName, function, toRegister}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecution_SendException( isByName, function, toRegister)); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.allServerExecution_SendException( isByName, function, toRegister)); } /* @@ -139,10 +133,8 @@ public void testServerExecution_NoLastResult() { isByName = new Boolean(true); toRegister = new Boolean(true); LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "serverExecution_NoLastResult", new Object[] { isByName, function, toRegister}); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "allServerExecution_NoLastResult", new Object[] { isByName, function, toRegister}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecution_NoLastResult( isByName, function, toRegister)); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.allServerExecution_NoLastResult( isByName, function, toRegister)); } public void testServerExecution_byName_WithoutRegister() { @@ -155,10 +147,8 @@ public void testServerExecution_byName_WithoutRegister() { isByName = new Boolean(true); toRegister = new Boolean(false); LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "serverExecution", new Object[] { isByName, function, toRegister}); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "allServerExecution", new Object[] { isByName, function, toRegister}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecution( isByName, function, toRegister)); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.allServerExecution( isByName, function, toRegister)); } /* * Execution of the inline function on server @@ -166,10 +156,8 @@ public void testServerExecution_byName_WithoutRegister() { public void testServerExecution_byInlineFunction() { createScenario(); LogWriterUtils.getLogWriter().info("ClientServerFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "serverExecution_Inline"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "allServerExecution_Inline"); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecution_Inline()); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.allServerExecution_Inline()); } @@ -179,8 +167,7 @@ public void testServerExecution_byInlineFunction() { public void testServerExecution_byInlineFunction_InvalidAttrbiutes() { createScenario(); LogWriterUtils.getLogWriter().info("ClientServerFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "serverExecution_Inline_InvalidAttributes"); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecution_Inline_InvalidAttributes()); } /* @@ -192,16 +179,11 @@ public void testBug40714() { .info( "ClientServerFunctionExecutionDUnitTest#testBug40714 : Starting test"); - server1.invoke(ClientServerFunctionExecutionDUnitTest.class, - "registerFunction"); - server1.invoke(ClientServerFunctionExecutionDUnitTest.class, - "registerFunction"); - server1.invoke(ClientServerFunctionExecutionDUnitTest.class, - "registerFunction"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "registerFunction"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "FunctionExecution_Inline_Bug40714"); + server1.invoke(() -> ClientServerFunctionExecutionDUnitTest.registerFunction()); + server1.invoke(() -> ClientServerFunctionExecutionDUnitTest.registerFunction()); + server1.invoke(() -> ClientServerFunctionExecutionDUnitTest.registerFunction()); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.registerFunction()); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.FunctionExecution_Inline_Bug40714()); } @@ -274,10 +256,8 @@ public void testServerExecution_SocketTimeOut() { isByName = new Boolean(true); toRegister = new Boolean(true); LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "serverExecution", new Object[] { isByName, function, toRegister}); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "allServerExecution", new Object[] { isByName, function, toRegister}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecution( isByName, function, toRegister)); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.allServerExecution( isByName, function, toRegister)); } public void testServerExecution_SocketTimeOut_WithoutRegister() { @@ -288,10 +268,8 @@ public void testServerExecution_SocketTimeOut_WithoutRegister() { isByName = new Boolean(true); toRegister = new Boolean(false); LogWriterUtils.getLogWriter().info("ClientServerFFunctionExecutionDUnitTest#testServerSingleKeyExecution_byName : Starting test"); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "serverExecution", new Object[] { isByName, function, toRegister}); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "allServerExecution", new Object[] { isByName, function, toRegister}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecution( isByName, function, toRegister)); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.allServerExecution( isByName, function, toRegister)); } @@ -308,32 +286,20 @@ public void testOnServerFailoverWithOneServerDownHA() IgnoredException.addIgnoredException("did not send last result"); createScenario(); - server1.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server1.invoke(() -> ClientServerFunctionExecutionDUnitTest.createReplicatedRegion()); - server2.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server2.invoke(() -> ClientServerFunctionExecutionDUnitTest.createReplicatedRegion()); - server3.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server3.invoke(() -> ClientServerFunctionExecutionDUnitTest.createReplicatedRegion()); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "createProxyRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.createProxyRegion( NetworkUtils.getServerHostName(server1.getHost()) )); function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA_SERVER); registerFunctionAtServer(function); - client.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "serverExecutionHAOneServerDown", new Object[]{Boolean.FALSE,function,Boolean.FALSE}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecutionHAOneServerDown(Boolean.FALSE,function,Boolean.FALSE)); - client.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "verifyMetaData",new Object[]{new Integer(1), new Integer(1)}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.verifyMetaData(new Integer(1), new Integer(1))); } @SuppressWarnings("rawtypes") @@ -346,32 +312,20 @@ public void testOnServerFailoverWithTwoServerDownHA() IgnoredException.addIgnoredException("did not send last result"); createScenario(); - server1.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server1.invoke(() -> ClientServerFunctionExecutionDUnitTest.createReplicatedRegion()); - server2.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server2.invoke(() -> ClientServerFunctionExecutionDUnitTest.createReplicatedRegion()); - server3.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server3.invoke(() -> ClientServerFunctionExecutionDUnitTest.createReplicatedRegion()); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "createProxyRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.createProxyRegion( NetworkUtils.getServerHostName(server1.getHost()) )); function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA_SERVER); registerFunctionAtServer(function); - client.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "serverExecutionHATwoServerDown", new Object[]{Boolean.FALSE,function,Boolean.FALSE}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecutionHATwoServerDown(Boolean.FALSE,function,Boolean.FALSE)); - client.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "verifyMetaData",new Object[]{new Integer(2), new Integer(0)}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.verifyMetaData(new Integer(2), new Integer(0))); } @@ -386,31 +340,19 @@ public void testOnServerFailoverNonHA() //last result; IgnoredException.addIgnoredException("did not send last result"); createScenario(); - server1.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server1.invoke(() -> ClientServerFunctionExecutionDUnitTest.createReplicatedRegion()); - server2.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server2.invoke(() -> ClientServerFunctionExecutionDUnitTest.createReplicatedRegion()); - server3.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server3.invoke(() -> ClientServerFunctionExecutionDUnitTest.createReplicatedRegion()); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "createProxyRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.createProxyRegion( NetworkUtils.getServerHostName(server1.getHost()) )); function = new TestFunction(true, TestFunction.TEST_FUNCTION_NONHA_SERVER); registerFunctionAtServer(function); - client.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "serverExecutionNonHA", new Object[]{Boolean.FALSE,function,Boolean.FALSE}); - client.invoke( - ClientServerFunctionExecutionDUnitTest.class, - "verifyMetaData",new Object[]{new Integer(1), new Integer(0)}); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverExecutionNonHA(Boolean.FALSE,function,Boolean.FALSE)); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.verifyMetaData(new Integer(1), new Integer(0))); } @@ -424,9 +366,7 @@ public void testOnServerExecution_FunctionInvocationTargetException() { function = new TestFunction(true, TestFunction.TEST_FUNCTION_ONSERVER_REEXECUTE_EXCEPTION); registerFunctionAtServer(function); - client.invoke(ClientServerFunctionExecutionDUnitTest.class, - "serverFunctionExecution_FunctionInvocationTargetException", - new Object[] { Boolean.FALSE, function, Boolean.FALSE }); + client.invoke(() -> ClientServerFunctionExecutionDUnitTest.serverFunctionExecution_FunctionInvocationTargetException( Boolean.FALSE, function, Boolean.FALSE )); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java index 2ae358d3f31c..089c301ded57 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java @@ -93,7 +93,7 @@ public void testPrimaryColocationFailover() throws Throwable { createShipmentPR(); putInPRs(); verifyColocationInAllVms(); - dataStore1.invoke(ColocationFailoverDUnitTest.class, "closeCache"); + dataStore1.invoke(() -> ColocationFailoverDUnitTest.closeCache()); verifyPrimaryColocationAfterFailover(); } @@ -104,34 +104,31 @@ public void testColocationFailover() throws Throwable { createShipmentPR(); putInPRs(); verifyColocationInAllVms(); - dataStore1.invoke(ColocationFailoverDUnitTest.class, "closeCache"); + dataStore1.invoke(() -> ColocationFailoverDUnitTest.closeCache()); Wait.pause(5000); //wait for volunteering primary verifyColocationAfterFailover(); } private void verifyColocationInAllVms() { verifyColocation(); - dataStore1.invoke(ColocationFailoverDUnitTest.class, "verifyColocation"); - dataStore2.invoke(ColocationFailoverDUnitTest.class, "verifyColocation"); - dataStore3.invoke(ColocationFailoverDUnitTest.class, "verifyColocation"); - dataStore4.invoke(ColocationFailoverDUnitTest.class, "verifyColocation"); + dataStore1.invoke(() -> ColocationFailoverDUnitTest.verifyColocation()); + dataStore2.invoke(() -> ColocationFailoverDUnitTest.verifyColocation()); + dataStore3.invoke(() -> ColocationFailoverDUnitTest.verifyColocation()); + dataStore4.invoke(() -> ColocationFailoverDUnitTest.verifyColocation()); } private void verifyPrimaryColocationAfterFailover() { verifyPrimaryColocation(); - dataStore2.invoke(ColocationFailoverDUnitTest.class, - "verifyPrimaryColocation"); - dataStore3.invoke(ColocationFailoverDUnitTest.class, - "verifyPrimaryColocation"); - dataStore4.invoke(ColocationFailoverDUnitTest.class, - "verifyPrimaryColocation"); + dataStore2.invoke(() -> ColocationFailoverDUnitTest.verifyPrimaryColocation()); + dataStore3.invoke(() -> ColocationFailoverDUnitTest.verifyPrimaryColocation()); + dataStore4.invoke(() -> ColocationFailoverDUnitTest.verifyPrimaryColocation()); } private void verifyColocationAfterFailover() { verifyColocation(); - dataStore2.invoke(ColocationFailoverDUnitTest.class, "verifyColocation"); - dataStore3.invoke(ColocationFailoverDUnitTest.class, "verifyColocation"); - dataStore4.invoke(ColocationFailoverDUnitTest.class, "verifyColocation"); + dataStore2.invoke(() -> ColocationFailoverDUnitTest.verifyColocation()); + dataStore3.invoke(() -> ColocationFailoverDUnitTest.verifyColocation()); + dataStore4.invoke(() -> ColocationFailoverDUnitTest.verifyColocation()); } public static void closeCache() { @@ -358,10 +355,10 @@ public String description() { public static void createCacheInAllVms() { createCacheInVm(); - dataStore1.invoke(ColocationFailoverDUnitTest.class, "createCacheInVm"); - dataStore2.invoke(ColocationFailoverDUnitTest.class, "createCacheInVm"); - dataStore3.invoke(ColocationFailoverDUnitTest.class, "createCacheInVm"); - dataStore4.invoke(ColocationFailoverDUnitTest.class, "createCacheInVm"); + dataStore1.invoke(() -> ColocationFailoverDUnitTest.createCacheInVm()); + dataStore2.invoke(() -> ColocationFailoverDUnitTest.createCacheInVm()); + dataStore3.invoke(() -> ColocationFailoverDUnitTest.createCacheInVm()); + dataStore4.invoke(() -> ColocationFailoverDUnitTest.createCacheInVm()); } public static void createCacheInVm() { @@ -457,10 +454,10 @@ public static void createPR(String partitionedRegionName, Integer redundancy, private static void putInPRs() { put(); - dataStore1.invoke(ColocationFailoverDUnitTest.class, "put"); - dataStore2.invoke(ColocationFailoverDUnitTest.class, "put"); - dataStore3.invoke(ColocationFailoverDUnitTest.class, "put"); - dataStore4.invoke(ColocationFailoverDUnitTest.class, "put"); + dataStore1.invoke(() -> ColocationFailoverDUnitTest.put()); + dataStore2.invoke(() -> ColocationFailoverDUnitTest.put()); + dataStore3.invoke(() -> ColocationFailoverDUnitTest.put()); + dataStore4.invoke(() -> ColocationFailoverDUnitTest.put()); } public static void put() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java index 66d8adeb90d9..d1437f5b826a 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java @@ -107,73 +107,49 @@ protected final void preTearDown() throws Exception { public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); executeFunction(); } public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_SendException() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); executeFunction_SendException(); } public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_NoLastResult() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); executeFunction_NoLastResult(); } @@ -181,28 +157,19 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_NoLastResult public void testDistributedRegionFunctionExecutionOnDataPolicyNormal() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); try { - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "executeFunction"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunction()); fail("Function execution was expecting an Exception as it was executed on Region with DataPolicy.NORMAL"); } catch (Exception expected) { @@ -212,199 +179,134 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyNormal() { public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "executeFunction"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunction()); } public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_SendException() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "executeFunction_SendException"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunction_SendException()); } public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_NoLastResult() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "executeFunction_NoLastResult"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunction_NoLastResult()); } public void testDistributedRegionFunctionExecutionWithFunctionInvocationTargetException() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); registerFunction(new Boolean(true), new Integer(5)); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); // add expected exception to avoid suspect strings final IgnoredException ex = IgnoredException.addIgnoredException("I have been thrown"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "executeFunctionFunctionInvocationTargetException"); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunctionFunctionInvocationTargetException()); ex.remove(); } public void testDistributedRegionFunctionExecutionWithFunctionInvocationTargetException_WithoutHA() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); registerFunction(new Boolean(false), new Integer(0)); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); normal - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); replicate1 - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); replicate2 - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); replicate3 - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); // add expected exception to avoid suspect strings final IgnoredException ex = IgnoredException.addIgnoredException("I have been thrown"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "executeFunctionFunctionInvocationTargetExceptionWithoutHA"); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunctionFunctionInvocationTargetExceptionWithoutHA()); ex.remove(); } public void testDistributedRegionFunctionExecutionWithFunctionInvocationTargetExceptionForEmptyDataPolicy() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); registerFunction(new Boolean(true), new Integer(5)); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); // add expected exception to avoid suspect strings final IgnoredException ex = IgnoredException.addIgnoredException("I have been thrown"); @@ -414,39 +316,27 @@ public void testDistributedRegionFunctionExecutionWithFunctionInvocationTargetEx public void testDistributedRegionFunctionExecutionWithFunctionInvocationTargetExceptionForEmptyDataPolicy_WithoutHA() { createCacheInVm(); // Empty - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); registerFunction(new Boolean(false), new Integer(0)); createPeer(DataPolicy.EMPTY); populateRegion(); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); // add expected exception to avoid suspect strings final IgnoredException ex = IgnoredException.addIgnoredException("I have been thrown"); @@ -457,40 +347,29 @@ public void testDistributedRegionFunctionExecutionWithFunctionInvocationTargetEx public void testDistributedRegionFunctionExecutionHACacheClosedException() { VM empty = normal; - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.EMPTY }); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.EMPTY )); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "populateRegion"); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.populateRegion()); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); /* (original code below is not proper since function execution may not find * any node for execution when the first node closes; now closing cache * from within function body) int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = empty.invokeAsync( - DistributedRegionFunctionExecutionDUnitTest.class, "executeFunctionHA"); + async[0] = empty.invokeAsync(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunctionHA()); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "closeCache"); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.closeCache()); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); DistributedTestCase.join(async[0], 50 * 1000, getLogWriter()); if (async[0].getException() != null) { @@ -498,9 +377,7 @@ public void testDistributedRegionFunctionExecutionHACacheClosedException() { } List l = (List)async[0].getReturnValue(); */ - List l = (List)empty.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "executeFunctionHACacheClose"); + List l = (List)empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunctionHACacheClose()); assertEquals(5001, l.size()); for (int i = 0; i < 5001; i++) { assertEquals(l.get(i), Boolean.TRUE); @@ -510,32 +387,23 @@ public void testDistributedRegionFunctionExecutionHACacheClosedException() { public void testDistributedRegionFunctionExecutionHANodeFailure() { VM empty = normal; - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.EMPTY }); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.EMPTY )); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "populateRegion"); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.populateRegion()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = empty.invokeAsync( - DistributedRegionFunctionExecutionDUnitTest.class, "executeFunctionHA"); + async[0] = empty.invokeAsync(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunctionHA()); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "disconnect"); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.disconnect()); ThreadUtils.join(async[0], 50 * 1000); if (async[0].getException() != null) { @@ -552,29 +420,17 @@ public void testDistributedRegionFunctionExecutionHANodeFailure() { public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer() { VM empty1 = replicate3; VM empty2 = normal; - empty2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); - Integer port1 = (Integer)empty1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.EMPTY }); - Integer port2 = (Integer) empty2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.EMPTY }); - replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + Integer port1 = (Integer)empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + Integer port2 = (Integer) empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); executeFunction(); @@ -583,29 +439,17 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer_SendException() { VM empty1 = replicate3; VM empty2 = normal; - empty2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); - Integer port1 = (Integer)empty1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.EMPTY }); - Integer port2 = (Integer) empty2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.EMPTY }); - replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + Integer port1 = (Integer)empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + Integer port2 = (Integer) empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); executeFunction_SendException(); @@ -614,29 +458,17 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer_NoLastResult() { VM empty1 = replicate3; VM empty2 = normal; - empty2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); - Integer port1 = (Integer)empty1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.EMPTY }); - Integer port2 = (Integer) empty2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.EMPTY }); - replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + Integer port1 = (Integer)empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + Integer port2 = (Integer) empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); // add ExpectedException's to servers since client can connect to any // one of those @@ -662,37 +494,23 @@ public void testServerFailoverWithTwoServerAliveHA() VM emptyServer1 = replicate1; VM client = normal; - emptyServer1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - client.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInClientVm"); - - Integer port1 = (Integer)emptyServer1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.EMPTY }); - Integer port2 = (Integer)replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.REPLICATE }); - replicate3.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - client.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createClientAndPopulateClientRegion", new Object[] { DataPolicy.EMPTY, - port1, port2 }); - - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "stopServerHA"); + emptyServer1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + client.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInClientVm()); + + Integer port1 = (Integer)emptyServer1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + Integer port2 = (Integer)replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + replicate3.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + client.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createClientAndPopulateClientRegion( DataPolicy.EMPTY, + port1, port2 )); + + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.stopServerHA()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = client.invokeAsync( - DistributedRegionFunctionExecutionDUnitTest.class, "executeFunctionHA"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "startServerHA"); - emptyServer1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "closeCacheHA"); + async[0] = client.invokeAsync(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunctionHA()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.startServerHA()); + emptyServer1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.closeCacheHA()); ThreadUtils.join(async[0], 4 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -710,29 +528,17 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyNormal_ClientServe VM normal2 = replicate3; VM empty = replicate2 ; - normal1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - normal2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + normal2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); - Integer port1 = (Integer)normal1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.NORMAL }); - Integer port2 = (Integer)normal2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.NORMAL }); - empty.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.EMPTY }); - replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + Integer port1 = (Integer)normal1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.NORMAL )); + Integer port2 = (Integer)normal2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.NORMAL )); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.EMPTY )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); // add expected exception @@ -753,29 +559,17 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyNormal_ClientServe public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_ClientServer() { VM empty = replicate3; - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); - Integer port1 = (Integer)replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.REPLICATE }); - Integer port2 = (Integer)replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.REPLICATE }); - normal.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - empty.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.EMPTY }); + Integer port1 = (Integer)replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + Integer port2 = (Integer)replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.EMPTY )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); @@ -785,29 +579,17 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_ClientSe public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_ClientServer_WithoutRegister() { VM empty = replicate3; - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); - Integer port1 = (Integer)replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.REPLICATE }); - Integer port2 = (Integer)replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.REPLICATE }); - normal.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - empty.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.EMPTY }); + Integer port1 = (Integer)replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + Integer port2 = (Integer)replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.EMPTY )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); @@ -817,37 +599,23 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_ClientSe public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_ClientServer_FunctionInvocationTargetException() { VM empty = replicate3; - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); registerFunction(new Boolean(true), new Integer(5)); - Integer port1 = (Integer)replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.REPLICATE }); - Integer port2 = (Integer)replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.REPLICATE }); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.EMPTY }); - - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); + Integer port1 = (Integer)replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + Integer port2 = (Integer)replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.EMPTY )); + + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); @@ -860,45 +628,31 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_ClientSe public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_ClientServer_FunctionInvocationTargetException_WithoutHA() { VM empty = replicate3; - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); registerFunction(new Boolean(false), new Integer(0)); - Integer port1 = (Integer)replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.REPLICATE }); - Integer port2 = (Integer)replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.REPLICATE }); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.NORMAL }); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.EMPTY }); + Integer port1 = (Integer)replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + Integer port2 = (Integer)replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.NORMAL )); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.EMPTY )); replicate1 - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); replicate2 - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); normal - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); empty - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); @@ -911,38 +665,24 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyReplicate_ClientSe public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer_FunctionInvocationTargetException() { VM empty1 = replicate3; VM empty2 = normal; - empty2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); registerFunction(new Boolean(true), new Integer(5)); - Integer port1 = (Integer)empty1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.EMPTY }); - Integer port2 = (Integer)empty2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.EMPTY }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + Integer port1 = (Integer)empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + Integer port2 = (Integer)empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); - empty1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - empty2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(true), new Integer(5) }); + empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(true), new Integer(5) )); // add expected exception to avoid suspect strings final IgnoredException ex = IgnoredException.addIgnoredException("I have been thrown"); @@ -953,46 +693,32 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer_FunctionInvocationTargetException_WithoutHA() { VM empty1 = replicate3; VM empty2 = normal; - empty2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); registerFunction(new Boolean(false), new Integer(0)); - Integer port1 = (Integer)empty1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.EMPTY }); - Integer port2 = (Integer)empty2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.EMPTY }); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); + Integer port1 = (Integer)empty1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + Integer port2 = (Integer)empty2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.EMPTY )); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); empty1 - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); empty2 - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); replicate1 - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); replicate2 - .invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction", new Object[] { new Boolean(false), - new Integer(0) }); + .invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction( new Boolean(false), + new Integer(0) )); // add expected exception to avoid suspect strings final IgnoredException ex = IgnoredException.addIgnoredException("I have been thrown"); @@ -1002,34 +728,20 @@ public void testDistributedRegionFunctionExecutionOnDataPolicyEmpty_ClientServer public void testBug40714() { VM empty = replicate3; - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - - Integer port1 = (Integer)replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.REPLICATE }); - Integer port2 = (Integer)replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.REPLICATE }); - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createPeer", new Object[] { DataPolicy.REPLICATE }); - - normal.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction"); - empty.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "registerFunction"); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + + Integer port1 = (Integer)replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + Integer port2 = (Integer)replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createPeer( DataPolicy.REPLICATE )); + + normal.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction()); + empty.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction()); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.registerFunction()); createCacheInVm(); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); @@ -1045,8 +757,7 @@ public void testBug40714() { */ public void testBug41118() { - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "bug41118"); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.bug41118()); } /** @@ -1058,24 +769,18 @@ public void testBug41367() { VM client = replicate1; VM server = replicate2; - server.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm_41367"); + server.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm_41367()); - client.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInClientVm_41367"); + client.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInClientVm_41367()); - Integer port1 = (Integer)server.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, "createServer", - new Object[] { DataPolicy.REPLICATE }); + Integer port1 = (Integer)server.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); - client.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createClient_41367", new Object[] { port1 }); + client.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createClient_41367( port1 )); for (int i = 0; i < 3; i++) { try { - client.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "executeFunction_NoResult"); - client.invoke(DistributedRegionFunctionExecutionDUnitTest.class, "put"); + client.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.executeFunction_NoResult()); + client.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.put()); } catch (Exception e) { fail("Exception " + e + " not expected"); @@ -1086,19 +791,13 @@ public void testBug41367() { public void testFunctionWithNoResultThrowsException(){ IgnoredException.addIgnoredException("RuntimeException"); - replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); - replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class, - "createCacheInVm"); + replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); + replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createCacheInVm()); createCacheInClientVm(); - Integer port1 = (Integer)replicate1.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.REPLICATE }); - Integer port2 = (Integer)replicate2.invoke( - DistributedRegionFunctionExecutionDUnitTest.class, - "createServer", new Object[] { DataPolicy.REPLICATE }); + Integer port1 = (Integer)replicate1.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); + Integer port2 = (Integer)replicate2.invoke(() -> DistributedRegionFunctionExecutionDUnitTest.createServer( DataPolicy.REPLICATE )); createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java index 6d582ed49034..f55970f015e8 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java @@ -180,7 +180,7 @@ public void run() { } private void executeFunctions() { - dataStore1.invoke(LocalDataSetDUnitTest.class, "executeFunction"); + dataStore1.invoke(() -> LocalDataSetDUnitTest.executeFunction()); } public static void executeFunction() { @@ -210,9 +210,9 @@ public static void executeFunction() { } } private void registerFunctions() { - dataStore1.invoke(LocalDataSetDUnitTest.class, "registerFunction"); - dataStore2.invoke(LocalDataSetDUnitTest.class, "registerFunction"); - dataStore3.invoke(LocalDataSetDUnitTest.class, "registerFunction"); + dataStore1.invoke(() -> LocalDataSetDUnitTest.registerFunction()); + dataStore2.invoke(() -> LocalDataSetDUnitTest.registerFunction()); + dataStore3.invoke(() -> LocalDataSetDUnitTest.registerFunction()); } public static void registerFunction() { @@ -223,10 +223,10 @@ public static void registerFunction() { } private void registerIteratorFunctionOnAll() { - accessor.invoke(LocalDataSetDUnitTest.class, "registerIteratorFunction"); - dataStore1.invoke(LocalDataSetDUnitTest.class, "registerIteratorFunction"); - dataStore2.invoke(LocalDataSetDUnitTest.class, "registerIteratorFunction"); - dataStore3.invoke(LocalDataSetDUnitTest.class, "registerIteratorFunction"); + accessor.invoke(() -> LocalDataSetDUnitTest.registerIteratorFunction()); + dataStore1.invoke(() -> LocalDataSetDUnitTest.registerIteratorFunction()); + dataStore2.invoke(() -> LocalDataSetDUnitTest.registerIteratorFunction()); + dataStore3.invoke(() -> LocalDataSetDUnitTest.registerIteratorFunction()); } public static void registerIteratorFunction() { @@ -235,10 +235,10 @@ public static void registerIteratorFunction() { } public static void createCacheInAllVms() { - dataStore1.invoke(LocalDataSetDUnitTest.class, "createCacheInVm"); - dataStore2.invoke(LocalDataSetDUnitTest.class, "createCacheInVm"); - dataStore3.invoke(LocalDataSetDUnitTest.class, "createCacheInVm"); - accessor.invoke(LocalDataSetDUnitTest.class, "createCacheInVm"); + dataStore1.invoke(() -> LocalDataSetDUnitTest.createCacheInVm()); + dataStore2.invoke(() -> LocalDataSetDUnitTest.createCacheInVm()); + dataStore3.invoke(() -> LocalDataSetDUnitTest.createCacheInVm()); + accessor.invoke(() -> LocalDataSetDUnitTest.createCacheInVm()); } public static void createCacheInVm() { @@ -329,7 +329,7 @@ public static void createPR(String partitionedRegionName, Integer redundancy, } private static void putInPRs() { - accessor.invoke(LocalDataSetDUnitTest.class, "put"); + accessor.invoke(() -> LocalDataSetDUnitTest.put()); } public static void put() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java index 33c8f3ed4624..e36aacd3b006 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java @@ -63,25 +63,25 @@ public void setUp() throws Exception { public void testLocalDataSetPR(){ - dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "createCacheInVm"); + dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.createCacheInVm()); Object args[] = new Object[] { "testRegion", new Integer(1), new Integer(50), new Integer(10), null }; dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "createPR", args); - dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "put"); - dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "executeFunction"); + dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.put()); + dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.executeFunction()); } public void testLocalDataSetDR(){ - dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "createCacheInVm"); + dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.createCacheInVm()); Object args[] = new Object[] { "testRegion",DataPolicy.REPLICATE }; dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "createDR", args); - dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "put"); - dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "executeFunction"); + dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.put()); + dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.executeFunction()); } public void testLocalMember(){ - dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "createCacheInVm"); - dataStore1.invoke(LocalFunctionExecutionDUnitTest.class, "executeFunctionOnMember"); + dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.createCacheInVm()); + dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.executeFunctionOnMember()); } public static void createCacheInVm() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java index 1f3ed17a0c69..abad8d8c2e95 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java @@ -90,37 +90,32 @@ public void setUp() throws Exception { public void testRemoteMultiKeyExecution() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers",new Object[]{new Integer(5)}); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers(new Integer(5))); } public void testRemoteMultiKeyExecution_SendException1() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers_SendException", - new Object[] { new Integer(1) }); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers_SendException( new Integer(1) )); } public void testRemoteMultiKeyExecution_SendException2() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers_SendException", - new Object[] { new Integer(4) }); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers_SendException( new Integer(4) )); } public void testRemoteMultiKeyExecution_SendException3() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers_SendException", - new Object[] { new Integer(5) }); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers_SendException( new Integer(5) )); } public void testRemoteMultiKeyExecution_NoLastResult() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers_NoLastResult", - new Object[] { new Integer(5) }); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers_NoLastResult( new Integer(5) )); } public void testLocalMultiKeyExecution_NoLastResult() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers_NoLastResult", - new Object[] { new Integer(1) }); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers_NoLastResult( new Integer(1) )); } /** @@ -131,7 +126,7 @@ public void testLocalMultiKeyExecution_NoLastResult() throws Exception { public void testRemoteMultiKeyExecution_InlineFunction() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers_InlineFunction",new Object[]{new Integer(5)}); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers_InlineFunction(new Integer(5))); } public void testBug45328() throws Exception { @@ -175,21 +170,20 @@ public void testBug45328() throws Exception { public void testBug40714() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "registerFunction"); - member2.invoke(MemberFunctionExecutionDUnitTest.class, "registerFunction"); - member3.invoke(MemberFunctionExecutionDUnitTest.class, "registerFunction"); - member4.invoke(MemberFunctionExecutionDUnitTest.class, "registerFunction"); - member1.invoke(MemberFunctionExecutionDUnitTest.class, - "excuteOnMembers_InlineFunction", new Object[] { new Integer(5) }); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.registerFunction()); + member2.invoke(() -> MemberFunctionExecutionDUnitTest.registerFunction()); + member3.invoke(() -> MemberFunctionExecutionDUnitTest.registerFunction()); + member4.invoke(() -> MemberFunctionExecutionDUnitTest.registerFunction()); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers_InlineFunction( new Integer(5) )); } public void testBug46129() throws Exception { Properties props = new Properties(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "connectToDistributedSystem", new Object[] { props }); - member2.invoke(MemberFunctionExecutionDUnitTest.class, "connectToDistributedSystem", new Object[] { props }); - member3.invoke(MemberFunctionExecutionDUnitTest.class, "connectToDistributedSystem", new Object[] { props }); - member4.invoke(MemberFunctionExecutionDUnitTest.class, "connectToDistributedSystem", new Object[] { props }); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.connectToDistributedSystem( props )); + member2.invoke(() -> MemberFunctionExecutionDUnitTest.connectToDistributedSystem( props )); + member3.invoke(() -> MemberFunctionExecutionDUnitTest.connectToDistributedSystem( props )); + member4.invoke(() -> MemberFunctionExecutionDUnitTest.connectToDistributedSystem( props )); connectToDistributedSystem(props); AbstractExecution exe = (AbstractExecution)FunctionService.onMembers(getSystem()); exe.setIgnoreDepartedMembers(true); @@ -252,7 +246,7 @@ public boolean hasResult() { public void testRemoteMultiKeyExecutionNoResult() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembersNoResult"); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembersNoResult()); } /** * Test the execution of function on local memebers @@ -262,7 +256,7 @@ public void testRemoteMultiKeyExecutionNoResult() public void testRemoteMultiKeyExecutiononLocalMember() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers",new Object[]{new Integer(1)}); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers(new Integer(1))); } /** @@ -273,7 +267,7 @@ public void testRemoteMultiKeyExecutiononLocalMember() public void testRemoteMultiKeyExecutiononLocalMember_InlineFunction() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers_InlineFunction",new Object[]{new Integer(1)}); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers_InlineFunction(new Integer(1))); } /** @@ -284,7 +278,7 @@ public void testRemoteMultiKeyExecutiononLocalMember_InlineFunction() public void testRemoteMultiKeyExecutiononOtherMembers() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers",new Object[]{new Integer(4)}); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers(new Integer(4))); } /** @@ -295,7 +289,7 @@ public void testRemoteMultiKeyExecutiononOtherMembers() public void testRemoteMultiKeyExecutiononOtherMembers_InlineFunction() throws Exception { createDistributedSystemAndRegisterFunction(); - member1.invoke(MemberFunctionExecutionDUnitTest.class, "excuteOnMembers_InlineFunction",new Object[]{new Integer(4)}); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.excuteOnMembers_InlineFunction(new Integer(4))); } /** @@ -304,7 +298,7 @@ public void testRemoteMultiKeyExecutiononOtherMembers_InlineFunction() */ public void testBug41118() throws Exception { - member1.invoke(MemberFunctionExecutionDUnitTest.class, "bug41118"); + member1.invoke(() -> MemberFunctionExecutionDUnitTest.bug41118()); } public void testOnMembersWithoutCache() @@ -630,10 +624,8 @@ private void createDistributedSystemAndRegisterFunction() { List members = new ArrayList(4); members.add(member1); members.add(member2); members.add(member3); members.add(member4); for (VM member: members) { - member.invoke(MemberFunctionExecutionDUnitTest.class, "connectToDistributedSystem", - new Object[] { props }); - member.invoke(MemberFunctionExecutionDUnitTest.class, "registerExpectedExceptions", - new Object[] { Boolean.TRUE }); + member.invoke(() -> MemberFunctionExecutionDUnitTest.connectToDistributedSystem( props )); + member.invoke(() -> MemberFunctionExecutionDUnitTest.registerExpectedExceptions( Boolean.TRUE )); } } @@ -670,8 +662,7 @@ protected final void preTearDownCacheTestCase() throws Exception { List members = new ArrayList(4); members.add(member1); members.add(member2); members.add(member3); members.add(member4); for (VM member: members) { - member.invoke(MemberFunctionExecutionDUnitTest.class, "registerExpectedExceptions", - new Object[] { Boolean.FALSE }); + member.invoke(() -> MemberFunctionExecutionDUnitTest.registerExpectedExceptions( Boolean.FALSE )); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java index 899e2bf83945..7f9d918f1e22 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java @@ -78,10 +78,10 @@ protected final void postTearDownCacheTestCase() throws Exception { } public void testMultiRegionFunctionExecution(){ - vm0.invoke(MultiRegionFunctionExecutionDUnitTest.class, "createRegionsOnVm0"); - vm1.invoke(MultiRegionFunctionExecutionDUnitTest.class, "createRegionsOnVm1"); - vm2.invoke(MultiRegionFunctionExecutionDUnitTest.class, "createRegionsOnVm2"); - vm3.invoke(MultiRegionFunctionExecutionDUnitTest.class, "createRegionsOnVm3"); + vm0.invoke(() -> MultiRegionFunctionExecutionDUnitTest.createRegionsOnVm0()); + vm1.invoke(() -> MultiRegionFunctionExecutionDUnitTest.createRegionsOnVm1()); + vm2.invoke(() -> MultiRegionFunctionExecutionDUnitTest.createRegionsOnVm2()); + vm3.invoke(() -> MultiRegionFunctionExecutionDUnitTest.createRegionsOnVm3()); createRegionsOnUnitControllerVm(); Set regions = new HashSet(); regions.add(PR1); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java index d33dc47b294e..c5eab0aa625d 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java @@ -70,10 +70,8 @@ public void testServerFunctionExecution_NoAck() { LogWriterUtils.getLogWriter() .info( "PRClientServerFunctionExecutionNoAckDUnitTest#testServerFunctionExecution_NoAck : Starting test"); - client.invoke(PRClientServerFunctionExecutionNoAckDUnitTest.class, - "serverExecution", new Object[] { isByName, functionNoAck, functionAck , toRegister}); - client.invoke(PRClientServerFunctionExecutionNoAckDUnitTest.class, - "allServerExecution", new Object[] { isByName, functionNoAck , toRegister}); + client.invoke(() -> PRClientServerFunctionExecutionNoAckDUnitTest.serverExecution( isByName, functionNoAck, functionAck , toRegister)); + client.invoke(() -> PRClientServerFunctionExecutionNoAckDUnitTest.allServerExecution( isByName, functionNoAck , toRegister)); } public void testServerFunctionExecution_NoAck_WithoutRegister() { @@ -88,10 +86,8 @@ public void testServerFunctionExecution_NoAck_WithoutRegister() { LogWriterUtils.getLogWriter() .info( "PRClientServerFunctionExecutionNoAckDUnitTest#testServerFunctionExecution_NoAck : Starting test"); - client.invoke(PRClientServerFunctionExecutionNoAckDUnitTest.class, - "serverExecution", new Object[] { isByName, functionNoAck, functionAck, toRegister }); - client.invoke(PRClientServerFunctionExecutionNoAckDUnitTest.class, - "allServerExecution", new Object[] { isByName, functionNoAck, toRegister }); + client.invoke(() -> PRClientServerFunctionExecutionNoAckDUnitTest.serverExecution( isByName, functionNoAck, functionAck, toRegister )); + client.invoke(() -> PRClientServerFunctionExecutionNoAckDUnitTest.allServerExecution( isByName, functionNoAck, toRegister )); } private void createScenario() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java index be5b08204577..56abb8ccab2f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java @@ -90,8 +90,7 @@ public void test_Bug_43126_Function_Not_Registered() throws InterruptedException { createScenario(); try { - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "executeRegisteredFunction"); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.executeRegisteredFunction()); } catch (Exception e) { assertEquals(true, (e.getCause() instanceof ServerOperationException)); @@ -104,8 +103,7 @@ public void test_Bug43126() throws InterruptedException { createScenario(); Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "executeRegisteredFunction"); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.executeRegisteredFunction()); } /* @@ -128,8 +126,7 @@ public void run() { } }; runOnAllServers(suspect); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecution", new Object[] { isByName, toRegister}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecution( isByName, toRegister)); SerializableRunnable endSuspect = new SerializableRunnable() { public void run() { cache.getLogger().info("" + @@ -144,14 +141,12 @@ public void run() { public void testServerSingleKeyExecution_Bug43513_OnRegion() { createScenario_SingleConnection(); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecutionOnRegion_SingleConnection"); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecutionOnRegion_SingleConnection()); } public void Bug47584_testServerSingleKeyExecution_Bug43513_OnServer() { createScenario_SingleConnection(); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecutionOnServer_SingleConnection"); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecutionOnServer_SingleConnection()); } public void testServerSingleKeyExecution_SendException() { @@ -160,8 +155,7 @@ public void testServerSingleKeyExecution_SendException() { registerFunctionAtServer(function); isByName = new Boolean(true); toRegister = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecution_SendException", new Object[] { isByName, toRegister}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecution_SendException( isByName, toRegister)); } public void testServerSingleKeyExecution_ThrowException() { @@ -170,8 +164,7 @@ public void testServerSingleKeyExecution_ThrowException() { registerFunctionAtServer(function); isByName = new Boolean(true); toRegister = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecution_ThrowException", new Object[] { isByName, toRegister}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecution_ThrowException( isByName, toRegister)); } public void testClientWithoutPool_Bug41832() { @@ -190,8 +183,7 @@ public void run() { } }; runOnAllServers(suspect); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecutionWith2Regions", new Object[] { isByName, toRegister}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecutionWith2Regions( isByName, toRegister)); SerializableRunnable endSuspect = new SerializableRunnable() { public void run() { cache.getLogger().info("" + @@ -216,9 +208,8 @@ public void testServerExecution_NoLastResult() { toRegister = new Boolean(true); final IgnoredException ex = IgnoredException.addIgnoredException("did not send last result"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecution_NoLastResult", new Object[] { isByName, - toRegister }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecution_NoLastResult( isByName, + toRegister )); ex.remove(); } @@ -238,8 +229,7 @@ public void run() { } }; runOnAllServers(suspect); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecution", new Object[] { isByName, toRegister}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecution( isByName, toRegister)); SerializableRunnable endSuspect = new SerializableRunnable() { public void run() { cache.getLogger().info("" + @@ -260,8 +250,7 @@ public void run() { */ public void testserverSingleKeyExecution_FunctionInvocationTargetException() { createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecution_FunctionInvocationTargetException"); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecution_FunctionInvocationTargetException()); } public void testServerSingleKeyExecution_SocketTimeOut() { @@ -269,8 +258,7 @@ public void testServerSingleKeyExecution_SocketTimeOut() { Function function = new TestFunction(true,TestFunction.TEST_FUNCTION_SOCKET_TIMEOUT); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecutionSocketTimeOut", new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecutionSocketTimeOut( isByName)); } /* @@ -282,8 +270,7 @@ public void testServerSingleKeyExecution_byInstance() { Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecution", new Object[] { isByName , toRegister}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecution( isByName , toRegister)); } /* @@ -292,8 +279,7 @@ public void testServerSingleKeyExecution_byInstance() { */ public void testServerSingleKeyExecution_byInlineFunction() { createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverSingleKeyExecution_Inline"); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecution_Inline()); } /* @@ -305,12 +291,10 @@ public void testserverMultiKeyExecution_byName(){ Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecution", - new Object[] { isByName}); - server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "checkBucketsOnServer"); - server2.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "checkBucketsOnServer"); - server3.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "checkBucketsOnServer"); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecution( isByName)); + server1.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.checkBucketsOnServer()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.checkBucketsOnServer()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.checkBucketsOnServer()); } /* @@ -325,15 +309,11 @@ public void testBucketFilter(){ bucketFilterSet.add(3); bucketFilterSet.add(6); bucketFilterSet.add(8); - client.invoke(PRClientServerTestBase.class, - "serverBucketFilterExecution", - new Object[]{bucketFilterSet}); + client.invoke(() -> PRClientServerTestBase.serverBucketFilterExecution(bucketFilterSet)); bucketFilterSet.clear(); //Test single filter bucketFilterSet.add(7); - client.invoke(PRClientServerTestBase.class, - "serverBucketFilterExecution", - new Object[]{bucketFilterSet}); + client.invoke(() -> PRClientServerTestBase.serverBucketFilterExecution(bucketFilterSet)); } @@ -351,9 +331,7 @@ public void testBucketFilterOverride(){ keyFilterSet.add(75); keyFilterSet.add(25); - client.invoke(PRClientServerTestBase.class, - "serverBucketFilterOverrideExecution", - new Object[]{bucketFilterSet, keyFilterSet}); + client.invoke(() -> PRClientServerTestBase.serverBucketFilterOverrideExecution(bucketFilterSet, keyFilterSet)); } @@ -362,9 +340,7 @@ public void testserverMultiKeyExecution_SendException(){ Function function = new TestFunction(true,TestFunction.TEST_FUNCTION_SEND_EXCEPTION); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecution_SendException", - new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecution_SendException( isByName)); } public void testserverMultiKeyExecution_ThrowException(){ @@ -372,9 +348,7 @@ public void testserverMultiKeyExecution_ThrowException(){ Function function = new TestFunction(true,TestFunction.TEST_FUNCTION_THROW_EXCEPTION); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecution_ThrowException", - new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecution_ThrowException( isByName)); } @@ -385,8 +359,7 @@ public void testserverMultiKeyExecution_ThrowException(){ */ public void testserverMultiKeyExecution_byInlineFunction(){ createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecution_Inline"); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecution_Inline()); } /* @@ -397,8 +370,7 @@ public void testserverMultiKeyExecution_byInlineFunction(){ */ public void testserverMultiKeyExecution_FunctionInvocationTargetException() { createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecution_FunctionInvocationTargetException"); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecution_FunctionInvocationTargetException()); } /* @@ -410,9 +382,7 @@ public void testserverMultiKeyExecutionNoResult_byName(){ Function function = new TestFunction(false,TEST_FUNCTION7); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecutionNoResult", - new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecutionNoResult( isByName)); } /* @@ -424,9 +394,7 @@ public void testserverMultiKeyExecution_byInstance(){ Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecution", - new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecution( isByName)); } /* @@ -439,8 +407,7 @@ public void testserverMultiKeyExecutionOnASingleBucket_byName(){ Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecutionOnASingleBucket", new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecutionOnASingleBucket( isByName)); } /* @@ -453,8 +420,7 @@ public void testserverMultiKeyExecutionOnASingleBucket_byInstance(){ Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecutionOnASingleBucket", new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecutionOnASingleBucket( isByName)); } @@ -1655,8 +1621,7 @@ public void run() { } }; runOnAllServers(suspect); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverBug43430", new Object[] {}); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverBug43430()); SerializableRunnable endSuspect = new SerializableRunnable() { public void run() { cache.getLogger().info("" + diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java index 3615ce49c237..1164543d9bdc 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java @@ -80,8 +80,7 @@ public void testserverMultiKeyExecution_SocektTimeOut() { Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_SOCKET_TIMEOUT); registerFunctionAtServer(function); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "serverMultiKeyExecutionSocketTimeOut", new Object[] { new Boolean(true) }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverMultiKeyExecutionSocketTimeOut( new Boolean(true) )); } /* @@ -96,26 +95,17 @@ public void testServerFailoverWithTwoServerAliveHA() createClientServerScenarion(commonAttributes, 20, 20, 20); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA); registerFunctionAtServer(function); - server2.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "stopServerHA"); - server3.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "stopServerHA"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "putOperation"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.stopServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.putOperation()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = client.invokeAsync( - PRClientServerRegionFunctionExecutionDUnitTest.class, - "executeFunctionHA"); - server2.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "startServerHA"); - server3.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "startServerHA"); - server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "stopServerHA"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "verifyDeadAndLiveServers", new Object[] { new Integer(1), - new Integer(2) }); + async[0] = client.invokeAsync(() -> PRClientServerRegionFunctionExecutionDUnitTest.executeFunctionHA()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.startServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.startServerHA()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.verifyDeadAndLiveServers( new Integer(1), + new Integer(2) )); ThreadUtils.join(async[0], 6 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -136,26 +126,17 @@ public void testServerCacheClosedFailoverWithTwoServerAliveHA() createClientServerScenarion(commonAttributes, 20, 20, 20); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA); registerFunctionAtServer(function); - server2.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "stopServerHA"); - server3.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "stopServerHA"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "putOperation"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.stopServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.putOperation()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = client.invokeAsync( - PRClientServerRegionFunctionExecutionDUnitTest.class, - "executeFunctionHA"); - server2.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "startServerHA"); - server3.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "startServerHA"); - server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "closeCacheHA"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "verifyDeadAndLiveServers", new Object[] { new Integer(1), - new Integer(2) }); + async[0] = client.invokeAsync(() -> PRClientServerRegionFunctionExecutionDUnitTest.executeFunctionHA()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.startServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.startServerHA()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.closeCacheHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.verifyDeadAndLiveServers( new Integer(1), + new Integer(2) )); ThreadUtils.join(async[0], 5 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -166,16 +147,11 @@ public void testServerCacheClosedFailoverWithTwoServerAliveHA() public void testBug40714() { createScenario(); - server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "registerFunction"); - server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "registerFunction"); - server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "registerFunction"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "registerFunction"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "FunctionExecution_Inline_Bug40714"); + server1.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.registerFunction()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.registerFunction()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.registerFunction()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.registerFunction()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.FunctionExecution_Inline_Bug40714()); } public void testOnRegionFailoverWithTwoServerDownHA() @@ -183,29 +159,22 @@ public void testOnRegionFailoverWithTwoServerDownHA() IgnoredException.addIgnoredException("FunctionInvocationTargetException"); createScenario(); - server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server1.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - server2.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - server3.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server3.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createProxyRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createProxyRegion( NetworkUtils.getServerHostName(server1.getHost()) )); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA_REGION); registerFunctionAtServer(function); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "regionExecutionHATwoServerDown", new Object[] { Boolean.FALSE, - function, Boolean.FALSE }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.regionExecutionHATwoServerDown( Boolean.FALSE, + function, Boolean.FALSE )); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "verifyMetaData", new Object[] { new Integer(2), new Integer(1) }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.verifyMetaData( new Integer(2), new Integer(1) )); } // retry attempts is 2 @@ -214,29 +183,22 @@ public void testOnRegionFailoverWithOneServerDownHA() IgnoredException.addIgnoredException("FunctionInvocationTargetException"); createScenario(); - server1.invokeAsync(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server1.invokeAsync(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - server2.invokeAsync(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server2.invokeAsync(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - server3.invokeAsync(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server3.invokeAsync(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createProxyRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createProxyRegion( NetworkUtils.getServerHostName(server1.getHost()) )); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA_REGION); registerFunctionAtServer(function); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "regionExecutionHAOneServerDown", new Object[] { Boolean.FALSE, - function, Boolean.FALSE }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.regionExecutionHAOneServerDown( Boolean.FALSE, + function, Boolean.FALSE )); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "verifyMetaData", new Object[] { new Integer(1), new Integer(1) }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.verifyMetaData( new Integer(1), new Integer(1) )); } /* @@ -246,28 +208,21 @@ public void testOnRegionFailoverWithOneServerDownHA() public void testOnRegionFailoverNonHA() throws InterruptedException { // See #47489 before enabling it createScenario(); IgnoredException.addIgnoredException("FunctionInvocationTargetException"); - server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server1.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - server2.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - server3.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server3.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createProxyRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createProxyRegion( NetworkUtils.getServerHostName(server1.getHost()) )); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_NONHA_REGION); registerFunctionAtServer(function); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "regionSingleKeyExecutionNonHA", new Object[] { Boolean.FALSE, - function, Boolean.FALSE }); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "verifyMetaData", new Object[] { new Integer(1), new Integer(0) }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.regionSingleKeyExecutionNonHA( Boolean.FALSE, + function, Boolean.FALSE )); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.verifyMetaData( new Integer(1), new Integer(0) )); } /* @@ -279,18 +234,13 @@ public void testOnRegionFailoverNonHASingleHop() throws InterruptedException { / "TestPartitionedRegion", null, 0, 13, null); createClientServerScenarioSingleHop(commonAttributes, 20, 20, 20); - server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server1.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - server2.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - server3.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createReplicatedRegion"); + server3.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createReplicatedRegion()); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "createProxyRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.createProxyRegion( NetworkUtils.getServerHostName(server1.getHost()) )); //Make sure the buckets are created. client.invoke(new SerializableRunnable() { @@ -305,9 +255,7 @@ public void run() { }); //Make sure the client metadata is up to date. - client.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "fetchMetaData"); + client.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.fetchMetaData()); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_NONHA_REGION); @@ -316,9 +264,8 @@ public void run() { TestFunction.TEST_FUNCTION_NONHA_NOP); registerFunctionAtServer(function); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "regionSingleKeyExecutionNonHA", new Object[] { Boolean.FALSE, - function, Boolean.FALSE }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.regionSingleKeyExecutionNonHA( Boolean.FALSE, + function, Boolean.FALSE )); //This validation doesn't work because the client may @@ -335,8 +282,7 @@ public void run() { // } // }); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "verifyMetaData", new Object[] { new Integer(1), new Integer(0) }); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.verifyMetaData( new Integer(1), new Integer(0) )); } public void testServerBucketMovedException() throws InterruptedException { @@ -361,35 +307,21 @@ public void testServerBucketMovedException() throws InterruptedException { startLocatorInVM(portLocator); try { - Integer port1 = (Integer)server1.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "createServerWithLocator", new Object[] { locator, false, - commonAttributes }); - - Integer port2 = (Integer)server2.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "createServerWithLocator", new Object[] { locator, false, - commonAttributes }); - - server4.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "createClientWithLocator", new Object[] { hostLocator, portLocator }); - server4.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "putIntoRegion"); - - server4.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "fetchMetaData"); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false, + commonAttributes )); + + Integer port2 = (Integer)server2.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false, + commonAttributes )); + + server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createClientWithLocator( hostLocator, portLocator )); + server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.putIntoRegion()); + + server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.fetchMetaData()); - Integer port3 = (Integer)server3.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "createServerWithLocator", new Object[] { locator, false, - commonAttributes }); - - Object result = server4.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "executeFunction"); + Integer port3 = (Integer)server3.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false, + commonAttributes )); + + Object result = server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.executeFunction()); List l = (List)result; assertEquals(2, l.size()); @@ -419,30 +351,18 @@ public void testServerBucketMovedException_LocalServer() startLocatorInVM(portLocator); try { - Integer port1 = (Integer)server1.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "createServerWithLocator", new Object[] { locator, false, - commonAttributes }); - - server4.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "createClientWithLocator", new Object[] { hostLocator, portLocator }); - server4.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "putIntoRegion"); - - server4.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "fetchMetaData"); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false, + commonAttributes )); + + server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createClientWithLocator( hostLocator, portLocator )); + server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.putIntoRegion()); + + server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.fetchMetaData()); - Integer port2 = (Integer)server2.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "createServerWithLocator", new Object[] { locator, false, - commonAttributes }); - - Object result = server4.invoke( - PRClientServerRegionFunctionExecutionFailoverDUnitTest.class, - "executeFunction"); + Integer port2 = (Integer)server2.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.createServerWithLocator( locator, false, + commonAttributes )); + + Object result = server4.invoke(() -> PRClientServerRegionFunctionExecutionFailoverDUnitTest.executeFunction()); List l = (List)result; assertEquals(2, l.size()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java index f1d354b04ef2..005b1b5cd695 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java @@ -81,9 +81,7 @@ public void testServerAllKeyExecution_byInstance() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverAllKeyExecution", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverAllKeyExecution( isByName )); } /* @@ -91,9 +89,7 @@ public void testServerAllKeyExecution_byInstance() { */ public void testServerGetAllFunction() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "getAll"); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.getAll()); } /* @@ -101,9 +97,7 @@ public void testServerGetAllFunction() { */ public void testServerPutAllFunction() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "putAll"); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.putAll()); } /* @@ -115,9 +109,7 @@ public void testServerSingleKeyExecution_byName() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverSingleKeyExecution", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverSingleKeyExecution( isByName )); } /* @@ -128,9 +120,7 @@ public void testServerSingleKeyExecution_byName() { */ public void testserverSingleKeyExecution_FunctionInvocationTargetException() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverSingleKeyExecution_FunctionInvocationTargetException"); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverSingleKeyExecution_FunctionInvocationTargetException()); } /* @@ -145,15 +135,11 @@ public void testBucketFilter(){ bucketFilterSet.add(3); bucketFilterSet.add(6); bucketFilterSet.add(8); - client.invoke(PRClientServerTestBase.class, - "serverBucketFilterExecution", - new Object[]{bucketFilterSet}); + client.invoke(() -> PRClientServerTestBase.serverBucketFilterExecution(bucketFilterSet)); bucketFilterSet.clear(); //Test single filter bucketFilterSet.add(7); - client.invoke(PRClientServerTestBase.class, - "serverBucketFilterExecution", - new Object[]{bucketFilterSet}); + client.invoke(() -> PRClientServerTestBase.serverBucketFilterExecution(bucketFilterSet)); } public void testBucketFilterOverride(){ @@ -170,9 +156,7 @@ public void testBucketFilterOverride(){ keyFilterSet.add(75); keyFilterSet.add(25); - client.invoke(PRClientServerTestBase.class, - "serverBucketFilterOverrideExecution", - new Object[]{bucketFilterSet, keyFilterSet}); + client.invoke(() -> PRClientServerTestBase.serverBucketFilterOverrideExecution(bucketFilterSet, keyFilterSet)); } @@ -182,9 +166,7 @@ public void testServerSingleKeyExecution_SocketTimeOut() { TestFunction.TEST_FUNCTION_SOCKET_TIMEOUT); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverSingleKeyExecutionSocketTimeOut", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverSingleKeyExecutionSocketTimeOut( isByName )); } /* @@ -196,9 +178,7 @@ public void testServerSingleKeyExecution_byInstance() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverSingleKeyExecution", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverSingleKeyExecution( isByName )); } /* @@ -207,9 +187,7 @@ public void testServerSingleKeyExecution_byInstance() { */ public void testServerSingleKeyExecution_byInlineFunction() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverSingleKeyExecution_Inline"); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverSingleKeyExecution_Inline()); } /* @@ -221,18 +199,10 @@ public void testserverMultiKeyExecution_byName() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverMultiKeyExecution", new Object[] { isByName }); - server1.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "checkBucketsOnServer"); - server2.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "checkBucketsOnServer"); - server3.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "checkBucketsOnServer"); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverMultiKeyExecution( isByName )); + server1.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.checkBucketsOnServer()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.checkBucketsOnServer()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.checkBucketsOnServer()); } public void testserverMultiKeyExecution_SocektTimeOut() { @@ -241,9 +211,7 @@ public void testserverMultiKeyExecution_SocektTimeOut() { TestFunction.TEST_FUNCTION_SOCKET_TIMEOUT); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverMultiKeyExecutionSocketTimeOut", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverMultiKeyExecutionSocketTimeOut( isByName )); } /* @@ -252,9 +220,7 @@ public void testserverMultiKeyExecution_SocektTimeOut() { */ public void testserverMultiKeyExecution_byInlineFunction() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverMultiKeyExecution_Inline"); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverMultiKeyExecution_Inline()); } /* @@ -265,9 +231,7 @@ public void testserverMultiKeyExecution_byInlineFunction() { */ public void testserverMultiKeyExecution_FunctionInvocationTargetException() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverMultiKeyExecution_FunctionInvocationTargetException"); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverMultiKeyExecution_FunctionInvocationTargetException()); } /* @@ -279,9 +243,7 @@ public void testserverMultiKeyExecutionNoResult_byName() { Function function = new TestFunction(false, TEST_FUNCTION7); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverMultiKeyExecutionNoResult", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverMultiKeyExecutionNoResult( isByName )); } /* @@ -293,9 +255,7 @@ public void testserverMultiKeyExecution_byInstance() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverMultiKeyExecution", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverMultiKeyExecution( isByName )); } /* @@ -308,9 +268,7 @@ public void testserverMultiKeyExecutionOnASingleBucket_byName() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverMultiKeyExecutionOnASingleBucket", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverMultiKeyExecutionOnASingleBucket( isByName )); } /* @@ -323,9 +281,7 @@ public void testserverMultiKeyExecutionOnASingleBucket_byInstance() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "serverMultiKeyExecutionOnASingleBucket", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.serverMultiKeyExecutionOnASingleBucket( isByName )); } /* @@ -340,33 +296,18 @@ public void testServerFailoverWithTwoServerAliveHA() createClientServerScenarion(commonAttributes, 20, 20, 20); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA); registerFunctionAtServer(function); - server2.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "stopServerHA"); - server3.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "stopServerHA"); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "putOperation"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.stopServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.putOperation()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = client.invokeAsync( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "executeFunctionHA"); - server2.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "startServerHA"); - server3.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "startServerHA"); - server1.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "stopServerHA"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "verifyDeadAndLiveServers", new Object[] { new Integer(1), - new Integer(2) }); + async[0] = client.invokeAsync(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.executeFunctionHA()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.startServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.startServerHA()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.verifyDeadAndLiveServers( new Integer(1), + new Integer(2) )); ThreadUtils.join(async[0], 6 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -388,33 +329,17 @@ public void testServerCacheClosedFailoverWithTwoServerAliveHA() createClientServerScenarion(commonAttributes, 20, 20, 20); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA); registerFunctionAtServer(function); - server2.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "stopServerHA"); - server3.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "stopServerHA"); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "putOperation"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.stopServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.putOperation()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = client.invokeAsync( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "executeFunctionHA"); - server2.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "startServerHA"); - server3.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "startServerHA"); - server1.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "closeCacheHA"); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "verifyDeadAndLiveServers", new Object[] { new Integer(1), - new Integer(2) }); + async[0] = client.invokeAsync(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.executeFunctionHA()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.startServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.startServerHA()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.closeCacheHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.verifyDeadAndLiveServers( new Integer(1), + new Integer(2) )); ThreadUtils.join(async[0], 5 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -425,20 +350,11 @@ public void testServerCacheClosedFailoverWithTwoServerAliveHA() public void testBug40714() { createScenario(); - server1.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "registerFunction"); - server1.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "registerFunction"); - server1.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "registerFunction"); - client.invoke( - PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, - "registerFunction"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "FunctionExecution_Inline_Bug40714"); + server1.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.registerFunction()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.registerFunction()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.registerFunction()); + client.invoke(() -> PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.registerFunction()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.FunctionExecution_Inline_Bug40714()); } public static void registerFunction() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java index 8e2d2d4c20bb..890841ef493a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java @@ -81,9 +81,7 @@ public void testServerAllKeyExecution_byInstance() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverAllKeyExecution", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverAllKeyExecution( isByName )); } /* @@ -91,9 +89,7 @@ public void testServerAllKeyExecution_byInstance() { */ public void testServerGetAllFunction() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "getAll"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.getAll()); } /* @@ -101,9 +97,7 @@ public void testServerGetAllFunction() { */ public void testServerPutAllFunction() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "putAll"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.putAll()); } /* @@ -115,9 +109,7 @@ public void testServerSingleKeyExecution_byName() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverSingleKeyExecution", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverSingleKeyExecution( isByName )); } /* @@ -128,9 +120,7 @@ public void testServerSingleKeyExecution_byName() { */ public void testserverSingleKeyExecution_FunctionInvocationTargetException() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverSingleKeyExecution_FunctionInvocationTargetException"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverSingleKeyExecution_FunctionInvocationTargetException()); } public void testServerSingleKeyExecution_SocketTimeOut() { @@ -139,9 +129,7 @@ public void testServerSingleKeyExecution_SocketTimeOut() { TestFunction.TEST_FUNCTION_SOCKET_TIMEOUT); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverSingleKeyExecutionSocketTimeOut", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverSingleKeyExecutionSocketTimeOut( isByName )); } /* @@ -153,9 +141,7 @@ public void testServerSingleKeyExecution_byInstance() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverSingleKeyExecution", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverSingleKeyExecution( isByName )); } /* @@ -164,9 +150,7 @@ public void testServerSingleKeyExecution_byInstance() { */ public void testServerSingleKeyExecution_byInlineFunction() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverSingleKeyExecution_Inline"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverSingleKeyExecution_Inline()); } /* @@ -178,18 +162,10 @@ public void testserverMultiKeyExecution_byName() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverMultiKeyExecution", new Object[] { isByName }); - server1.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "checkBucketsOnServer"); - server2.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "checkBucketsOnServer"); - server3.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "checkBucketsOnServer"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverMultiKeyExecution( isByName )); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.checkBucketsOnServer()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.checkBucketsOnServer()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.checkBucketsOnServer()); } public void testserverMultiKeyExecution_SocektTimeOut() { @@ -198,9 +174,7 @@ public void testserverMultiKeyExecution_SocektTimeOut() { TestFunction.TEST_FUNCTION_SOCKET_TIMEOUT); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverMultiKeyExecutionSocketTimeOut", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverMultiKeyExecutionSocketTimeOut( isByName )); } /* @@ -209,9 +183,7 @@ public void testserverMultiKeyExecution_SocektTimeOut() { */ public void testserverMultiKeyExecution_byInlineFunction() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverMultiKeyExecution_Inline"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverMultiKeyExecution_Inline()); } /* @@ -222,9 +194,7 @@ public void testserverMultiKeyExecution_byInlineFunction() { */ public void testserverMultiKeyExecution_FunctionInvocationTargetException() { createScenario(); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverMultiKeyExecution_FunctionInvocationTargetException"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverMultiKeyExecution_FunctionInvocationTargetException()); } /* @@ -236,9 +206,7 @@ public void testserverMultiKeyExecutionNoResult_byName() { Function function = new TestFunction(false, TEST_FUNCTION7); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverMultiKeyExecutionNoResult", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverMultiKeyExecutionNoResult( isByName )); } /* @@ -250,9 +218,7 @@ public void testserverMultiKeyExecution_byInstance() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverMultiKeyExecution", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverMultiKeyExecution( isByName )); } /* @@ -265,9 +231,7 @@ public void testserverMultiKeyExecutionOnASingleBucket_byName() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverMultiKeyExecutionOnASingleBucket", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverMultiKeyExecutionOnASingleBucket( isByName )); } /* @@ -280,9 +244,7 @@ public void testserverMultiKeyExecutionOnASingleBucket_byInstance() { Function function = new TestFunction(true, TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "serverMultiKeyExecutionOnASingleBucket", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.serverMultiKeyExecutionOnASingleBucket( isByName )); } /* @@ -301,33 +263,18 @@ public void testServerFailoverWithTwoServerAliveHA() createClientServerScenarion(commonAttributes, 20, 20, 20); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA); registerFunctionAtServer(function); - server2.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "stopServerHA"); - server3.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "stopServerHA"); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "putOperation"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.stopServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.putOperation()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = client.invokeAsync( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "executeFunctionHA"); - server2.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "startServerHA"); - server3.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "startServerHA"); - server1.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "stopServerHA"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "verifyDeadAndLiveServers", new Object[] { new Integer(1), - new Integer(2) }); + async[0] = client.invokeAsync(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.executeFunctionHA()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.startServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.startServerHA()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.verifyDeadAndLiveServers( new Integer(1), + new Integer(2) )); ThreadUtils.join(async[0], 6 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -353,33 +300,17 @@ public void testServerCacheClosedFailoverWithTwoServerAliveHA() createClientServerScenarion(commonAttributes, 20, 20, 20); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA); registerFunctionAtServer(function); - server2.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "stopServerHA"); - server3.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "stopServerHA"); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "putOperation"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.stopServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.putOperation()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = client.invokeAsync( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "executeFunctionHA"); - server2.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "startServerHA"); - server3.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "startServerHA"); - server1.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "closeCacheHA"); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "verifyDeadAndLiveServers", new Object[] { new Integer(1), - new Integer(2) }); + async[0] = client.invokeAsync(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.executeFunctionHA()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.startServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.startServerHA()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.closeCacheHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.verifyDeadAndLiveServers( new Integer(1), + new Integer(2) )); ThreadUtils.join(async[0], 5 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -390,20 +321,11 @@ public void testServerCacheClosedFailoverWithTwoServerAliveHA() public void testBug40714() { createScenario(); - server1.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "registerFunction"); - server1.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "registerFunction"); - server1.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "registerFunction"); - client.invoke( - PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, - "registerFunction"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "FunctionExecution_Inline_Bug40714"); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.registerFunction()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.registerFunction()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.registerFunction()); + client.invoke(() -> PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.registerFunction()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.FunctionExecution_Inline_Bug40714()); } public static void registerFunction() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java index 1afd8f5ac26f..a1c31d86b201 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java @@ -82,9 +82,7 @@ public void testServerAllKeyExecution_byInstance(){ Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverAllKeyExecution", - new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverAllKeyExecution( isByName)); } @@ -93,8 +91,7 @@ public void testServerAllKeyExecution_byInstance(){ */ public void testServerGetAllFunction(){ createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "getAll"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.getAll()); } /* @@ -102,8 +99,7 @@ public void testServerGetAllFunction(){ */ public void testServerPutAllFunction(){ createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "putAll"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.putAll()); } /* * Execution of the function on server with single key as the routing @@ -114,8 +110,7 @@ public void testServerSingleKeyExecution_byName() { Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverSingleKeyExecution", new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverSingleKeyExecution( isByName)); } /* @@ -126,8 +121,7 @@ public void testServerSingleKeyExecution_byName() { */ public void testserverSingleKeyExecution_FunctionInvocationTargetException() { createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverSingleKeyExecution_FunctionInvocationTargetException"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverSingleKeyExecution_FunctionInvocationTargetException()); } public void testServerSingleKeyExecution_SocketTimeOut() { @@ -140,9 +134,7 @@ public void testServerSingleKeyExecution_SocketTimeOut() { final IgnoredException expectedEx = IgnoredException.addIgnoredException( DistributedSystemDisconnectedException.class.getName(), server1); try { - client.invoke( - PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverSingleKeyExecutionSocketTimeOut", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverSingleKeyExecutionSocketTimeOut( isByName )); } finally { expectedEx.remove(); } @@ -157,8 +149,7 @@ public void testServerSingleKeyExecution_byInstance() { Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverSingleKeyExecution", new Object[] { isByName }); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverSingleKeyExecution( isByName )); } /* @@ -167,8 +158,7 @@ public void testServerSingleKeyExecution_byInstance() { */ public void testServerSingleKeyExecution_byInlineFunction() { createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverSingleKeyExecution_Inline"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverSingleKeyExecution_Inline()); } /* @@ -180,12 +170,10 @@ public void testserverMultiKeyExecution_byName(){ Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverMultiKeyExecution", - new Object[] { isByName}); - server1.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "checkBucketsOnServer"); - server2.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "checkBucketsOnServer"); - server3.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "checkBucketsOnServer"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverMultiKeyExecution( isByName)); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.checkBucketsOnServer()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.checkBucketsOnServer()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.checkBucketsOnServer()); } /* @@ -199,15 +187,11 @@ public void testBucketFilter(){ bucketFilterSet.add(3); bucketFilterSet.add(6); bucketFilterSet.add(8); - client.invoke(PRClientServerTestBase.class, - "serverBucketFilterExecution", - new Object[]{bucketFilterSet}); + client.invoke(() -> PRClientServerTestBase.serverBucketFilterExecution(bucketFilterSet)); bucketFilterSet.clear(); //Test single filter bucketFilterSet.add(7); - client.invoke(PRClientServerTestBase.class, - "serverBucketFilterExecution", - new Object[]{bucketFilterSet}); + client.invoke(() -> PRClientServerTestBase.serverBucketFilterExecution(bucketFilterSet)); } public void testBucketFilterOverride(){ @@ -224,9 +208,7 @@ public void testBucketFilterOverride(){ keyFilterSet.add(75); keyFilterSet.add(25); - client.invoke(PRClientServerTestBase.class, - "serverBucketFilterOverrideExecution", - new Object[]{bucketFilterSet, keyFilterSet}); + client.invoke(() -> PRClientServerTestBase.serverBucketFilterOverrideExecution(bucketFilterSet, keyFilterSet)); } @@ -235,9 +217,7 @@ public void testserverMultiKeyExecution_SocektTimeOut(){ Function function = new TestFunction(true,TestFunction.TEST_FUNCTION_SOCKET_TIMEOUT); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverMultiKeyExecutionSocketTimeOut", - new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverMultiKeyExecutionSocketTimeOut( isByName)); } /* @@ -246,8 +226,7 @@ public void testserverMultiKeyExecution_SocektTimeOut(){ */ public void testserverMultiKeyExecution_byInlineFunction(){ createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverMultiKeyExecution_Inline"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverMultiKeyExecution_Inline()); } /* @@ -260,8 +239,7 @@ public void testserverMultiKeyExecution_FunctionInvocationTargetException() { IgnoredException.addIgnoredException("FunctionException: IOException while sending"); IgnoredException.addIgnoredException("java.net.SocketException: Software caused connection abort"); createScenario(); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverMultiKeyExecution_FunctionInvocationTargetException"); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverMultiKeyExecution_FunctionInvocationTargetException()); } /* @@ -274,9 +252,7 @@ public void testserverMultiKeyExecutionNoResult_byName(){ Function function = new TestFunction(false,TEST_FUNCTION7); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverMultiKeyExecutionNoResult", - new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverMultiKeyExecutionNoResult( isByName)); } /* @@ -288,9 +264,7 @@ public void testserverMultiKeyExecution_byInstance(){ Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverMultiKeyExecution", - new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverMultiKeyExecution( isByName)); } /* @@ -303,8 +277,7 @@ public void testserverMultiKeyExecutionOnASingleBucket_byName(){ Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(true); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverMultiKeyExecutionOnASingleBucket", new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverMultiKeyExecutionOnASingleBucket( isByName)); } /* @@ -317,8 +290,7 @@ public void testserverMultiKeyExecutionOnASingleBucket_byInstance(){ Function function = new TestFunction(true,TEST_FUNCTION2); registerFunctionAtServer(function); isByName = new Boolean(false); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "serverMultiKeyExecutionOnASingleBucket", new Object[] { isByName}); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.serverMultiKeyExecutionOnASingleBucket( isByName)); } /* @@ -332,27 +304,18 @@ public void testServerFailoverWithTwoServerAliveHA() createClientServerScenarion(commonAttributes, 20, 20, 20); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA); registerFunctionAtServer(function); - server2.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "stopServerHA"); - server3.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "stopServerHA"); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "putOperation"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.stopServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.putOperation()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = client.invokeAsync( - PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "executeFunctionHA"); - server2.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "startServerHA"); - server3.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "startServerHA"); - server1.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "stopServerHA"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "verifyDeadAndLiveServers", new Object[] { new Integer(1), - new Integer(2) }); + async[0] = client.invokeAsync(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.executeFunctionHA()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.startServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.startServerHA()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.verifyDeadAndLiveServers( new Integer(1), + new Integer(2) )); ThreadUtils.join(async[0], 6 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -372,16 +335,16 @@ public void testServerCacheClosedFailoverWithTwoServerAliveHA() throws Interrupt createClientServerScenarion(commonAttributes,20, 20, 20); Function function = new TestFunction(true,TestFunction.TEST_FUNCTION_HA); registerFunctionAtServer(function); - server2.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "stopServerHA"); - server3.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "stopServerHA"); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "putOperation"); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.stopServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.stopServerHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.putOperation()); int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = client.invokeAsync(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "executeFunctionHA"); - server2.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "startServerHA"); - server3.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "startServerHA"); - server1.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "closeCacheHA"); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "verifyDeadAndLiveServers",new Object[]{new Integer(1),new Integer(2)}); + async[0] = client.invokeAsync(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.executeFunctionHA()); + server2.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.startServerHA()); + server3.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.startServerHA()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.closeCacheHA()); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.verifyDeadAndLiveServers(new Integer(1),new Integer(2))); ThreadUtils.join(async[0], 5 * 60 * 1000); if(async[0].getException() != null){ Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -392,16 +355,11 @@ public void testServerCacheClosedFailoverWithTwoServerAliveHA() throws Interrupt public void testBug40714() { createScenario(); - server1.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "registerFunction"); - server1.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "registerFunction"); - server1.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "registerFunction"); - client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, - "registerFunction"); - client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, - "FunctionExecution_Inline_Bug40714"); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.registerFunction()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.registerFunction()); + server1.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.registerFunction()); + client.invoke(() -> PRClientServerRegionFunctionExecutionSingleHopDUnitTest.registerFunction()); + client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.FunctionExecution_Inline_Bug40714()); } public static void registerFunction() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java index 4bee088cebbe..d09a30fefcad 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java @@ -464,35 +464,23 @@ public static void createCacheClientWithDistributedRegion(String host, Integer p protected void createClientServerScenarion(ArrayList commonAttributes , int localMaxMemoryServer1, int localMaxMemoryServer2, int localMaxMemoryServer3) { createCacheInClientServer(); - Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] {commonAttributes ,new Integer(localMaxMemoryServer1) }); - Integer port2 = (Integer)server2.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] {commonAttributes, new Integer(localMaxMemoryServer2) }); - Integer port3 = (Integer)server3.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] { commonAttributes, new Integer(localMaxMemoryServer3) }); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerTestBase.createCacheServer(commonAttributes ,new Integer(localMaxMemoryServer1) )); + Integer port2 = (Integer)server2.invoke(() -> PRClientServerTestBase.createCacheServer(commonAttributes, new Integer(localMaxMemoryServer2) )); + Integer port3 = (Integer)server3.invoke(() -> PRClientServerTestBase.createCacheServer( commonAttributes, new Integer(localMaxMemoryServer3) )); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; - client.invoke(PRClientServerTestBase.class, "createCacheClient", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, - port3 }); + client.invoke(() -> PRClientServerTestBase.createCacheClient( NetworkUtils.getServerHostName(server1.getHost()), port1, port2, + port3 )); } protected void createClientServerScenarion_SingleConnection(ArrayList commonAttributes , int localMaxMemoryServer1, int localMaxMemoryServer2, int localMaxMemoryServer3) { createCacheInClientServer(); - Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] {commonAttributes ,new Integer(localMaxMemoryServer1) }); - server2.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] {commonAttributes ,new Integer(localMaxMemoryServer2) }); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerTestBase.createCacheServer(commonAttributes ,new Integer(localMaxMemoryServer1) )); + server2.invoke(() -> PRClientServerTestBase.createCacheServer(commonAttributes ,new Integer(localMaxMemoryServer2) )); serverPort1 = port1; - client.invoke(PRClientServerTestBase.class, "createCacheClient_SingleConnection", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1}); + client.invoke(() -> PRClientServerTestBase.createCacheClient_SingleConnection( NetworkUtils.getServerHostName(server1.getHost()), port1)); } @@ -500,46 +488,31 @@ protected void createClientServerScenarion_SingleConnection(ArrayList commonAttr protected void createClientServerScenarionWith2Regions(ArrayList commonAttributes , int localMaxMemoryServer1, int localMaxMemoryServer2, int localMaxMemoryServer3) { createCacheInClientServer(); - Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, - "createCacheServerWith2Regions", - new Object[] {commonAttributes ,new Integer(localMaxMemoryServer1) }); - Integer port2 = (Integer)server2.invoke(PRClientServerTestBase.class, - "createCacheServerWith2Regions", - new Object[] {commonAttributes, new Integer(localMaxMemoryServer2) }); - Integer port3 = (Integer)server3.invoke(PRClientServerTestBase.class, - "createCacheServerWith2Regions", - new Object[] { commonAttributes, new Integer(localMaxMemoryServer3) }); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerTestBase.createCacheServerWith2Regions(commonAttributes ,new Integer(localMaxMemoryServer1) )); + Integer port2 = (Integer)server2.invoke(() -> PRClientServerTestBase.createCacheServerWith2Regions(commonAttributes, new Integer(localMaxMemoryServer2) )); + Integer port3 = (Integer)server3.invoke(() -> PRClientServerTestBase.createCacheServerWith2Regions( commonAttributes, new Integer(localMaxMemoryServer3) )); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; - client.invoke(PRClientServerTestBase.class, "createCacheClientWith2Regions", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, - port3 }); + client.invoke(() -> PRClientServerTestBase.createCacheClientWith2Regions( NetworkUtils.getServerHostName(server1.getHost()), port1, port2, + port3 )); } protected void createClientServerScenarioSingleHop(ArrayList commonAttributes , int localMaxMemoryServer1, int localMaxMemoryServer2, int localMaxMemoryServer3) { createCacheInClientServer(); - Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] {commonAttributes ,new Integer(localMaxMemoryServer1) }); - Integer port2 = (Integer)server2.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] {commonAttributes, new Integer(localMaxMemoryServer2) }); - Integer port3 = (Integer)server3.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] { commonAttributes, new Integer(localMaxMemoryServer3) }); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerTestBase.createCacheServer(commonAttributes ,new Integer(localMaxMemoryServer1) )); + Integer port2 = (Integer)server2.invoke(() -> PRClientServerTestBase.createCacheServer(commonAttributes, new Integer(localMaxMemoryServer2) )); + Integer port3 = (Integer)server3.invoke(() -> PRClientServerTestBase.createCacheServer( commonAttributes, new Integer(localMaxMemoryServer3) )); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; //Workaround for the issue that hostnames returned by the client metadata may //not match those configured by the pool, leading to multiple copies //of the endpoint in the client. - String hostname = (String) server1.invoke(PRClientServerTestBase.class, - "getHostname", new Object[] {}); - client.invoke(PRClientServerTestBase.class, "createSingleHopCacheClient", - new Object[] { hostname, port1, port2, - port3 }); + String hostname = (String) server1.invoke(() -> PRClientServerTestBase.getHostname()); + client.invoke(() -> PRClientServerTestBase.createSingleHopCacheClient( hostname, port1, port2, + port3 )); } public static String getHostname() { @@ -549,79 +522,57 @@ public static String getHostname() { protected void createClientServerScenarioNoSingleHop(ArrayList commonAttributes , int localMaxMemoryServer1, int localMaxMemoryServer2, int localMaxMemoryServer3) { createCacheInClientServer(); - Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] {commonAttributes ,new Integer(localMaxMemoryServer1) }); - Integer port2 = (Integer)server2.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] {commonAttributes, new Integer(localMaxMemoryServer2) }); - Integer port3 = (Integer)server3.invoke(PRClientServerTestBase.class, - "createCacheServer", - new Object[] { commonAttributes, new Integer(localMaxMemoryServer3) }); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerTestBase.createCacheServer(commonAttributes ,new Integer(localMaxMemoryServer1) )); + Integer port2 = (Integer)server2.invoke(() -> PRClientServerTestBase.createCacheServer(commonAttributes, new Integer(localMaxMemoryServer2) )); + Integer port3 = (Integer)server3.invoke(() -> PRClientServerTestBase.createCacheServer( commonAttributes, new Integer(localMaxMemoryServer3) )); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; - client.invoke(PRClientServerTestBase.class, "createNoSingleHopCacheClient", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, - port3 }); + client.invoke(() -> PRClientServerTestBase.createNoSingleHopCacheClient( NetworkUtils.getServerHostName(server1.getHost()), port1, port2, + port3 )); } protected void createClientServerScenarioSelectorNoSingleHop(ArrayList commonAttributes , int localMaxMemoryServer1, int localMaxMemoryServer2, int localMaxMemoryServer3) { createCacheInClientServer(); - Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, - "createSelectorCacheServer", - new Object[] {commonAttributes ,new Integer(localMaxMemoryServer1) }); - Integer port2 = (Integer)server2.invoke(PRClientServerTestBase.class, - "createSelectorCacheServer", - new Object[] {commonAttributes, new Integer(localMaxMemoryServer2) }); - Integer port3 = (Integer)server3.invoke(PRClientServerTestBase.class, - "createSelectorCacheServer", - new Object[] { commonAttributes, new Integer(localMaxMemoryServer3) }); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerTestBase.createSelectorCacheServer(commonAttributes ,new Integer(localMaxMemoryServer1) )); + Integer port2 = (Integer)server2.invoke(() -> PRClientServerTestBase.createSelectorCacheServer(commonAttributes, new Integer(localMaxMemoryServer2) )); + Integer port3 = (Integer)server3.invoke(() -> PRClientServerTestBase.createSelectorCacheServer( commonAttributes, new Integer(localMaxMemoryServer3) )); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; - client.invoke(PRClientServerTestBase.class, "createNoSingleHopCacheClient", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, - port3 }); + client.invoke(() -> PRClientServerTestBase.createNoSingleHopCacheClient( NetworkUtils.getServerHostName(server1.getHost()), port1, port2, + port3 )); } protected void createClientServerScenarionWithoutRegion () { LogWriterUtils.getLogWriter().info("PRClientServerTestBase#createClientServerScenarionWithoutRegion : creating client server"); createCacheInClientServer(); - Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, - "createCacheServer"); - Integer port2 = (Integer)server2.invoke(PRClientServerTestBase.class, - "createCacheServer"); - Integer port3 = (Integer)server3.invoke(PRClientServerTestBase.class, - "createCacheServer"); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerTestBase.createCacheServer()); + Integer port2 = (Integer)server2.invoke(() -> PRClientServerTestBase.createCacheServer()); + Integer port3 = (Integer)server3.invoke(() -> PRClientServerTestBase.createCacheServer()); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; - client.invoke(PRClientServerTestBase.class, "createCacheClientWithoutRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, - port3 }); + client.invoke(() -> PRClientServerTestBase.createCacheClientWithoutRegion( NetworkUtils.getServerHostName(server1.getHost()), port1, port2, + port3 )); } protected void createClientServerScenarionWithDistributedtRegion () { LogWriterUtils.getLogWriter().info("PRClientServerTestBase#createClientServerScenarionWithoutRegion : creating client server"); createCacheInClientServer(); - Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, - "createCacheServerWithDR"); - Integer port2 = (Integer)server2.invoke(PRClientServerTestBase.class, - "createCacheServerWithDR"); - Integer port3 = (Integer)server3.invoke(PRClientServerTestBase.class, - "createCacheServerWithDR"); + Integer port1 = (Integer)server1.invoke(() -> PRClientServerTestBase.createCacheServerWithDR()); + Integer port2 = (Integer)server2.invoke(() -> PRClientServerTestBase.createCacheServerWithDR()); + Integer port3 = (Integer)server3.invoke(() -> PRClientServerTestBase.createCacheServerWithDR()); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; - client.invoke(PRClientServerTestBase.class, "createCacheClientWithDistributedRegion", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, - port3 }); + client.invoke(() -> PRClientServerTestBase.createCacheClientWithDistributedRegion( NetworkUtils.getServerHostName(server1.getHost()), port1, port2, + port3 )); } protected void runOnAllServers(SerializableRunnable runnable) { @@ -647,21 +598,17 @@ public static void registerFunction (Function function){ private void createCacheInClientServer() { Properties props = new Properties(); - server1.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); + server1.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); - server2.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); + server2.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); - server3.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); + server3.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); props = new Properties(); props.setProperty("mcast-port", "0"); props.setProperty("locators", ""); - client.invoke(PRClientServerTestBase.class, "createCacheInVm", - new Object[] { props }); + client.invoke(() -> PRClientServerTestBase.createCacheInVm( props )); } public static void createCacheInVm(Properties props) { @@ -737,10 +684,10 @@ public String description() { @Override protected final void postTearDownCacheTestCase() throws Exception { closeCache(); - client.invoke(PRClientServerTestBase.class, "closeCache"); - server1.invoke(PRClientServerTestBase.class, "closeCache"); - server2.invoke(PRClientServerTestBase.class, "closeCache"); - server3.invoke(PRClientServerTestBase.class, "closeCache"); + client.invoke(() -> PRClientServerTestBase.closeCache()); + server1.invoke(() -> PRClientServerTestBase.closeCache()); + server2.invoke(() -> PRClientServerTestBase.closeCache()); + server3.invoke(() -> PRClientServerTestBase.closeCache()); } public static void closeCache() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java index 5ce60f3bc7fa..839d78c4e2db 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java @@ -275,25 +275,15 @@ public void testColocatedPartitionedRegion() throws Throwable { totalNumBuckets, colocatedWith, isPartitionResolver }; createPartitionedRegion(attributeObjects); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "A" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "A" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "D" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "D" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "H" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "H" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "B" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "B" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "K" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "K" )); } /* * Test for checking the colocation of the regions which forms the tree @@ -408,25 +398,15 @@ public void testColocatedPartitionedRegion_NoFullPath() throws Throwable { totalNumBuckets, colocatedWith, isPartitionResolver }; createPartitionedRegion(attributeObjects); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "A" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "A" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "D" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "D" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "H" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "H" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "B" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "B" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "K" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "K" )); } public void testColocatedSubPartitionedRegion() throws Throwable { createCacheInAllVms(); @@ -538,25 +518,15 @@ public void testColocatedSubPartitionedRegion() throws Throwable { totalNumBuckets, colocatedWith, isPartitionResolver }; createSubPartitionedRegion(attributeObjects); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootA/A" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootA/A" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootD/D" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootD/D" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootH/H" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootH/H" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootB/B" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootB/B" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootK/K" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootK/K" )); } public void testColocatedSubPartitionedRegion_NoFullPath() throws Throwable { @@ -669,25 +639,15 @@ public void testColocatedSubPartitionedRegion_NoFullPath() throws Throwable { totalNumBuckets, colocatedWith, isPartitionResolver }; createSubPartitionedRegion(attributeObjects); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootA/A" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootA/A" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootD/D" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootD/D" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootH/H" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootH/H" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootB/B" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootB/B" )); - accessor.invoke(PRColocationDUnitTest.class, - "validateColocatedRegions", - new Object[] { "rootK/K" }); + accessor.invoke(() -> PRColocationDUnitTest.validateColocatedRegions( "rootK/K" )); } public void testColocatedPRWithAccessorOnDifferentNode1() throws Throwable { @@ -994,12 +954,9 @@ public void testColocatedPRWithLocalDestroy() throws Throwable { // Put the customer 1-10 in CustomerPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putCustomerPartitionedRegion( CustomerPartitionedRegionName )); // Put the order 1-10 for each Customer in OrderPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, "putOrderPartitionedRegion", - new Object[] { OrderPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putOrderPartitionedRegion( OrderPartitionedRegionName )); // add expected exception string final String expectedExMessage = @@ -1072,12 +1029,9 @@ public void testColocatedPRWithDestroy() throws Throwable { // Put the customer 1-10 in CustomerPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putCustomerPartitionedRegion( CustomerPartitionedRegionName )); // Put the order 1-10 for each Customer in OrderPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, "putOrderPartitionedRegion", - new Object[] { OrderPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putOrderPartitionedRegion( OrderPartitionedRegionName )); // add expected exception string final String expectedExMessage = "colocation chain cannot be destroyed, " @@ -1162,34 +1116,23 @@ public void testColocatedPRWithClose() throws Throwable { // Put the customer 1-10 in CustomerPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putCustomerPartitionedRegion( CustomerPartitionedRegionName )); // Put the order 1-10 for each Customer in OrderPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, "putOrderPartitionedRegion", - new Object[] { OrderPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putOrderPartitionedRegion( OrderPartitionedRegionName )); // Closing region with colocated regions will throw an exception // and the region will not be closed. - accessor.invoke(PRColocationDUnitTest.class, - "closeRegionWithColocatedRegions", - new Object[] { CustomerPartitionedRegionName, false }); + accessor.invoke(() -> PRColocationDUnitTest.closeRegionWithColocatedRegions( CustomerPartitionedRegionName, false )); // Destroying region with colocated regions will throw an exception // and the region will not be closed. - accessor.invoke(PRColocationDUnitTest.class, - "closeRegionWithColocatedRegions", - new Object[] { CustomerPartitionedRegionName, true }); + accessor.invoke(() -> PRColocationDUnitTest.closeRegionWithColocatedRegions( CustomerPartitionedRegionName, true )); // Closing the colocated regions in the right order should work - accessor.invoke(PRColocationDUnitTest.class, - "closeRegion", - new Object[] { OrderPartitionedRegionName}); - accessor.invoke(PRColocationDUnitTest.class, - "closeRegion", - new Object[] { CustomerPartitionedRegionName}); + accessor.invoke(() -> PRColocationDUnitTest.closeRegion( OrderPartitionedRegionName)); + accessor.invoke(() -> PRColocationDUnitTest.closeRegion( CustomerPartitionedRegionName)); } /* * Test For partition Region with Key Based Routing Resolver @@ -1285,44 +1228,34 @@ public void testColocationPartitionedRegion() throws Throwable { createPartitionedRegion(attributeObjects); // Initial Validation for the number of data stores and number of profiles - accessor.invoke(PRColocationDUnitTest.class, - "validateBeforePutCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.validateBeforePutCustomerPartitionedRegion( CustomerPartitionedRegionName )); // Put the customer 1-10 in CustomerPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putCustomerPartitionedRegion( CustomerPartitionedRegionName )); // Put the order 1-10 for each Customer in OrderPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, "putOrderPartitionedRegion", - new Object[] { OrderPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putOrderPartitionedRegion( OrderPartitionedRegionName )); // Put the shipment 1-10 for each order in ShipmentPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putShipmentPartitionedRegion", - new Object[] { ShipmentPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putShipmentPartitionedRegion( ShipmentPartitionedRegionName )); // for VM0 DataStore check the number of buckets created and the size of // bucket for all partitionedRegion - Integer totalBucketsInDataStore1 = (Integer)dataStore1.invoke( - PRColocationDUnitTest.class, "validateDataStore", new Object[] { + Integer totalBucketsInDataStore1 = (Integer)dataStore1.invoke(() -> PRColocationDUnitTest.validateDataStore( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); // for VM1 DataStore check the number of buckets created and the size of // bucket for all partitionedRegion - Integer totalBucketsInDataStore2 = (Integer)dataStore2.invoke( - PRColocationDUnitTest.class, "validateDataStore", new Object[] { + Integer totalBucketsInDataStore2 = (Integer)dataStore2.invoke(() -> PRColocationDUnitTest.validateDataStore( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); // for VM3 Datastore check the number of buckets created and the size of // bucket for all partitionedRegion - Integer totalBucketsInDataStore3 = (Integer)dataStore3.invoke( - PRColocationDUnitTest.class, "validateDataStore", new Object[] { + Integer totalBucketsInDataStore3 = (Integer)dataStore3.invoke(() -> PRColocationDUnitTest.validateDataStore( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); // Check the total number of buckets created in all three Vms are equalto 30 totalNumBucketsInTest = totalBucketsInDataStore1.intValue() @@ -1333,10 +1266,9 @@ public void testColocationPartitionedRegion() throws Throwable { // This is the importatnt check. Checks that the colocated Customer,Order // and Shipment are in the same VM - accessor.invoke(PRColocationDUnitTest.class, - "validateAfterPutPartitionedRegion", new Object[] { + accessor.invoke(() -> PRColocationDUnitTest.validateAfterPutPartitionedRegion( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); } @@ -1432,70 +1364,56 @@ public void testColocationPartitionedRegionWithRedundancy() throws Throwable { createPartitionedRegion(attributeObjects); // Initial Validation for the number of data stores and number of profiles - accessor.invoke(PRColocationDUnitTest.class, - "validateBeforePutCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.validateBeforePutCustomerPartitionedRegion( CustomerPartitionedRegionName )); // Put the customer 1-10 in CustomerPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putCustomerPartitionedRegion( CustomerPartitionedRegionName )); // Put the order 1-10 for each Customer in OrderPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, "putOrderPartitionedRegion", - new Object[] { OrderPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putOrderPartitionedRegion( OrderPartitionedRegionName )); // Put the shipment 1-10 for each order in ShipmentPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putShipmentPartitionedRegion", - new Object[] { ShipmentPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putShipmentPartitionedRegion( ShipmentPartitionedRegionName )); // This is the importatnt check. Checks that the colocated Customer,Order // and Shipment are in the same VM - accessor.invoke(PRColocationDUnitTest.class, - "validateAfterPutPartitionedRegion", new Object[] { + accessor.invoke(() -> PRColocationDUnitTest.validateAfterPutPartitionedRegion( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); // for VM0 DataStore check the number of buckets created and the size of // bucket for all partitionedRegion - Integer totalBucketsInDataStore1 = (Integer)dataStore1.invoke( - PRColocationDUnitTest.class, "validateDataStore", new Object[] { + Integer totalBucketsInDataStore1 = (Integer)dataStore1.invoke(() -> PRColocationDUnitTest.validateDataStore( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); // for VM1 DataStore check the number of buckets created and the size of // bucket for all partitionedRegion - Integer totalBucketsInDataStore2 = (Integer)dataStore2.invoke( - PRColocationDUnitTest.class, "validateDataStore", new Object[] { + Integer totalBucketsInDataStore2 = (Integer)dataStore2.invoke(() -> PRColocationDUnitTest.validateDataStore( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); // for VM3 Datastore check the number of buckets created and the size of // bucket for all partitionedRegion - Integer totalBucketsInDataStore3 = (Integer)dataStore3.invoke( - PRColocationDUnitTest.class, "validateDataStore", new Object[] { + Integer totalBucketsInDataStore3 = (Integer)dataStore3.invoke(() -> PRColocationDUnitTest.validateDataStore( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); if (redundancy.intValue() > 0) { // for VM0 DataStore check the number of buckets created and the size of // bucket for all partitionedRegion - dataStore1.invoke(PRColocationDUnitTest.class, "validateDataStoreForRedundancy", - new Object[] { CustomerPartitionedRegionName, - OrderPartitionedRegionName, ShipmentPartitionedRegionName }); + dataStore1.invoke(() -> PRColocationDUnitTest.validateDataStoreForRedundancy( CustomerPartitionedRegionName, + OrderPartitionedRegionName, ShipmentPartitionedRegionName )); // for VM1 DataStore check the number of buckets created and the size of // bucket for all partitionedRegion - dataStore2.invoke(PRColocationDUnitTest.class, "validateDataStoreForRedundancy", - new Object[] { CustomerPartitionedRegionName, - OrderPartitionedRegionName, ShipmentPartitionedRegionName }); + dataStore2.invoke(() -> PRColocationDUnitTest.validateDataStoreForRedundancy( CustomerPartitionedRegionName, + OrderPartitionedRegionName, ShipmentPartitionedRegionName )); // for VM3 Datastore check the number of buckets created and the size of // bucket for all partitionedRegion - dataStore3.invoke(PRColocationDUnitTest.class, "validateDataStoreForRedundancy", - new Object[] { CustomerPartitionedRegionName, - OrderPartitionedRegionName, ShipmentPartitionedRegionName }); + dataStore3.invoke(() -> PRColocationDUnitTest.validateDataStoreForRedundancy( CustomerPartitionedRegionName, + OrderPartitionedRegionName, ShipmentPartitionedRegionName )); } // Check the total number of buckets created in all three Vms are equalto 60 @@ -1671,15 +1589,12 @@ public void testColocationPartitionedRegionWithKeyPartitionResolver() createPartitionedRegion(attributeObjects); // Initial Validation for the number of data stores and number of profiles - accessor.invoke(PRColocationDUnitTest.class, - "validateBeforePutCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.validateBeforePutCustomerPartitionedRegion( CustomerPartitionedRegionName )); // Put the customer 1-10 in CustomerPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putData_KeyBasedPartitionResolver"); + accessor.invoke(() -> PRColocationDUnitTest.putData_KeyBasedPartitionResolver()); - accessor.invoke(PRColocationDUnitTest.class, "executeFunction"); + accessor.invoke(() -> PRColocationDUnitTest.executeFunction()); } public void testColocatedPRRedundancyRecovery2() throws Throwable { @@ -2387,10 +2302,10 @@ public static void validateAfterPutPartitionedRegion( } protected void createCacheInAllVms() { - dataStore1.invoke(PRColocationDUnitTest.class, "createCacheInVm"); - dataStore2.invoke(PRColocationDUnitTest.class, "createCacheInVm"); - dataStore3.invoke(PRColocationDUnitTest.class, "createCacheInVm"); - accessor.invoke(PRColocationDUnitTest.class, "createCacheInVm"); + dataStore1.invoke(() -> PRColocationDUnitTest.createCacheInVm()); + dataStore2.invoke(() -> PRColocationDUnitTest.createCacheInVm()); + dataStore3.invoke(() -> PRColocationDUnitTest.createCacheInVm()); + accessor.invoke(() -> PRColocationDUnitTest.createCacheInVm()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java index 981db10eb4f8..55ab928d89bc 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java @@ -443,10 +443,10 @@ public void testPartitionedRegionOperationsCustomPartitioning() final VM accessor = vm3; //create cache in all vms - vm0.invoke(PRCustomPartitioningDUnitTest.class, "createCacheInVm"); - vm1.invoke(PRCustomPartitioningDUnitTest.class, "createCacheInVm"); - vm2.invoke(PRCustomPartitioningDUnitTest.class, "createCacheInVm"); - accessor.invoke(PRCustomPartitioningDUnitTest.class, "createCacheInVm"); + vm0.invoke(() -> PRCustomPartitioningDUnitTest.createCacheInVm()); + vm1.invoke(() -> PRCustomPartitioningDUnitTest.createCacheInVm()); + vm2.invoke(() -> PRCustomPartitioningDUnitTest.createCacheInVm()); + accessor.invoke(() -> PRCustomPartitioningDUnitTest.createCacheInVm()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java index 0c4b7a9b826b..a8df3f6ca5a8 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java @@ -968,8 +968,7 @@ public Object call() throws Exception { int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = accessor.invokeAsync(PRFunctionExecutionDUnitTest.class, - "executeFunction"); + async[0] = accessor.invokeAsync(() -> PRFunctionExecutionDUnitTest.executeFunction()); o = datastore0.invoke(new SerializableCallable("close cache") { public Object call() throws Exception { @@ -1066,8 +1065,7 @@ public Object call() throws Exception { int AsyncInvocationArrSize = 1; AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize]; - async[0] = accessor.invokeAsync(PRFunctionExecutionDUnitTest.class, - "executeFunction"); + async[0] = accessor.invokeAsync(() -> PRFunctionExecutionDUnitTest.executeFunction()); o = datastore0.invoke(new SerializableCallable("disconnect") { public Object call() throws Exception { @@ -2994,7 +2992,7 @@ public String getId() { public void testBug41118() { Host host = Host.getHost(0); final VM lonerVM = host.getVM(1); - lonerVM.invoke(PRFunctionExecutionDUnitTest.class, "bug41118"); + lonerVM.invoke(() -> PRFunctionExecutionDUnitTest.bug41118()); } public static void bug41118(){ diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java index cd35f50d4879..4643123780bc 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java @@ -330,10 +330,10 @@ public void testPartitionedRegionOperationsCustomPartitioning() //final VM accessor = vm3; //create cache in all vms - accessor.invoke(PRPerformanceTestDUnitTest.class, "createCacheInVm"); - vm1.invoke(PRPerformanceTestDUnitTest.class, "createCacheInVm"); - vm2.invoke(PRPerformanceTestDUnitTest.class, "createCacheInVm"); - vm3.invoke(PRPerformanceTestDUnitTest.class, "createCacheInVm"); + accessor.invoke(() -> PRPerformanceTestDUnitTest.createCacheInVm()); + vm1.invoke(() -> PRPerformanceTestDUnitTest.createCacheInVm()); + vm2.invoke(() -> PRPerformanceTestDUnitTest.createCacheInVm()); + vm3.invoke(() -> PRPerformanceTestDUnitTest.createCacheInVm()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java index b253dc050096..15cf7530b467 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java @@ -232,9 +232,7 @@ protected void createColocatedPRs(int redundantBuckets) { OrderPartitionedRegionName); // Initial Validation for the number of data stores and number of profiles - accessor.invoke(PRColocationDUnitTest.class, - "validateBeforePutCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.validateBeforePutCustomerPartitionedRegion( CustomerPartitionedRegionName )); } @Override @@ -254,39 +252,31 @@ public Object call() throws Exception { protected void populateAndVerifyColocatedPRs(int redundantBuckets) { // Put the customer 1-10 in CustomerPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putCustomerPartitionedRegion( CustomerPartitionedRegionName )); // Put the order 1-10 for each Customer in OrderPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, "putOrderPartitionedRegion", - new Object[] { OrderPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putOrderPartitionedRegion( OrderPartitionedRegionName )); // Put the shipment 1-10 for each order in ShipmentPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putShipmentPartitionedRegion", - new Object[] { ShipmentPartitionedRegionName }); + accessor.invoke(() -> PRColocationDUnitTest.putShipmentPartitionedRegion( ShipmentPartitionedRegionName )); // for VM0 DataStore check the number of buckets created and the size of // bucket for all partitionedRegion - Integer totalBucketsInDataStore1 = (Integer)dataStore1.invoke( - PRColocationDUnitTest.class, "validateDataStore", new Object[] { + Integer totalBucketsInDataStore1 = (Integer)dataStore1.invoke(() -> PRColocationDUnitTest.validateDataStore( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); // for VM1 DataStore check the number of buckets created and the size of // bucket for all partitionedRegion - Integer totalBucketsInDataStore2 = (Integer)dataStore2.invoke( - PRColocationDUnitTest.class, "validateDataStore", new Object[] { + Integer totalBucketsInDataStore2 = (Integer)dataStore2.invoke(() -> PRColocationDUnitTest.validateDataStore( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); // for VM3 Datastore check the number of buckets created and the size of // bucket for all partitionedRegion - Integer totalBucketsInDataStore3 = (Integer)dataStore3.invoke( - PRColocationDUnitTest.class, "validateDataStore", new Object[] { + Integer totalBucketsInDataStore3 = (Integer)dataStore3.invoke(() -> PRColocationDUnitTest.validateDataStore( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); // Check the total number of buckets created in all three Vms are equalto 30 totalNumBucketsInTest = totalBucketsInDataStore1.intValue() @@ -297,10 +287,9 @@ protected void populateAndVerifyColocatedPRs(int redundantBuckets) { // This is the importatnt check. Checks that the colocated Customer,Order // and Shipment are in the same VM - accessor.invoke(PRColocationDUnitTest.class, - "validateAfterPutPartitionedRegion", new Object[] { + accessor.invoke(() -> PRColocationDUnitTest.validateAfterPutPartitionedRegion( CustomerPartitionedRegionName, OrderPartitionedRegionName, - ShipmentPartitionedRegionName }); + ShipmentPartitionedRegionName )); } @@ -364,16 +353,11 @@ public Object call() throws Exception { dataStore3.invoke(registerListeners); // Put the customer 1-10 in CustomerPartitionedRegion - accessor.invoke(PRColocationDUnitTest.class, - "putCustomerPartitionedRegion", - new Object[] { CustomerPartitionedRegionName }); - - dataStore1.invoke(PRTransactionDUnitTest.class, - "validatePRTXInCacheListener"); - dataStore2.invoke(PRTransactionDUnitTest.class, - "validatePRTXInCacheListener"); - dataStore3.invoke(PRTransactionDUnitTest.class, - "validatePRTXInCacheListener"); + accessor.invoke(() -> PRColocationDUnitTest.putCustomerPartitionedRegion( CustomerPartitionedRegionName )); + + dataStore1.invoke(() -> PRTransactionDUnitTest.validatePRTXInCacheListener()); + dataStore2.invoke(() -> PRTransactionDUnitTest.validatePRTXInCacheListener()); + dataStore3.invoke(() -> PRTransactionDUnitTest.validatePRTXInCacheListener()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java index 33e22f482828..863e260561c6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java @@ -58,8 +58,7 @@ public void setUp() throws Exception { @Ignore("Disabled due to bug #50618") public void testServerGetAllFunction(){ createScenario(); - client.invoke(SingleHopGetAllPutAllDUnitTest.class, - "getAll"); + client.invoke(() -> SingleHopGetAllPutAllDUnitTest.getAll()); } private void createScenario() { @@ -148,8 +147,7 @@ public String description() { */ public void testServerPutAllFunction(){ createScenario(); - client.invoke(SingleHopGetAllPutAllDUnitTest.class, - "putAll"); + client.invoke(() -> SingleHopGetAllPutAllDUnitTest.putAll()); } public static void putAll() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java index 09e0fbf402b4..cee0304b3110 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java @@ -109,12 +109,10 @@ public void setUp() throws Exception final Host host = Host.getHost(0); server = host.getVM(0); client = host.getVM(1); - server.invoke(ConflationDUnitTest.class, "setIsSlowStart"); - int PORT2 = ((Integer)server.invoke(Bug36853EventsExpiryDUnitTest.class, - "createServerCache")).intValue(); + server.invoke(() -> ConflationDUnitTest.setIsSlowStart()); + int PORT2 = ((Integer)server.invoke(() -> Bug36853EventsExpiryDUnitTest.createServerCache())).intValue(); - client.invoke(Bug36853EventsExpiryDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT2) }); + client.invoke(() -> Bug36853EventsExpiryDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT2) )); } @@ -244,9 +242,8 @@ public void testEventsExpiryBug() throws Exception { IgnoredException.addIgnoredException("Unexpected IOException"); IgnoredException.addIgnoredException("Connection reset"); - server.invoke(Bug36853EventsExpiryDUnitTest.class, "generateEvents"); - client.invoke(Bug36853EventsExpiryDUnitTest.class, - "validateEventCountAtClient"); + server.invoke(() -> Bug36853EventsExpiryDUnitTest.generateEvents()); + client.invoke(() -> Bug36853EventsExpiryDUnitTest.validateEventCountAtClient()); } /** @@ -298,9 +295,9 @@ public static void closeCache() protected final void preTearDownCacheTestCase() throws Exception { // close client - client.invoke(Bug36853EventsExpiryDUnitTest.class, "closeCache"); + client.invoke(() -> Bug36853EventsExpiryDUnitTest.closeCache()); // close server - server.invoke(Bug36853EventsExpiryDUnitTest.class, "closeCache"); + server.invoke(() -> Bug36853EventsExpiryDUnitTest.closeCache()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java index 66f1a11e243a..9e03a70ca24e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java @@ -72,8 +72,8 @@ public void setUp() throws Exception { @Override protected final void preTearDown() throws Exception { reset(); - server.invoke(Bug48571DUnitTest.class, "reset"); - client.invoke(Bug48571DUnitTest.class, "reset"); + server.invoke(() -> Bug48571DUnitTest.reset()); + client.invoke(() -> Bug48571DUnitTest.reset()); } public static void reset() throws Exception { @@ -90,21 +90,21 @@ public static void reset() throws Exception { public void testStatsMatchWithSize() throws Exception { IgnoredException.addIgnoredException("Unexpected IOException||Connection reset"); // start a server - int port = (Integer) server.invoke(Bug48571DUnitTest.class, "createServerCache"); + int port = (Integer) server.invoke(() -> Bug48571DUnitTest.createServerCache()); // create durable client, with durable RI - client.invoke(Bug48571DUnitTest.class, "createClientCache", new Object[] {client.getHost(), port}); + client.invoke(() -> Bug48571DUnitTest.createClientCache(client.getHost(), port)); // do puts on server from three different threads, pause after 500 puts each. - server.invoke(Bug48571DUnitTest.class, "doPuts"); + server.invoke(() -> Bug48571DUnitTest.doPuts()); // close durable client - client.invoke(Bug48571DUnitTest.class, "closeClientCache"); + client.invoke(() -> Bug48571DUnitTest.closeClientCache()); // resume puts on server, add another 100. - server.invokeAsync(Bug48571DUnitTest.class, "resumePuts"); + server.invokeAsync(() -> Bug48571DUnitTest.resumePuts()); // start durable client - client.invoke(Bug48571DUnitTest.class, "createClientCache", new Object[] {client.getHost(), port}); + client.invoke(() -> Bug48571DUnitTest.createClientCache(client.getHost(), port)); // wait for full queue dispatch - client.invoke(Bug48571DUnitTest.class, "waitForLastKey"); + client.invoke(() -> Bug48571DUnitTest.waitForLastKey()); // verify the stats - server.invoke(Bug48571DUnitTest.class, "verifyStats"); + server.invoke(() -> Bug48571DUnitTest.verifyStats()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java index c7ff13ac2125..636333a58e7a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java @@ -59,10 +59,8 @@ public void setUp() throws Exception { vm0 = host.getVM(0); // server1 vm1 = host.getVM(1); // server2 - int port0 = (Integer) vm0.invoke(Bug48879DUnitTest.class, - "createCacheServer", new Object[] { }); - int port1 = (Integer) vm1.invoke(Bug48879DUnitTest.class, - "createCacheServer", new Object[] { }); + int port0 = (Integer) vm0.invoke(() -> Bug48879DUnitTest.createCacheServer( )); + int port1 = (Integer) vm1.invoke(() -> Bug48879DUnitTest.createCacheServer( )); createClientCache(host, new Integer[] {port0, port1}, Boolean.TRUE); } @@ -71,8 +69,8 @@ public void setUp() throws Exception { protected final void preTearDown() throws Exception { closeCache(); - vm0.invoke(Bug48879DUnitTest.class, "closeCache"); - vm1.invoke(Bug48879DUnitTest.class, "closeCache"); + vm0.invoke(() -> Bug48879DUnitTest.closeCache()); + vm1.invoke(() -> Bug48879DUnitTest.closeCache()); } public static void closeCache() throws Exception { @@ -206,16 +204,16 @@ public void testThreadIdentfiersExpiry() throws Exception { // put events in region int threads = 10; int putsPerThread = 1; - vm0.invoke(Bug48879DUnitTest.class, "doPuts", new Object[] {threads, putsPerThread}); - vm0.invoke(Bug48879DUnitTest.class, "verifyThreadsBeforeExpiry", new Object[] {threads}); - vm1.invoke(Bug48879DUnitTest.class, "verifyThreadsBeforeExpiry", new Object[] {threads}); + vm0.invoke(() -> Bug48879DUnitTest.doPuts(threads, putsPerThread)); + vm0.invoke(() -> Bug48879DUnitTest.verifyThreadsBeforeExpiry(threads)); + vm1.invoke(() -> Bug48879DUnitTest.verifyThreadsBeforeExpiry(threads)); // sleep till expiry time elapses Thread.sleep(SLEEP_TIME*2 + 30000); // Assert that threadidentifiers are expired and region events are retained on primary server - vm0.invoke(Bug48879DUnitTest.class, "verifyStats", new Object[] {threads*putsPerThread, threads}); + vm0.invoke(() -> Bug48879DUnitTest.verifyStats(threads*putsPerThread, threads)); // Assert that region events and threadidentifiers are expired on secondary server. - vm1.invoke(Bug48879DUnitTest.class, "verifyStats", new Object[] {threads*putsPerThread, threads}); + vm1.invoke(() -> Bug48879DUnitTest.verifyStats(threads*putsPerThread, threads)); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java index 086b9563eb4f..b4fbc5865931 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java @@ -169,15 +169,11 @@ public void setUp() throws Exception { client1 = host.getVM(2); client2 = host.getVM(3); - int PORT1 = ((Integer)server1.invoke(EventIdOptimizationDUnitTest.class, - "createServerCache")).intValue(); - int PORT2 = ((Integer)server2.invoke(EventIdOptimizationDUnitTest.class, - "createServerCache")).intValue(); + int PORT1 = ((Integer)server1.invoke(() -> EventIdOptimizationDUnitTest.createServerCache())).intValue(); + int PORT2 = ((Integer)server2.invoke(() -> EventIdOptimizationDUnitTest.createServerCache())).intValue(); - client1.invoke(EventIdOptimizationDUnitTest.class, "createClientCache1", - new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT1) }); - client2.invoke(EventIdOptimizationDUnitTest.class, "createClientCache2", - new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT2) }); + client1.invoke(() -> EventIdOptimizationDUnitTest.createClientCache1( NetworkUtils.getServerHostName(host), new Integer(PORT1) )); + client2.invoke(() -> EventIdOptimizationDUnitTest.createClientCache2( NetworkUtils.getServerHostName(host), new Integer(PORT2) )); } @@ -388,10 +384,8 @@ public static void generateEventsByClearRegionOperation() throws Exception */ public void testEventIdOptimizationByPutOperation() throws Exception { - client1.invoke(EventIdOptimizationDUnitTest.class, - "generateEventsByPutOperation"); - client2.invoke(EventIdOptimizationDUnitTest.class, - "verifyEventIdsOnClient2"); + client1.invoke(() -> EventIdOptimizationDUnitTest.generateEventsByPutOperation()); + client2.invoke(() -> EventIdOptimizationDUnitTest.verifyEventIdsOnClient2()); } @@ -405,10 +399,8 @@ public void testEventIdOptimizationByPutOperation() throws Exception */ public void testEventIdOptimizationByDestroyEntryOperation() throws Exception { - client1.invoke(EventIdOptimizationDUnitTest.class, - "generateEventsByDestroyEntryOperation"); - client2.invoke(EventIdOptimizationDUnitTest.class, - "verifyEventIdsOnClient2"); + client1.invoke(() -> EventIdOptimizationDUnitTest.generateEventsByDestroyEntryOperation()); + client2.invoke(() -> EventIdOptimizationDUnitTest.verifyEventIdsOnClient2()); } /** @@ -422,10 +414,8 @@ public void testEventIdOptimizationByDestroyEntryOperation() throws Exception public void testEventIdOptimizationByDestroyRegionOperation() throws Exception { - client1.invoke(EventIdOptimizationDUnitTest.class, - "generateEventsByDestroyRegionOperation"); - client2.invoke(EventIdOptimizationDUnitTest.class, - "verifyEventIdsOnClient2"); + client1.invoke(() -> EventIdOptimizationDUnitTest.generateEventsByDestroyRegionOperation()); + client2.invoke(() -> EventIdOptimizationDUnitTest.verifyEventIdsOnClient2()); } /** @@ -438,10 +428,8 @@ public void testEventIdOptimizationByDestroyRegionOperation() */ public void testEventIdOptimizationByClearRegionOperation() throws Exception { - client1.invoke(EventIdOptimizationDUnitTest.class, - "generateEventsByClearRegionOperation"); - client2.invoke(EventIdOptimizationDUnitTest.class, - "verifyEventIdsOnClient2"); + client1.invoke(() -> EventIdOptimizationDUnitTest.generateEventsByClearRegionOperation()); + client2.invoke(() -> EventIdOptimizationDUnitTest.verifyEventIdsOnClient2()); } /** @@ -513,11 +501,11 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { // close client - client1.invoke(EventIdOptimizationDUnitTest.class, "closeCache"); - client2.invoke(EventIdOptimizationDUnitTest.class, "closeCache"); + client1.invoke(() -> EventIdOptimizationDUnitTest.closeCache()); + client2.invoke(() -> EventIdOptimizationDUnitTest.closeCache()); // close server - server1.invoke(EventIdOptimizationDUnitTest.class, "closeCache"); - server2.invoke(EventIdOptimizationDUnitTest.class, "closeCache"); + server1.invoke(() -> EventIdOptimizationDUnitTest.closeCache()); + server2.invoke(() -> EventIdOptimizationDUnitTest.closeCache()); } /** diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java index 1119313cefd5..90e9703fc6e0 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java @@ -84,10 +84,10 @@ public void setUp() throws Exception vm1 = host.getVM(1); //start servers first - vm0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - vm1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - PORT1 = ((Integer)vm0.invoke(FailoverDUnitTest.class, "createServerCache" )).intValue(); - PORT2 = ((Integer)vm1.invoke(FailoverDUnitTest.class, "createServerCache" )).intValue(); + vm0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + vm1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + PORT1 = ((Integer)vm0.invoke(() -> FailoverDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)vm1.invoke(() -> FailoverDUnitTest.createServerCache())).intValue(); CacheServerTestUtil.disableShufflingOfEndpoints(); createClientCache(NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)); @@ -108,10 +108,10 @@ public void testFailover() createEntries(); waitForPrimaryAndBackups(1); registerInterestList(); - primary.invoke(FailoverDUnitTest.class, "put"); + primary.invoke(() -> FailoverDUnitTest.put()); verifyEntries(); setClientServerObserver(); - primary.invoke(FailoverDUnitTest.class, "stopServer"); + primary.invoke(() -> FailoverDUnitTest.stopServer()); verifyEntriesAfterFailover(); } @@ -286,7 +286,7 @@ public static void setClientServerObserver() { PoolImpl.BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = true; ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() { public void beforePrimaryIdentificationFromBackup() { - primary.invoke(FailoverDUnitTest.class, "putDuringFailover"); + primary.invoke(() -> FailoverDUnitTest.putDuringFailover()); PoolImpl.BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false; } }); @@ -329,8 +329,8 @@ protected final void preTearDown() throws Exception { // close the clients first closeCache(); // then close the servers - vm0.invoke(FailoverDUnitTest.class, "closeCache"); - vm1.invoke(FailoverDUnitTest.class, "closeCache"); + vm0.invoke(() -> FailoverDUnitTest.closeCache()); + vm1.invoke(() -> FailoverDUnitTest.closeCache()); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java index 02cd88051bb7..41f56cc7e734 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java @@ -91,26 +91,26 @@ public void setUp() throws Exception client2 = host.getVM(3); //System.setProperty()) - PORT1 = ((Integer)server1.invoke(HABugInPutDUnitTest.class, "createServerCache")) + PORT1 = ((Integer)server1.invoke(() -> HABugInPutDUnitTest.createServerCache())) .intValue(); - PORT2 = ((Integer)server2.invoke(HABugInPutDUnitTest.class, "createServerCache")) + PORT2 = ((Integer)server2.invoke(() -> HABugInPutDUnitTest.createServerCache())) .intValue(); - client1.invoke(HABugInPutDUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) }); - client2.invoke(HABugInPutDUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) }); + client1.invoke(() -> HABugInPutDUnitTest.createClientCache( + NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) )); + client2.invoke(() -> HABugInPutDUnitTest.createClientCache( + NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) )); //Boolean.getBoolean("") } @Override protected final void preTearDown() throws Exception { - client1.invoke(HABugInPutDUnitTest.class, "closeCache"); - client2.invoke(HABugInPutDUnitTest.class, "closeCache"); + client1.invoke(() -> HABugInPutDUnitTest.closeCache()); + client2.invoke(() -> HABugInPutDUnitTest.closeCache()); // close server - server1.invoke(HABugInPutDUnitTest.class, "closeCache"); - server2.invoke(HABugInPutDUnitTest.class, "closeCache"); + server1.invoke(() -> HABugInPutDUnitTest.closeCache()); + server2.invoke(() -> HABugInPutDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java index 58e54edd66c7..6a34318255f5 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java @@ -95,10 +95,10 @@ public void setUp() throws Exception final Host host = Host.getHost(0); server1 = host.getVM(0); - server1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + server1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); server2 = host.getVM(1); - server2.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + server2.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); client1 = host.getVM(2); @@ -110,10 +110,10 @@ public void setUp() throws Exception @Override protected final void preTearDown() throws Exception { - client1.invoke(HAClearDUnitTest.class, "closeCache"); - client2.invoke(HAClearDUnitTest.class, "closeCache"); - server1.invoke(HAClearDUnitTest.class, "closeCache"); - server2.invoke(HAClearDUnitTest.class, "closeCache"); + client1.invoke(() -> HAClearDUnitTest.closeCache()); + client2.invoke(() -> HAClearDUnitTest.closeCache()); + server1.invoke(() -> HAClearDUnitTest.closeCache()); + server2.invoke(() -> HAClearDUnitTest.closeCache()); closeCache(); } @@ -554,18 +554,16 @@ public void run2() throws CacheException // function to create 2servers and 3 clients private void createClientServerConfigurationForClearTest() throws Exception { - PORT1 = ((Integer)server1.invoke(HAClearDUnitTest.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)server2.invoke(HAClearDUnitTest.class, - "createServerCache")).intValue(); - client1.invoke(HAClearDUnitTest.class, "createClientCache", new Object[] { + PORT1 = ((Integer)server1.invoke(() -> HAClearDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)server2.invoke(() -> HAClearDUnitTest.createServerCache())).intValue(); + client1.invoke(() -> HAClearDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), new Boolean(true), - new Boolean(true) }); - client2.invoke(HAClearDUnitTest.class, "createClientCache", new Object[] { + new Boolean(true) )); + client2.invoke(() -> HAClearDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), new Boolean(true), - new Boolean(true) }); + new Boolean(true) )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), new Boolean(true), new Boolean(true)); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java index 241ac399fbd4..629f1a407803 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java @@ -109,20 +109,18 @@ public void setUp() throws Exception // Client 1 VM client1 = host.getVM(2); - PORT1 = ((Integer)server1.invoke(HAConflationDUnitTest.class, - "createServerCache", new Object[] { new Boolean(false) })).intValue(); - server1.invoke(ConflationDUnitTest.class, "setIsSlowStart"); - server1.invoke(HAConflationDUnitTest.class, "makeDispatcherSlow"); - client1.invoke(HAConflationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT1), new Boolean(true) }); + PORT1 = ((Integer)server1.invoke(() -> HAConflationDUnitTest.createServerCache( new Boolean(false) ))).intValue(); + server1.invoke(() -> ConflationDUnitTest.setIsSlowStart()); + server1.invoke(() -> HAConflationDUnitTest.makeDispatcherSlow()); + client1.invoke(() -> HAConflationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1), new Boolean(true) )); } @Override protected final void postTearDownCacheTestCase() throws Exception { - client1.invoke(HAConflationDUnitTest.class, "closeCache"); + client1.invoke(() -> HAConflationDUnitTest.closeCache()); // close server - server1.invoke(HAConflationDUnitTest.class, "closeCache"); + server1.invoke(() -> HAConflationDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java index 732e22a7e765..4a7d5dbb4af3 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java @@ -109,11 +109,11 @@ public void setUp() throws Exception @Override protected final void preTearDown() throws Exception { - client1.invoke(HADuplicateDUnitTest.class, "closeCache"); + client1.invoke(() -> HADuplicateDUnitTest.closeCache()); // close server - server1.invoke(HADuplicateDUnitTest.class, "reSetQRMslow"); - server1.invoke(HADuplicateDUnitTest.class, "closeCache"); - server2.invoke(HADuplicateDUnitTest.class, "closeCache"); + server1.invoke(() -> HADuplicateDUnitTest.reSetQRMslow()); + server1.invoke(() -> HADuplicateDUnitTest.closeCache()); + server2.invoke(() -> HADuplicateDUnitTest.closeCache()); } public void _testDuplicate() throws Exception @@ -153,7 +153,7 @@ public void run2() throws CacheException } }); - server1.invoke(HADuplicateDUnitTest.class, "reSetQRMslow"); + server1.invoke(() -> HADuplicateDUnitTest.reSetQRMslow()); } @@ -219,13 +219,10 @@ public void run2() throws CacheException // function to create 2servers and 1 clients private void createClientServerConfiguration() { - PORT1 = ((Integer)server1.invoke(HADuplicateDUnitTest.class, - "createServerCache")).intValue(); - server1.invoke(HADuplicateDUnitTest.class, "setQRMslow"); - PORT2 = ((Integer)server2.invoke(HADuplicateDUnitTest.class, - "createServerCache")).intValue(); - client1.invoke(HADuplicateDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2) }); + PORT1 = ((Integer)server1.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue(); + server1.invoke(() -> HADuplicateDUnitTest.setQRMslow()); + PORT2 = ((Integer)server2.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue(); + client1.invoke(() -> HADuplicateDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2) )); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java index af1eb8b7a52b..4753fb738f78 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java @@ -92,16 +92,16 @@ public void setUp() throws Exception super.setUp(); final Host host = Host.getHost(0); server1 = host.getVM(0); - server1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + server1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); client1 = host.getVM(2); } /** close the caches* */ @Override protected final void preTearDown() throws Exception { - client1.invoke(HAEventIdPropagationDUnitTest.class, "closeCache"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.closeCache()); // close server - server1.invoke(HAEventIdPropagationDUnitTest.class, "closeCache"); + server1.invoke(() -> HAEventIdPropagationDUnitTest.closeCache()); } /** stops the server * */ @@ -124,10 +124,8 @@ public void run2() throws CacheException private void createClientServerConfiguration() { - int PORT1 = ((Integer)server1.invoke(HAEventIdPropagationDUnitTest.class, - "createServerCache")).intValue(); - client1.invoke(HAEventIdPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); + int PORT1 = ((Integer)server1.invoke(() -> HAEventIdPropagationDUnitTest.createServerCache())).intValue(); + client1.invoke(() -> HAEventIdPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); } /** create the server * */ @@ -319,64 +317,50 @@ public void testEventIDPropagation() throws Exception { try { createClientServerConfiguration(); - client1.invoke(HAEventIdPropagationDUnitTest.class,"setReceivedOperationToFalse"); - client1.invoke(HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapisNotNullButEmpty"); - Object eventId1 = server1.invoke(HAEventIdPropagationDUnitTest.class, - "putKey1Val1"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.setReceivedOperationToFalse()); + client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapisNotNullButEmpty()); + Object eventId1 = server1.invoke(() -> HAEventIdPropagationDUnitTest.putKey1Val1()); assertNotNull(eventId1); // wait for key to propagate till client // assert map not null on client - client1.invoke(HAEventIdPropagationDUnitTest.class, - "waitTillOperationReceived"); - Object eventId2 = client1.invoke(HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapHasEntryId"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.waitTillOperationReceived()); + Object eventId2 = client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapHasEntryId()); assertNotNull(eventId2); if (!eventId1.equals(eventId2)) { fail("Test failed as the eventIds are not equal"); } - client1.invoke(HAEventIdPropagationDUnitTest.class,"setReceivedOperationToFalse"); - eventId1 = server1.invoke(HAEventIdPropagationDUnitTest.class, - "updateKey1"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.setReceivedOperationToFalse()); + eventId1 = server1.invoke(() -> HAEventIdPropagationDUnitTest.updateKey1()); assertNotNull(eventId1); // wait for key to propagate till client // assert map not null on client - client1.invoke(HAEventIdPropagationDUnitTest.class, - "waitTillOperationReceived"); - eventId2 = client1.invoke(HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapHasEntryId"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.waitTillOperationReceived()); + eventId2 = client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapHasEntryId()); assertNotNull(eventId2); if (!eventId1.equals(eventId2)) { fail("Test failed as the eventIds are not equal"); } - client1.invoke(HAEventIdPropagationDUnitTest.class,"setReceivedOperationToFalse"); - eventId1 = server1.invoke(HAEventIdPropagationDUnitTest.class, - "invalidateKey1"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.setReceivedOperationToFalse()); + eventId1 = server1.invoke(() -> HAEventIdPropagationDUnitTest.invalidateKey1()); assertNotNull(eventId1); // wait for key to propagate till client // assert map not null on client - client1.invoke(HAEventIdPropagationDUnitTest.class, - "waitTillOperationReceived"); - eventId2 = client1.invoke(HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapHasEntryId"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.waitTillOperationReceived()); + eventId2 = client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapHasEntryId()); assertNotNull(eventId2); if (!eventId1.equals(eventId2)) { fail("Test failed as the eventIds are not equal"); } - client1.invoke(HAEventIdPropagationDUnitTest.class,"setReceivedOperationToFalse"); - EventID[] eventIds1 = (EventID[])server1.invoke( - HAEventIdPropagationDUnitTest.class, "putAll"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.setReceivedOperationToFalse()); + EventID[] eventIds1 = (EventID[])server1.invoke(() -> HAEventIdPropagationDUnitTest.putAll()); assertNotNull(eventIds1); // wait for key to propagate till client // assert map not null on client - client1.invoke(HAEventIdPropagationDUnitTest.class, - "waitTillOperationReceived"); - EventID[] eventIds2 = (EventID[])client1.invoke( - HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapHasEntryIds"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.waitTillOperationReceived()); + EventID[] eventIds2 = (EventID[])client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapHasEntryIds()); assertNotNull(eventIds2); for (int i = 0; i < 5; i++) { assertNotNull(eventIds1[i]); @@ -387,31 +371,25 @@ public void testEventIDPropagation() throws Exception } - client1.invoke(HAEventIdPropagationDUnitTest.class,"setReceivedOperationToFalse"); - eventId1 = server1.invoke(HAEventIdPropagationDUnitTest.class, - "removePUTALL_KEY1"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.setReceivedOperationToFalse()); + eventId1 = server1.invoke(() -> HAEventIdPropagationDUnitTest.removePUTALL_KEY1()); assertNotNull(eventId1); // wait for key to propagate till client // assert map not null on client - client1.invoke(HAEventIdPropagationDUnitTest.class, - "waitTillOperationReceived"); - eventId2 = client1.invoke(HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapHasEntryId"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.waitTillOperationReceived()); + eventId2 = client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapHasEntryId()); assertNotNull(eventId2); if (!eventId1.equals(eventId2)) { fail("Test failed as the eventIds are not equal"); } - client1.invoke(HAEventIdPropagationDUnitTest.class,"setReceivedOperationToFalse"); - eventId1 = server1.invoke(HAEventIdPropagationDUnitTest.class, - "destroyKey1"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.setReceivedOperationToFalse()); + eventId1 = server1.invoke(() -> HAEventIdPropagationDUnitTest.destroyKey1()); assertNotNull(eventId1); // wait for key to propagate till client // assert map not null on client - client1.invoke(HAEventIdPropagationDUnitTest.class, - "waitTillOperationReceived"); - eventId2 = client1.invoke(HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapHasEntryId"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.waitTillOperationReceived()); + eventId2 = client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapHasEntryId()); assertNotNull(eventId2); if (!eventId1.equals(eventId2)) { fail("Test failed as the eventIds are not equal"); @@ -427,18 +405,14 @@ public void testEventIDPropagation() throws Exception public void testEventIDPropagationForClear() throws Exception { createClientServerConfiguration(); - client1.invoke(HAEventIdPropagationDUnitTest.class,"setReceivedOperationToFalse"); - client1.invoke(HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapisNotNullButEmpty"); - Object eventId1 = server1.invoke(HAEventIdPropagationDUnitTest.class, - "clearRg"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.setReceivedOperationToFalse()); + client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapisNotNullButEmpty()); + Object eventId1 = server1.invoke(() -> HAEventIdPropagationDUnitTest.clearRg()); assertNotNull(eventId1); // wait for key to propagate till client // assert map not null on client - client1.invoke(HAEventIdPropagationDUnitTest.class, - "waitTillOperationReceived"); - Object eventId2 = client1.invoke(HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapHasEntryId"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.waitTillOperationReceived()); + Object eventId2 = client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapHasEntryId()); assertNotNull(eventId2); if (!eventId1.equals(eventId2)) { fail("Test failed as the clear eventIds are not equal"); @@ -450,16 +424,13 @@ public void testEventIDPropagationForClear() throws Exception public void _testEventIDPropagationForDestroyRegion() throws Exception { createClientServerConfiguration(); - client1.invoke(HAEventIdPropagationDUnitTest.class,"setReceivedOperationToFalse"); - Object eventId1 = server1.invoke(HAEventIdPropagationDUnitTest.class, - "destroyRegion"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.setReceivedOperationToFalse()); + Object eventId1 = server1.invoke(() -> HAEventIdPropagationDUnitTest.destroyRegion()); assertNotNull(eventId1); // wait for key to propagate till client // assert map not null on client - client1.invoke(HAEventIdPropagationDUnitTest.class, - "waitTillOperationReceived"); - Object eventId2 = client1.invoke(HAEventIdPropagationDUnitTest.class, - "assertThreadIdToSequenceIdMapHasEntryId"); + client1.invoke(() -> HAEventIdPropagationDUnitTest.waitTillOperationReceived()); + Object eventId2 = client1.invoke(() -> HAEventIdPropagationDUnitTest.assertThreadIdToSequenceIdMapHasEntryId()); assertNotNull(eventId2); if (!eventId1.equals(eventId2)) { fail("Test failed as the eventIds are not equal"); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java index 92ee8898eadb..4ef9dc00d135 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java @@ -98,20 +98,20 @@ public void setUp() throws Exception @Override protected final void preTearDown() throws Exception { - vm0.invoke(HAExpiryDUnitTest.class, "closeCache"); - vm1.invoke(HAExpiryDUnitTest.class, "closeCache"); - vm2.invoke(HAExpiryDUnitTest.class, "closeCache"); - vm3.invoke(HAExpiryDUnitTest.class, "closeCache"); + vm0.invoke(() -> HAExpiryDUnitTest.closeCache()); + vm1.invoke(() -> HAExpiryDUnitTest.closeCache()); + vm2.invoke(() -> HAExpiryDUnitTest.closeCache()); + vm3.invoke(() -> HAExpiryDUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } public void testExpiryPeriod() throws Exception { - vm0.invoke(HAExpiryDUnitTest.class, "createRegionQueue", new Object[] {new Boolean(false)}); - vm1.invoke(HAExpiryDUnitTest.class, "createRegionQueue", new Object[] {new Boolean(false)}); - vm2.invoke(HAExpiryDUnitTest.class, "createRegionQueue", new Object[] {new Boolean(false)}); - vm3.invoke(HAExpiryDUnitTest.class, "createRegionQueue", new Object[] {new Boolean(false)}); + vm0.invoke(() -> HAExpiryDUnitTest.createRegionQueue(new Boolean(false))); + vm1.invoke(() -> HAExpiryDUnitTest.createRegionQueue(new Boolean(false))); + vm2.invoke(() -> HAExpiryDUnitTest.createRegionQueue(new Boolean(false))); + vm3.invoke(() -> HAExpiryDUnitTest.createRegionQueue(new Boolean(false))); vm0.invoke(new CacheSerializableRunnable("putFromVm") { @@ -122,25 +122,25 @@ public void run2() throws CacheException } }); - vm0.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); - vm1.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); - vm2.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); - vm3.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); + vm0.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); + vm1.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); + vm2.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); + vm3.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); // Thread.sleep(7 * 1000); - vm0.invoke(HAExpiryDUnitTest.class, "checkSizeAfterExpiration"); - vm1.invoke(HAExpiryDUnitTest.class, "checkSizeAfterExpiration"); - vm2.invoke(HAExpiryDUnitTest.class, "checkSizeAfterExpiration"); - vm3.invoke(HAExpiryDUnitTest.class, "checkSizeAfterExpiration"); + vm0.invoke(() -> HAExpiryDUnitTest.checkSizeAfterExpiration()); + vm1.invoke(() -> HAExpiryDUnitTest.checkSizeAfterExpiration()); + vm2.invoke(() -> HAExpiryDUnitTest.checkSizeAfterExpiration()); + vm3.invoke(() -> HAExpiryDUnitTest.checkSizeAfterExpiration()); } public void testDurableExpiryPeriod() throws Exception { - vm0.invoke(HAExpiryDUnitTest.class, "createRegionQueue", new Object[] {new Boolean(true)}); - vm1.invoke(HAExpiryDUnitTest.class, "createRegionQueue", new Object[] {new Boolean(true)}); - vm2.invoke(HAExpiryDUnitTest.class, "createRegionQueue", new Object[] {new Boolean(true)}); - vm3.invoke(HAExpiryDUnitTest.class, "createRegionQueue", new Object[] {new Boolean(true)}); + vm0.invoke(() -> HAExpiryDUnitTest.createRegionQueue(new Boolean(true))); + vm1.invoke(() -> HAExpiryDUnitTest.createRegionQueue(new Boolean(true))); + vm2.invoke(() -> HAExpiryDUnitTest.createRegionQueue(new Boolean(true))); + vm3.invoke(() -> HAExpiryDUnitTest.createRegionQueue(new Boolean(true))); vm0.invoke(new CacheSerializableRunnable("putFromVm") { @@ -151,19 +151,19 @@ public void run2() throws CacheException } }); - vm0.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); - vm1.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); - vm2.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); - vm3.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); + vm0.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); + vm1.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); + vm2.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); + vm3.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); Wait.pause(5000); // wait for some time to make sure that we give sufficient time // to expiry // in spite of giving time the events should not expire, and queue should be // same as before expiration - vm0.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); - vm1.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); - vm2.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); - vm3.invoke(HAExpiryDUnitTest.class, "checkSizeBeforeExpiration"); + vm0.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); + vm1.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); + vm2.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); + vm3.invoke(() -> HAExpiryDUnitTest.checkSizeBeforeExpiration()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java index df754d09bf8c..4a24378e742c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java @@ -112,16 +112,16 @@ public void setUp() throws Exception vm3 = host.getVM(3); - vm0.invoke(HAGIIBugDUnitTest.class, "createRegionQueue"); + vm0.invoke(() -> HAGIIBugDUnitTest.createRegionQueue()); } @Override protected final void preTearDown() throws Exception { - vm0.invoke(HAGIIBugDUnitTest.class, "closeCache"); - vm1.invoke(HAGIIBugDUnitTest.class, "closeCache"); - vm2.invoke(HAGIIBugDUnitTest.class, "closeCache"); - vm3.invoke(HAGIIBugDUnitTest.class, "closeCache"); + vm0.invoke(() -> HAGIIBugDUnitTest.closeCache()); + vm1.invoke(() -> HAGIIBugDUnitTest.closeCache()); + vm2.invoke(() -> HAGIIBugDUnitTest.closeCache()); + vm3.invoke(() -> HAGIIBugDUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } @@ -197,7 +197,7 @@ public void run() } } - total_no_puts[0] = vm0.invoke(HAGIIBugDUnitTest.class, "getTotalNoPuts"); + total_no_puts[0] = vm0.invoke(() -> HAGIIBugDUnitTest.getTotalNoPuts()); populate_keys_after_gii(); boolean validationFlag = false; diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java index 40d44b4ef55b..3d62b99f8bd1 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java @@ -143,31 +143,30 @@ public void setUp() throws Exception client0 = host.getVM(2); //start server1 - PORT1 = ((Integer)server0.invoke(HAGIIDUnitTest.class, "createServer1Cache" )).intValue(); - server0.invoke(ConflationDUnitTest.class, "setIsSlowStart"); - server0.invoke(HAGIIDUnitTest.class, "setSystemProperty"); + PORT1 = ((Integer)server0.invoke(() -> HAGIIDUnitTest.createServer1Cache())).intValue(); + server0.invoke(() -> ConflationDUnitTest.setIsSlowStart()); + server0.invoke(() -> HAGIIDUnitTest.setSystemProperty()); PORT2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); //Start the client - client0.invoke(HAGIIDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)}); + client0.invoke(() -> HAGIIDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2))); } public void testGIIRegionQueue() { - client0.invoke(HAGIIDUnitTest.class, "createEntries"); - client0.invoke(HAGIIDUnitTest.class, "registerInterestList"); - server0.invoke(HAGIIDUnitTest.class, "put"); + client0.invoke(() -> HAGIIDUnitTest.createEntries()); + client0.invoke(() -> HAGIIDUnitTest.registerInterestList()); + server0.invoke(() -> HAGIIDUnitTest.put()); - server0.invoke(HAGIIDUnitTest.class, "tombstonegc"); + server0.invoke(() -> HAGIIDUnitTest.tombstonegc()); - client0.invoke(HAGIIDUnitTest.class, "verifyEntries"); + client0.invoke(() -> HAGIIDUnitTest.verifyEntries()); server1.invoke(HAGIIDUnitTest.class, "createServer2Cache" ,new Object[] {new Integer(PORT2)}); Wait.pause(6000); - server0.invoke(HAGIIDUnitTest.class, "stopServer"); + server0.invoke(() -> HAGIIDUnitTest.stopServer()); //pause(10000); - client0.invoke(HAGIIDUnitTest.class, "verifyEntriesAfterGiiViaListener"); + client0.invoke(() -> HAGIIDUnitTest.verifyEntriesAfterGiiViaListener()); } public void createCache(Properties props) throws Exception @@ -457,10 +456,10 @@ protected final void preTearDown() throws Exception { ConflationDUnitTest.unsetIsSlowStart(); Invoke.invokeInEveryVM(ConflationDUnitTest.class, "unsetIsSlowStart"); // close the clients first - client0.invoke(HAGIIDUnitTest.class, "closeCache"); + client0.invoke(() -> HAGIIDUnitTest.closeCache()); // then close the servers - server0.invoke(HAGIIDUnitTest.class, "closeCache"); - server1.invoke(HAGIIDUnitTest.class, "closeCache"); + server0.invoke(() -> HAGIIDUnitTest.closeCache()); + server1.invoke(() -> HAGIIDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java index 3691ba1cc5da..75c087a8aea5 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java @@ -119,12 +119,8 @@ public void setUp() throws Exception { clientVM1 = host.getVM(2); clientVM2 = host.getVM(3); - PORT1 = ((Integer)serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue(); - PORT2 = ((Integer)serverVM1.invoke(HARQueueNewImplDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_ENTRY })).intValue(); + PORT1 = ((Integer)serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue(); + PORT2 = ((Integer)serverVM1.invoke(() -> HARQueueNewImplDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_ENTRY ))).intValue(); numOfCreates = 0; numOfUpdates = 0; numOfInvalidates = 0; @@ -136,15 +132,15 @@ public void setUp() throws Exception { @Override protected final void preTearDown() throws Exception { closeCache(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); // Unset the isSlowStartForTesting flag - serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - serverVM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + serverVM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + serverVM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); // then close the servers - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); disconnectAllFromDS(); } @@ -349,33 +345,27 @@ public static void putHeavyEntries(Integer num) { */ public void testClientMsgsRegionSize() throws Exception { // slow start for dispatcher - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); - serverVM1.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); + serverVM1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "stopServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.stopServer()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "createEntries"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createEntries()); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "startServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.startServer()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(5), new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(5), new Integer(PORT2) )); } /** @@ -387,37 +377,31 @@ public void testClientMsgsRegionSize() throws Exception { */ public void testRefCountForNormalAndGIIPut() throws Exception { // slow start for dispatcher - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); - serverVM1.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); + serverVM1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "stopServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.stopServer()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "createEntries"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createEntries()); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "startServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.startServer()); Thread.sleep(3000); // TODO: Find a better 'n reliable alternative - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "updateMapForVM0"); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "updateMapForVM1"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.updateMapForVM0()); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.updateMapForVM1()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyQueueData", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyQueueData", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyQueueData( new Integer(5), new Integer(5), new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyQueueData( new Integer(5), new Integer(5), new Integer(PORT2) )); } /** @@ -428,33 +412,27 @@ public void testRefCountForNormalAndGIIPut() throws Exception { * @throws Exception */ public void testRefCountForPeekAndRemove() throws Exception { - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "createEntries"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createEntries()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT1) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(5), new Integer(PORT1) )); - serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "waitTillMessagesAreDispatched", new Object[] { new Integer(PORT1), - new Long(5000) }); + serverVM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.waitTillMessagesAreDispatched( new Integer(PORT1), + new Long(5000) )); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(0), new Integer(PORT1) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(0), new Integer(PORT1) )); } /** @@ -465,34 +443,29 @@ public void testRefCountForPeekAndRemove() throws Exception { * @throws Exception */ public void testRefCountForQRM() throws Exception { - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "stopServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.stopServer()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "createEntries"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createEntries()); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "startServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.startServer()); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT2) }); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(5), new Integer(PORT2) )); - serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + serverVM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(0), new Integer(PORT2) }); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(0), new Integer(PORT2) )); } /** @@ -505,51 +478,43 @@ public void testRefCountForQRM() throws Exception { */ public void testRefCountForDestroy() throws Exception { // slow start for dispatcher - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); - serverVM1.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); + serverVM1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); // 1. stop the second server - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "stopServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.stopServer()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "createEntries"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createEntries()); // 3. start the second server. - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "startServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.startServer()); Thread.sleep(3000); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); Thread.sleep(1000); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "updateMap1"); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "updateMap1"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.updateMap1()); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.updateMap1()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyQueueData", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyQueueData", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyQueueData( new Integer(5), new Integer(5), new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyQueueData( new Integer(5), new Integer(5), new Integer(PORT2) )); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "updateMap2"); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "updateMap2"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.updateMap2()); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.updateMap2()); Thread.sleep(1000); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyQueueData", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyQueueData", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyQueueData( new Integer(5), new Integer(5), new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyQueueData( new Integer(5), new Integer(5), new Integer(PORT2) )); } /** @@ -560,46 +525,40 @@ public void testRefCountForDestroy() throws Exception { * @throws Exception */ public void testConcurrentGIIAndDispatch() throws Exception { - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "40000" }); - serverVM1.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "40000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "40000" )); + serverVM1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "40000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestListAll"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestListAll"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestListAll()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestListAll()); // 1. stop the second server - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "stopServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.stopServer()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "createEntries"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createEntries()); serverVM0.invoke(HARQueueNewImplDUnitTest.class, "makeValuesOfSomeKeysNullInClientMsgsRegion", new Object[] { new Integer(PORT1), new String[] { "k1", "k3" } }); // 3. start the second server. - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "startServer"); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(3), new Integer(PORT1) }); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.startServer()); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(3), new Integer(PORT1) )); serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyNullValuesInCMR", new Object[] { new Integer(3), new Integer(PORT2), new String[] { "k1", "k3" } }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(3), new Integer(PORT2) }); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(3), new Integer(PORT2) )); serverVM0.invoke(HARQueueNewImplDUnitTest.class, "populateValuesOfSomeKeysInClientMsgsRegion", new Object[] { new Integer(PORT1), new String[] { "k1", "k3" } }); - serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - serverVM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + serverVM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + serverVM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); } /* @@ -615,30 +574,24 @@ public void testConcurrentGIIAndDispatch() throws Exception { */ public void testTwoBridgeServersInOneVMDoShareCMR() throws Exception { // slow start for dispatcher - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); - Integer port3 = (Integer)serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "createOneMoreBridgeServer", new Object[] { Boolean.TRUE }); + Integer port3 = (Integer)serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createOneMoreBridgeServer( Boolean.TRUE )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), port3, "0"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "createEntries"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createEntries()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(5), new Integer(PORT1) }); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyRegionSize", - new Object[] { new Integer(5), new Integer(5), port3 }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(5), new Integer(PORT1) )); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyRegionSize( new Integer(5), new Integer(5), port3 )); } /** @@ -649,33 +602,28 @@ public void testTwoBridgeServersInOneVMDoShareCMR() throws Exception { * @throws Exception */ public void testUpdatesWithTwoBridgeServersInOneVM() throws Exception { - Integer port3 = (Integer)serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "createOneMoreBridgeServer", new Object[] { Boolean.FALSE }); + Integer port3 = (Integer)serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createOneMoreBridgeServer( Boolean.FALSE )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1", Boolean.TRUE); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, port3, new Integer(PORT2), "1", Boolean.TRUE }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, port3, new Integer(PORT2), "1", Boolean.TRUE )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestListAll"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestListAll()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createEntries"); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "putEntries"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createEntries()); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.putEntries()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "waitTillMessagesAreDispatched", new Object[] { new Integer(PORT1), - new Long(5000) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.waitTillMessagesAreDispatched( new Integer(PORT1), + new Long(5000) )); serverVM0 - .invoke(HARQueueNewImplDUnitTest.class, - "waitTillMessagesAreDispatched", new Object[] { port3, - new Long(5000) }); + .invoke(() -> HARQueueNewImplDUnitTest.waitTillMessagesAreDispatched( port3, + new Long(5000) )); // expect updates verifyUpdatesReceived(new Integer(5), Boolean.TRUE, new Long(5000)); // expect invalidates - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyUpdatesReceived", - new Object[] { new Integer(5), Boolean.TRUE, new Long(5000) }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyUpdatesReceived( new Integer(5), Boolean.TRUE, new Long(5000) )); } /** @@ -687,33 +635,27 @@ public void testUpdatesWithTwoBridgeServersInOneVM() throws Exception { */ public void testHAEventWrapperDoesNotHoldCUMOnceInsideCMR() throws Exception { // slow start for dispatcher - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "stopServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.stopServer()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "createEntries", - new Object[] { new Long(1000) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createEntries( new Long(1000) )); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "startServer"); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.startServer()); Thread.sleep(2000); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyNullCUMReference", - new Object[] { new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyNullCUMReference", - new Object[] { new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyNullCUMReference( new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyNullCUMReference( new Integer(PORT2) )); } /** @@ -726,48 +668,35 @@ public void testHAEventWrapperDoesNotHoldCUMOnceInsideCMR() throws Exception { * @throws Exception */ public void testCMRNotCreatedForNoneEvictionPolicy() throws Exception { - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); Thread.sleep(2000); - PORT1 = ((Integer)serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_NONE })).intValue(); - PORT2 = ((Integer)serverVM1.invoke(HARQueueNewImplDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_NONE })).intValue(); + PORT1 = ((Integer)serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_NONE ))).intValue(); + PORT2 = ((Integer)serverVM1.invoke(() -> HARQueueNewImplDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_NONE ))).intValue(); Boolean isRegion = Boolean.FALSE; // slow start for dispatcher - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyHaContainerType", - new Object[] { isRegion, new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyHaContainerType", - new Object[] { isRegion, new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyHaContainerType( isRegion, new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyHaContainerType( isRegion, new Integer(PORT2) )); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "stopOneBridgeServer", - new Object[] { new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "stopOneBridgeServer", - new Object[] { new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.stopOneBridgeServer( new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.stopOneBridgeServer( new Integer(PORT2) )); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "verifyHaContainerDestroyed", new Object[] { isRegion, - new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, - "verifyHaContainerDestroyed", new Object[] { isRegion, - new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyHaContainerDestroyed( isRegion, + new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyHaContainerDestroyed( isRegion, + new Integer(PORT2) )); } /** @@ -781,37 +710,28 @@ public void testCMRNotCreatedForNoneEvictionPolicy() throws Exception { public void testCMRCreatedForMemOrEntryEvictionPolicy() throws Exception { Boolean isRegion = Boolean.TRUE; // slow start for dispatcher - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "30000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "verifyHaContainerType", - new Object[] { isRegion, new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "verifyHaContainerType", - new Object[] { isRegion, new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyHaContainerType( isRegion, new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyHaContainerType( isRegion, new Integer(PORT2) )); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "stopOneBridgeServer", - new Object[] { new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "stopOneBridgeServer", - new Object[] { new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.stopOneBridgeServer( new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.stopOneBridgeServer( new Integer(PORT2) )); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "verifyHaContainerDestroyed", new Object[] { isRegion, - new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, - "verifyHaContainerDestroyed", new Object[] { isRegion, - new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyHaContainerDestroyed( isRegion, + new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyHaContainerDestroyed( isRegion, + new Integer(PORT2) )); } /** @@ -824,24 +744,18 @@ public void testCMRNotReturnedByRootRegionsMethod() throws Exception { createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestList"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestList()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "createEntries"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createEntries()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "verifyRootRegionsDoesNotReturnCMR", - new Object[] { new Integer(PORT1) }); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, - "verifyRootRegionsDoesNotReturnCMR", - new Object[] { new Integer(PORT2) }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.verifyRootRegionsDoesNotReturnCMR( new Integer(PORT1) )); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.verifyRootRegionsDoesNotReturnCMR( new Integer(PORT2) )); } /** @@ -853,48 +767,38 @@ public void testCMRNotReturnedByRootRegionsMethod() throws Exception { */ public void _testMemoryFootprintOfHARegionQueuesWithAndWithoutOverflow() throws Exception { - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); - serverVM1.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); + serverVM1.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); Thread.sleep(2000); Integer numOfEntries = new Integer(30); - PORT1 = ((Integer)serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "createServerCache", new Object[] { - HARegionQueue.HA_EVICTION_POLICY_MEMORY, new Integer(30) })) + PORT1 = ((Integer)serverVM0.invoke(() -> HARQueueNewImplDUnitTest.createServerCache( + HARegionQueue.HA_EVICTION_POLICY_MEMORY, new Integer(30) ))) .intValue(); - PORT2 = ((Integer)serverVM1.invoke(HARQueueNewImplDUnitTest.class, - "createServerCache", - new Object[] { HARegionQueue.HA_EVICTION_POLICY_NONE })).intValue(); + PORT2 = ((Integer)serverVM1.invoke(() -> HARQueueNewImplDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_NONE ))).intValue(); - serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); - serverVM1.invoke(ConflationDUnitTest.class, "setIsSlowStart", - new Object[] { "60000" }); + serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); + serverVM1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" )); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), "1"); final String client1Host = NetworkUtils.getServerHostName(clientVM1.getHost()); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client1Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client1Host, new Integer(PORT1), new Integer(PORT2), "1" )); final String client2Host = NetworkUtils.getServerHostName(clientVM2.getHost()); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "createClientCache", - new Object[] { client2Host, new Integer(PORT1), new Integer(PORT2), "1" }); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.createClientCache( client2Host, new Integer(PORT1), new Integer(PORT2), "1" )); registerInterestListAll(); - clientVM1.invoke(HARQueueNewImplDUnitTest.class, "registerInterestListAll"); - clientVM2.invoke(HARQueueNewImplDUnitTest.class, "registerInterestListAll"); + clientVM1.invoke(() -> HARQueueNewImplDUnitTest.registerInterestListAll()); + clientVM2.invoke(() -> HARQueueNewImplDUnitTest.registerInterestListAll()); - serverVM0.invoke(HARQueueNewImplDUnitTest.class, "putHeavyEntries", - new Object[] { numOfEntries }); + serverVM0.invoke(() -> HARQueueNewImplDUnitTest.putHeavyEntries( numOfEntries )); - Long usedMemInVM0 = (Long)serverVM0.invoke(HARQueueNewImplDUnitTest.class, - "getUsedMemoryAndVerifyRegionSize", new Object[] { new Integer(1), - numOfEntries, new Integer(PORT1) }); - Long usedMemInVM1 = (Long)serverVM1.invoke(HARQueueNewImplDUnitTest.class, - "getUsedMemoryAndVerifyRegionSize", new Object[] { new Integer(1), - numOfEntries, new Integer(-1) }); + Long usedMemInVM0 = (Long)serverVM0.invoke(() -> HARQueueNewImplDUnitTest.getUsedMemoryAndVerifyRegionSize( new Integer(1), + numOfEntries, new Integer(PORT1) )); + Long usedMemInVM1 = (Long)serverVM1.invoke(() -> HARQueueNewImplDUnitTest.getUsedMemoryAndVerifyRegionSize( new Integer(1), + numOfEntries, new Integer(-1) )); - serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); - serverVM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + serverVM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); + serverVM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); logger .fine("Used Mem: " + usedMemInVM1.longValue() + "(without overflow), " diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java index d553d1caffca..91f2ea541a33 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java @@ -73,8 +73,8 @@ public void setUp() throws Exception */ @Override protected final void preTearDown() throws Exception { - vm0.invoke(HARegionDUnitTest.class, "closeCache"); - vm1.invoke(HARegionDUnitTest.class, "closeCache"); + vm0.invoke(() -> HARegionDUnitTest.closeCache()); + vm1.invoke(() -> HARegionDUnitTest.closeCache()); } /** @@ -106,13 +106,13 @@ private Cache createCache() throws Exception */ public void testLocalPut() { - vm0.invoke(HARegionDUnitTest.class, "createRegion"); - vm1.invoke(HARegionDUnitTest.class, "createRegion"); - vm0.invoke(HARegionDUnitTest.class, "putValue1"); - vm1.invoke(HARegionDUnitTest.class, "getNull"); - vm1.invoke(HARegionDUnitTest.class, "putValue2"); - vm0.invoke(HARegionDUnitTest.class, "getValue1"); - vm1.invoke(HARegionDUnitTest.class, "getValue2"); + vm0.invoke(() -> HARegionDUnitTest.createRegion()); + vm1.invoke(() -> HARegionDUnitTest.createRegion()); + vm0.invoke(() -> HARegionDUnitTest.putValue1()); + vm1.invoke(() -> HARegionDUnitTest.getNull()); + vm1.invoke(() -> HARegionDUnitTest.putValue2()); + vm0.invoke(() -> HARegionDUnitTest.getValue1()); + vm1.invoke(() -> HARegionDUnitTest.getValue2()); } @@ -127,16 +127,16 @@ public void testLocalPut() */ public void testLocalDestroy() { - vm0.invoke(HARegionDUnitTest.class, "createRegion"); - vm1.invoke(HARegionDUnitTest.class, "createRegion"); - vm0.invoke(HARegionDUnitTest.class, "putValue1"); - vm1.invoke(HARegionDUnitTest.class, "getNull"); - vm1.invoke(HARegionDUnitTest.class, "putValue2"); - vm0.invoke(HARegionDUnitTest.class, "getValue1"); - vm1.invoke(HARegionDUnitTest.class, "getValue2"); - vm0.invoke(HARegionDUnitTest.class, "destroy"); - vm0.invoke(HARegionDUnitTest.class, "getNull"); - vm1.invoke(HARegionDUnitTest.class, "getValue2"); + vm0.invoke(() -> HARegionDUnitTest.createRegion()); + vm1.invoke(() -> HARegionDUnitTest.createRegion()); + vm0.invoke(() -> HARegionDUnitTest.putValue1()); + vm1.invoke(() -> HARegionDUnitTest.getNull()); + vm1.invoke(() -> HARegionDUnitTest.putValue2()); + vm0.invoke(() -> HARegionDUnitTest.getValue1()); + vm1.invoke(() -> HARegionDUnitTest.getValue2()); + vm0.invoke(() -> HARegionDUnitTest.destroy()); + vm0.invoke(() -> HARegionDUnitTest.getNull()); + vm1.invoke(() -> HARegionDUnitTest.getValue2()); } /** @@ -148,13 +148,13 @@ public void testLocalDestroy() */ public void testGII() { - vm0.invoke(HARegionDUnitTest.class, "createRegion"); - vm0.invoke(HARegionDUnitTest.class, "putValue1"); - vm0.invoke(HARegionDUnitTest.class, "getValue1"); - vm1.invoke(HARegionDUnitTest.class, "createRegion"); - vm1.invoke(HARegionDUnitTest.class, "getValue1"); - vm1.invoke(HARegionDUnitTest.class, "putValue2"); - vm1.invoke(HARegionDUnitTest.class, "getValue2"); + vm0.invoke(() -> HARegionDUnitTest.createRegion()); + vm0.invoke(() -> HARegionDUnitTest.putValue1()); + vm0.invoke(() -> HARegionDUnitTest.getValue1()); + vm1.invoke(() -> HARegionDUnitTest.createRegion()); + vm1.invoke(() -> HARegionDUnitTest.getValue1()); + vm1.invoke(() -> HARegionDUnitTest.putValue2()); + vm1.invoke(() -> HARegionDUnitTest.getValue2()); } @@ -167,10 +167,10 @@ public void testGII() */ public void testLocalDestroyRegion() { - vm0.invoke(HARegionDUnitTest.class, "createRegion"); - vm1.invoke(HARegionDUnitTest.class, "createRegion"); - vm0.invoke(HARegionDUnitTest.class, "destroyRegion"); - vm1.invoke(HARegionDUnitTest.class, "verifyRegionNotDestroyed"); + vm0.invoke(() -> HARegionDUnitTest.createRegion()); + vm1.invoke(() -> HARegionDUnitTest.createRegion()); + vm0.invoke(() -> HARegionDUnitTest.destroyRegion()); + vm1.invoke(() -> HARegionDUnitTest.verifyRegionNotDestroyed()); } @@ -201,16 +201,16 @@ public static void verifyRegionNotDestroyed() */ public void testQRM() { - vm0.invoke(HARegionDUnitTest.class, "createRegionQueue"); - vm1.invoke(HARegionDUnitTest.class, "createRegionQueue"); - vm0.invoke(HARegionDUnitTest.class, "verifyAddingDispatchMesgs"); + vm0.invoke(() -> HARegionDUnitTest.createRegionQueue()); + vm1.invoke(() -> HARegionDUnitTest.createRegionQueue()); + vm0.invoke(() -> HARegionDUnitTest.verifyAddingDispatchMesgs()); try { Thread.sleep(5000); } catch (InterruptedException e) { fail("interrupted"); } - vm1.invoke(HARegionDUnitTest.class, "verifyDispatchedMessagesRemoved"); + vm1.invoke(() -> HARegionDUnitTest.verifyDispatchedMessagesRemoved()); } /** diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java index da57b86b0f38..cf31493d594b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java @@ -103,10 +103,10 @@ public void setUp() throws Exception */ @Override protected final void preTearDown() throws Exception { - vm0.invoke(HARegionQueueDUnitTest.class, "closeCache"); - vm1.invoke(HARegionQueueDUnitTest.class, "closeCache"); - vm2.invoke(HARegionQueueDUnitTest.class, "closeCache"); - vm3.invoke(HARegionQueueDUnitTest.class, "closeCache"); + vm0.invoke(() -> HARegionQueueDUnitTest.closeCache()); + vm1.invoke(() -> HARegionQueueDUnitTest.closeCache()); + vm2.invoke(() -> HARegionQueueDUnitTest.closeCache()); + vm3.invoke(() -> HARegionQueueDUnitTest.closeCache()); } /** @@ -136,13 +136,13 @@ protected Cache createCache() throws CacheException */ public void testLocalPut() { - vm0.invoke(HARegionQueueDUnitTest.class, "createRegion"); - vm1.invoke(HARegionQueueDUnitTest.class, "createRegion"); - vm0.invoke(HARegionQueueDUnitTest.class, "putValue1"); - vm1.invoke(HARegionQueueDUnitTest.class, "getNull"); - vm1.invoke(HARegionQueueDUnitTest.class, "putValue2"); - vm0.invoke(HARegionQueueDUnitTest.class, "getValue1"); - vm1.invoke(HARegionQueueDUnitTest.class, "getValue2"); + vm0.invoke(() -> HARegionQueueDUnitTest.createRegion()); + vm1.invoke(() -> HARegionQueueDUnitTest.createRegion()); + vm0.invoke(() -> HARegionQueueDUnitTest.putValue1()); + vm1.invoke(() -> HARegionQueueDUnitTest.getNull()); + vm1.invoke(() -> HARegionQueueDUnitTest.putValue2()); + vm0.invoke(() -> HARegionQueueDUnitTest.getValue1()); + vm1.invoke(() -> HARegionQueueDUnitTest.getValue2()); } @@ -157,16 +157,16 @@ public void testLocalPut() */ public void testLocalDestroy() { - vm0.invoke(HARegionQueueDUnitTest.class, "createRegion"); - vm1.invoke(HARegionQueueDUnitTest.class, "createRegion"); - vm0.invoke(HARegionQueueDUnitTest.class, "putValue1"); - vm1.invoke(HARegionQueueDUnitTest.class, "getNull"); - vm1.invoke(HARegionQueueDUnitTest.class, "putValue2"); - vm0.invoke(HARegionQueueDUnitTest.class, "getValue1"); - vm1.invoke(HARegionQueueDUnitTest.class, "getValue2"); - vm0.invoke(HARegionQueueDUnitTest.class, "destroy"); - vm0.invoke(HARegionQueueDUnitTest.class, "getNull"); - vm1.invoke(HARegionQueueDUnitTest.class, "getValue2"); + vm0.invoke(() -> HARegionQueueDUnitTest.createRegion()); + vm1.invoke(() -> HARegionQueueDUnitTest.createRegion()); + vm0.invoke(() -> HARegionQueueDUnitTest.putValue1()); + vm1.invoke(() -> HARegionQueueDUnitTest.getNull()); + vm1.invoke(() -> HARegionQueueDUnitTest.putValue2()); + vm0.invoke(() -> HARegionQueueDUnitTest.getValue1()); + vm1.invoke(() -> HARegionQueueDUnitTest.getValue2()); + vm0.invoke(() -> HARegionQueueDUnitTest.destroy()); + vm0.invoke(() -> HARegionQueueDUnitTest.getNull()); + vm1.invoke(() -> HARegionQueueDUnitTest.getValue2()); } /** @@ -178,13 +178,13 @@ public void testLocalDestroy() */ public void testGII() { - vm0.invoke(HARegionQueueDUnitTest.class, "createRegion"); - vm0.invoke(HARegionQueueDUnitTest.class, "putValue1"); - vm0.invoke(HARegionQueueDUnitTest.class, "getValue1"); - vm1.invoke(HARegionQueueDUnitTest.class, "createRegion"); - vm1.invoke(HARegionQueueDUnitTest.class, "getValue1"); - vm1.invoke(HARegionQueueDUnitTest.class, "putValue2"); - vm1.invoke(HARegionQueueDUnitTest.class, "getValue2"); + vm0.invoke(() -> HARegionQueueDUnitTest.createRegion()); + vm0.invoke(() -> HARegionQueueDUnitTest.putValue1()); + vm0.invoke(() -> HARegionQueueDUnitTest.getValue1()); + vm1.invoke(() -> HARegionQueueDUnitTest.createRegion()); + vm1.invoke(() -> HARegionQueueDUnitTest.getValue1()); + vm1.invoke(() -> HARegionQueueDUnitTest.putValue2()); + vm1.invoke(() -> HARegionQueueDUnitTest.getValue2()); } @@ -199,11 +199,11 @@ public void testGII() */ /* public void testGIIAndMapUpdates() { - vm0.invoke(HARegionQueueDUnitTest.class, "createRegionQueue2"); - vm0.invoke(HARegionQueueDUnitTest.class, "putConflatables"); - vm1.invoke(HARegionQueueDUnitTest.class, "createRegionQueue2"); - vm0.invoke(HARegionQueueDUnitTest.class, "clearRegion"); - vm1.invoke(HARegionQueueDUnitTest.class, "verifyMapsAndData"); + vm0.invoke(() -> HARegionQueueDUnitTest.createRegionQueue2()); + vm0.invoke(() -> HARegionQueueDUnitTest.putConflatables()); + vm1.invoke(() -> HARegionQueueDUnitTest.createRegionQueue2()); + vm0.invoke(() -> HARegionQueueDUnitTest.clearRegion()); + vm1.invoke(() -> HARegionQueueDUnitTest.verifyMapsAndData()); } */ @@ -216,11 +216,11 @@ public void testGII() */ public void testQRM() { - vm0.invoke(HARegionQueueDUnitTest.class, "createRegionQueue"); - vm1.invoke(HARegionQueueDUnitTest.class, "createRegionQueue"); - vm0.invoke(HARegionQueueDUnitTest.class, "verifyAddingDispatchMesgs"); + vm0.invoke(() -> HARegionQueueDUnitTest.createRegionQueue()); + vm1.invoke(() -> HARegionQueueDUnitTest.createRegionQueue()); + vm0.invoke(() -> HARegionQueueDUnitTest.verifyAddingDispatchMesgs()); - vm1.invoke(HARegionQueueDUnitTest.class, "verifyDispatchedMessagesRemoved"); + vm1.invoke(() -> HARegionQueueDUnitTest.verifyDispatchedMessagesRemoved()); } /** @@ -1076,9 +1076,8 @@ public void run() */ /* public void testBugNo35989() { - vm0.invoke(HARegionQueueDUnitTest.class, "createRegionQueue"); - vm1.invoke(HARegionQueueDUnitTest.class, - "createHARegionQueueandCheckExpiration"); + vm0.invoke(() -> HARegionQueueDUnitTest.createRegionQueue()); + vm1.invoke(() -> HARegionQueueDUnitTest.createHARegionQueueandCheckExpiration()); } */ @@ -1114,8 +1113,8 @@ public String description() { public void testForDuplicateEvents() { - vm0.invoke(HARegionQueueDUnitTest.class, "createRegionQueue"); - vm1.invoke(HARegionQueueDUnitTest.class, "createRegionQueueandCheckDuplicates"); + vm0.invoke(() -> HARegionQueueDUnitTest.createRegionQueue()); + vm1.invoke(() -> HARegionQueueDUnitTest.createRegionQueueandCheckDuplicates()); } /** diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java index 6b805ad16b9e..8df35132f5da 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java @@ -83,21 +83,19 @@ public void setUp() throws Exception { clientVM = host.getVM(3); PORT0 = createServerCache().intValue(); - PORT1 = ((Integer)serverVM1.invoke(HASlowReceiverDUnitTest.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)serverVM2.invoke(HASlowReceiverDUnitTest.class, - "createServerCache")).intValue(); + PORT1 = ((Integer)serverVM1.invoke(() -> HASlowReceiverDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)serverVM2.invoke(() -> HASlowReceiverDUnitTest.createServerCache())).intValue(); } @Override protected final void preTearDown() throws Exception { - clientVM.invoke(HASlowReceiverDUnitTest.class, "closeCache"); + clientVM.invoke(() -> HASlowReceiverDUnitTest.closeCache()); // then close the servers closeCache(); - serverVM1.invoke(HASlowReceiverDUnitTest.class, "closeCache"); - serverVM2.invoke(HASlowReceiverDUnitTest.class, "closeCache"); + serverVM1.invoke(() -> HASlowReceiverDUnitTest.closeCache()); + serverVM2.invoke(() -> HASlowReceiverDUnitTest.closeCache()); disconnectAllFromDS(); } @@ -249,10 +247,9 @@ public String description() { // Test slow client public void testSlowClient() throws Exception { setBridgeObeserverForAfterQueueDestroyMessage(); - clientVM.invoke(HASlowReceiverDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT0), - new Integer(PORT1), new Integer(PORT2), new Integer(2) }); - clientVM.invoke(HASlowReceiverDUnitTest.class, "registerInterest"); + clientVM.invoke(() -> HASlowReceiverDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT0), + new Integer(PORT1), new Integer(PORT2), new Integer(2) )); + clientVM.invoke(() -> HASlowReceiverDUnitTest.registerInterest()); // add expected socket exception string final IgnoredException ex1 = IgnoredException.addIgnoredException(SocketException.class .getName()); @@ -261,8 +258,7 @@ public void testSlowClient() throws Exception { putEntries(); Thread.sleep(20000);// wait for put to block and allow server to remove // client queue - clientVM.invoke(HASlowReceiverDUnitTest.class, "checkRedundancyLevel", - new Object[] { new Integer(2) }); + clientVM.invoke(() -> HASlowReceiverDUnitTest.checkRedundancyLevel( new Integer(2) )); // check for slow client queue is removed or not. assertTrue("isUnresponsiveClientRemoved is false, but should be true " + "after 20 seconds", isUnresponsiveClientRemoved); @@ -276,8 +272,7 @@ public static void setBridgeObeserverForAfterQueueDestroyMessage() ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() { @Override public void afterQueueDestroyMessage() { - clientVM.invoke(HASlowReceiverDUnitTest.class, "checkRedundancyLevel", - new Object[] { new Integer(0) }); + clientVM.invoke(() -> HASlowReceiverDUnitTest.checkRedundancyLevel( new Integer(0) )); isUnresponsiveClientRemoved = true; PoolImpl.AFTER_QUEUE_DESTROY_MESSAGE_FLAG = false; } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java index 154f9cce1e8e..60e154caf003 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java @@ -113,12 +113,9 @@ public void setUp() throws Exception // Client 1 VM client1 = host.getVM(2); - PORT1 = ((Integer)server1.invoke(OperationsPropagationDUnitTest.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)server2.invoke(OperationsPropagationDUnitTest.class, - "createServerCache")).intValue(); - client1.invoke(OperationsPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT2) }); + PORT1 = ((Integer)server1.invoke(() -> OperationsPropagationDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)server2.invoke(() -> OperationsPropagationDUnitTest.createServerCache())).intValue(); + client1.invoke(() -> OperationsPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT2) )); } @@ -127,9 +124,9 @@ public void setUp() throws Exception */ @Override protected final void preTearDown() throws Exception { - client1.invoke(OperationsPropagationDUnitTest.class, "closeCache"); - server1.invoke(OperationsPropagationDUnitTest.class, "closeCache"); - server2.invoke(OperationsPropagationDUnitTest.class, "closeCache"); + client1.invoke(() -> OperationsPropagationDUnitTest.closeCache()); + server1.invoke(() -> OperationsPropagationDUnitTest.closeCache()); + server2.invoke(() -> OperationsPropagationDUnitTest.closeCache()); } /** @@ -261,15 +258,12 @@ public static void createClientCache(String host, Integer port2) throws Exceptio */ public void testOperationsPropagation() throws Exception { - server1.invoke(OperationsPropagationDUnitTest.class, "initialPutKeyValue"); - client1.invoke(OperationsPropagationDUnitTest.class, - "assertKeyValuePresent"); - server1.invoke(OperationsPropagationDUnitTest.class, "doOperations"); - client1.invoke(OperationsPropagationDUnitTest.class, - "assertOperationsSucceeded"); - server1.invoke(OperationsPropagationDUnitTest.class, "doRemoveAll"); - client1.invoke(OperationsPropagationDUnitTest.class, - "assertRemoveAllSucceeded"); + server1.invoke(() -> OperationsPropagationDUnitTest.initialPutKeyValue()); + client1.invoke(() -> OperationsPropagationDUnitTest.assertKeyValuePresent()); + server1.invoke(() -> OperationsPropagationDUnitTest.doOperations()); + client1.invoke(() -> OperationsPropagationDUnitTest.assertOperationsSucceeded()); + server1.invoke(() -> OperationsPropagationDUnitTest.doRemoveAll()); + client1.invoke(() -> OperationsPropagationDUnitTest.assertRemoveAllSucceeded()); } /** diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java index ef75a3871dac..f23a30f4a0ff 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java @@ -104,11 +104,11 @@ public void setUp() throws Exception /** close the caches**/ @Override protected final void preTearDown() throws Exception { - client1.invoke(PutAllDUnitTest.class, "closeCache"); - client2.invoke(PutAllDUnitTest.class, "closeCache"); + client1.invoke(() -> PutAllDUnitTest.closeCache()); + client2.invoke(() -> PutAllDUnitTest.closeCache()); // close server - server1.invoke(PutAllDUnitTest.class, "closeCache"); - server2.invoke(PutAllDUnitTest.class, "closeCache"); + server1.invoke(() -> PutAllDUnitTest.closeCache()); + server2.invoke(() -> PutAllDUnitTest.closeCache()); // close cache in the controller VM (ezoerner) Not doing this was causing CacheExistsExceptions in other dunit tests closeCache(); @@ -130,14 +130,10 @@ public void run2() throws CacheException /** function to create a 2 servers and 3 client (1 client will be in the unit controller VM) **/ private void createClientServerConfiguration() { - PORT1 = ((Integer)server1.invoke(PutAllDUnitTest.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)server2.invoke(PutAllDUnitTest.class, - "createServerCache")).intValue(); - client1.invoke(PutAllDUnitTest.class, "createClientCache1", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); - client2.invoke(PutAllDUnitTest.class, "createClientCache2", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) }); + PORT1 = ((Integer)server1.invoke(() -> PutAllDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)server2.invoke(() -> PutAllDUnitTest.createServerCache())).intValue(); + client1.invoke(() -> PutAllDUnitTest.createClientCache1( NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); + client2.invoke(() -> PutAllDUnitTest.createClientCache2( NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) )); try { createClientCache2(NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2)); } @@ -354,34 +350,25 @@ public static Object[] assertThreadIdToSequenceIdMapHasEntryIds() public void testPutAll() throws Exception { setReceivedOperationToFalse(); - client2.invoke(PutAllDUnitTest.class, "setReceivedOperationToFalse"); + client2.invoke(() -> PutAllDUnitTest.setReceivedOperationToFalse()); createClientServerConfiguration(); - EventID[] eventIds1 = (EventID[])client1.invoke(PutAllDUnitTest.class, - "putAll"); + EventID[] eventIds1 = (EventID[])client1.invoke(() -> PutAllDUnitTest.putAll()); assertNotNull(eventIds1); // wait for key to propagate till client // assert map not null on client - client2.invoke(PutAllDUnitTest.class, "waitTillOperationReceived"); + client2.invoke(() -> PutAllDUnitTest.waitTillOperationReceived()); waitTillOperationReceived(); - EventID[] eventIds2 = (EventID[])client2.invoke(PutAllDUnitTest.class, - "assertThreadIdToSequenceIdMapHasEntryIds"); + EventID[] eventIds2 = (EventID[])client2.invoke(() -> PutAllDUnitTest.assertThreadIdToSequenceIdMapHasEntryIds()); assertNotNull(eventIds2); - server1.invoke(PutAllDUnitTest.class, - "assertGotAllValues"); - server2.invoke(PutAllDUnitTest.class, - "assertGotAllValues"); - client1.invoke(PutAllDUnitTest.class, - "assertCallbackArgs"); - client2.invoke(PutAllDUnitTest.class, - "assertGotAllValues"); - client2.invoke(PutAllDUnitTest.class, - "assertCallbackArgs"); - server1.invoke(PutAllDUnitTest.class, - "assertCallbackArgs"); - server2.invoke(PutAllDUnitTest.class, - "assertCallbackArgs"); + server1.invoke(() -> PutAllDUnitTest.assertGotAllValues()); + server2.invoke(() -> PutAllDUnitTest.assertGotAllValues()); + client1.invoke(() -> PutAllDUnitTest.assertCallbackArgs()); + client2.invoke(() -> PutAllDUnitTest.assertGotAllValues()); + client2.invoke(() -> PutAllDUnitTest.assertCallbackArgs()); + server1.invoke(() -> PutAllDUnitTest.assertCallbackArgs()); + server2.invoke(() -> PutAllDUnitTest.assertCallbackArgs()); assertGotAllValues(); assertCallbackArgs(); EventID[] eventIds3 = (EventID[])assertThreadIdToSequenceIdMapHasEntryIds(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java index dd8cf87a6894..f26311304b81 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java @@ -119,10 +119,8 @@ public void setUp() throws Exception primary = host.getVM(0); secondary = host.getVM(1); client1 = host.getVM(2); - PORT1 = ((Integer)primary.invoke(StatsBugDUnitTest.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)secondary.invoke(StatsBugDUnitTest.class, - "createServerCache")).intValue(); + PORT1 = ((Integer)primary.invoke(() -> StatsBugDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)secondary.invoke(() -> StatsBugDUnitTest.createServerCache())).intValue(); } /** @@ -156,11 +154,11 @@ private Cache createCache(Properties props) throws Exception @Override protected final void preTearDown() throws Exception { // close client - client1.invoke(StatsBugDUnitTest.class, "closeCache"); + client1.invoke(() -> StatsBugDUnitTest.closeCache()); // close server - primary.invoke(StatsBugDUnitTest.class, "closeCache"); - secondary.invoke(StatsBugDUnitTest.class, "closeCache"); + primary.invoke(() -> StatsBugDUnitTest.closeCache()); + secondary.invoke(() -> StatsBugDUnitTest.closeCache()); } /** @@ -179,13 +177,12 @@ protected final void preTearDown() throws Exception { public void testBug36109() throws Exception { LogWriterUtils.getLogWriter().info("testBug36109 : BEGIN"); - client1.invoke(StatsBugDUnitTest.class, "createClientCacheForInvalidates", new Object[] { - NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2) }); - client1.invoke(StatsBugDUnitTest.class, "prepopulateClient"); - primary.invoke(StatsBugDUnitTest.class, "doEntryOperations", - new Object[] { primaryPrefix }); + client1.invoke(() -> StatsBugDUnitTest.createClientCacheForInvalidates( + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2) )); + client1.invoke(() -> StatsBugDUnitTest.prepopulateClient()); + primary.invoke(() -> StatsBugDUnitTest.doEntryOperations( primaryPrefix )); Wait.pause(3000); - primary.invoke(StatsBugDUnitTest.class, "stopServer"); + primary.invoke(() -> StatsBugDUnitTest.stopServer()); try { Thread.sleep(5000); } @@ -193,8 +190,7 @@ public void testBug36109() throws Exception fail("interrupted"); } - secondary.invoke(StatsBugDUnitTest.class, "doEntryOperations", - new Object[] { secondaryPrefix }); + secondary.invoke(() -> StatsBugDUnitTest.doEntryOperations( secondaryPrefix )); try { Thread.sleep(5000); } @@ -202,7 +198,7 @@ public void testBug36109() throws Exception fail("interrupted"); } - client1.invoke(StatsBugDUnitTest.class, "verifyNumInvalidates"); + client1.invoke(() -> StatsBugDUnitTest.verifyNumInvalidates()); LogWriterUtils.getLogWriter().info("testBug36109 : END"); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java index 01e7eca4d734..8d150f955e5c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java @@ -77,7 +77,7 @@ public void setUp() throws Exception { Host host = Host.getHost(h); for (int v = 0; v < host.getVMCount(); v++) { - //host.getVM(v).invoke(TXLockServiceDUnitTest.class, "dumpStack"); + //host.getVM(v).invoke(() -> TXLockServiceDUnitTest.dumpStack()); host.getVM(v).invoke( TXLockServiceDUnitTest.class, "connectDistributedSystem", null); } @@ -249,9 +249,7 @@ public void run() { }); /* try { - Host.getHost(0).getVM(clientB).invoke( - TXLockServiceDUnitTest.class, "txLock_DTLS", - new Object[] { regionLockReqs, participants }); + Host.getHost(0).getVM(clientB).invoke(() -> TXLockServiceDUnitTest.txLock_DTLS( regionLockReqs, participants )); fail("expected CommitConflictException"); } catch (RMIException expected) { assertTrue(expected.getCause() instanceof CommitConflictException); @@ -314,8 +312,7 @@ public void testTXOriginatorRecoveryProcessor() { final Set participants = new HashSet(); for (int i = 1; i <= particpantB; i++) { final int finalvm = i; - dmId = (InternalDistributedMember)Host.getHost(0).getVM(finalvm).invoke( - TXLockServiceDUnitTest.class, "fetchDistributionManagerId", new Object[] {}); + dmId = (InternalDistributedMember)Host.getHost(0).getVM(finalvm).invoke(() -> TXLockServiceDUnitTest.fetchDistributionManagerId()); assertEquals("dmId should not be null for vm " + finalvm, false, dmId == null); participants.add(dmId); @@ -330,11 +327,9 @@ public void run() { } }); - Host.getHost(0).getVM(grantorVM).invoke( - TXLockServiceDUnitTest.class, "identifyLockGrantor_DTLS", new Object[] {}); + Host.getHost(0).getVM(grantorVM).invoke(() -> TXLockServiceDUnitTest.identifyLockGrantor_DTLS()); - Boolean isGrantor = (Boolean)Host.getHost(0).getVM(grantorVM).invoke( - TXLockServiceDUnitTest.class, "isLockGrantor_DTLS", new Object[] {}); + Boolean isGrantor = (Boolean)Host.getHost(0).getVM(grantorVM).invoke(() -> TXLockServiceDUnitTest.isLockGrantor_DTLS()); assertEquals("isLockGrantor should not be false for DTLS", Boolean.TRUE, isGrantor); @@ -392,9 +387,7 @@ public void run() { TXLockService.destroyServices(); } }); - Host.getHost(0).getVM(originatorVM).invoke( - DistributedTestCase.class, "disconnectFromDS", - new Object[] {}); + Host.getHost(0).getVM(originatorVM).invoke(() -> DistributedTestCase.disconnectFromDS()); // grantor sends TXOriginatorRecoveryMessage... @@ -439,22 +432,19 @@ public void run() { }); // assert that isDistributed returns false - Boolean isDistributed = (Boolean)host.getVM(finalvm).invoke( - TXLockServiceDUnitTest.class, "isDistributed_DTLS", new Object[] {}); + Boolean isDistributed = (Boolean)host.getVM(finalvm).invoke(() -> TXLockServiceDUnitTest.isDistributed_DTLS()); assertEquals("isDistributed should be true for DTLS", Boolean.TRUE, isDistributed); LogWriterUtils.getLogWriter().info("[testDTLSIsDistributed] isDistributed=" + isDistributed); // lock a key... - Boolean gotLock = (Boolean)host.getVM(finalvm).invoke( - TXLockServiceDUnitTest.class, "lock_DTLS", new Object[] {"KEY"}); + Boolean gotLock = (Boolean)host.getVM(finalvm).invoke(() -> TXLockServiceDUnitTest.lock_DTLS("KEY")); assertEquals("gotLock is false after calling lock_DTLS", Boolean.TRUE, gotLock); LogWriterUtils.getLogWriter().info("[testDTLSIsDistributed] gotLock=" + gotLock); // unlock it... - Boolean unlock = (Boolean)host.getVM(finalvm).invoke( - TXLockServiceDUnitTest.class, "unlock_DTLS", new Object[] {"KEY"}); + Boolean unlock = (Boolean)host.getVM(finalvm).invoke(() -> TXLockServiceDUnitTest.unlock_DTLS("KEY")); assertEquals("unlock is false after calling unlock_DTLS", Boolean.TRUE, unlock); LogWriterUtils.getLogWriter().info("[testDTLSIsDistributed] unlock=" + unlock); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java index eca9bcafe65b..272a3ea96e30 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java @@ -84,10 +84,10 @@ public void setUp() throws Exception { @Override protected final void preTearDown() throws Exception { closeCache(); - client1.invoke(Bug43684DUnitTest.class, "closeCache"); - server1.invoke(Bug43684DUnitTest.class, "closeCache"); - server2.invoke(Bug43684DUnitTest.class, "closeCache"); - server3.invoke(Bug43684DUnitTest.class, "closeCache"); + client1.invoke(() -> Bug43684DUnitTest.closeCache()); + server1.invoke(() -> Bug43684DUnitTest.closeCache()); + server2.invoke(() -> Bug43684DUnitTest.closeCache()); + server3.invoke(() -> Bug43684DUnitTest.closeCache()); } public static void closeCache() { @@ -201,33 +201,33 @@ private void doRegisterInterest(Object keys, String regEx) throws Exception { @SuppressWarnings("rawtypes") private void doRegisterInterest(Object keys, String regEx, Integer numOfPuts, Boolean isReplicated, Boolean isPrimaryEmpty) throws Exception { - int port1 = (Integer)server1.invoke(Bug43684DUnitTest.class, "createServerCache", new Object[]{isReplicated, isPrimaryEmpty}); - server2.invoke(Bug43684DUnitTest.class, "createServerCache", new Object[]{isReplicated, false}); - server3.invoke(Bug43684DUnitTest.class, "createServerCache", new Object[]{isReplicated, false}); + int port1 = (Integer)server1.invoke(() -> Bug43684DUnitTest.createServerCache(isReplicated, isPrimaryEmpty)); + server2.invoke(() -> Bug43684DUnitTest.createServerCache(isReplicated, false)); + server3.invoke(() -> Bug43684DUnitTest.createServerCache(isReplicated, false)); int regexNum = 20; - server1.invoke(Bug43684DUnitTest.class, "doPuts", new Object[]{numOfPuts, regEx, regexNum}); + server1.invoke(() -> Bug43684DUnitTest.doPuts(numOfPuts, regEx, regexNum)); - client1.invoke(Bug43684DUnitTest.class, "createClientCache", new Object[] {host, port1}); - client1.invoke(Bug43684DUnitTest.class, "registerInterest", new Object[] {keys, regEx}); + client1.invoke(() -> Bug43684DUnitTest.createClientCache(host, port1)); + client1.invoke(() -> Bug43684DUnitTest.registerInterest(keys, regEx)); - server1.invoke(Bug43684DUnitTest.class, "closeCache"); + server1.invoke(() -> Bug43684DUnitTest.closeCache()); int size = keys != null ? (keys instanceof List ? ((List)keys).size() : 1) : regEx == null ? numOfPuts : regexNum; - client1.invoke(Bug43684DUnitTest.class, "verifyResponse", new Object[]{size}); + client1.invoke(() -> Bug43684DUnitTest.verifyResponse(size)); } @SuppressWarnings("rawtypes") private void doRegisterInterest2(Object keys, Boolean isReplicated, Boolean isPrimaryEmpty) throws Exception { - int port1 = (Integer)server1.invoke(Bug43684DUnitTest.class, "createServerCache", new Object[]{isReplicated, isPrimaryEmpty}); - server2.invoke(Bug43684DUnitTest.class, "createServerCache", new Object[]{isReplicated, false}); - server3.invoke(Bug43684DUnitTest.class, "createServerCache", new Object[]{isReplicated, false}); + int port1 = (Integer)server1.invoke(() -> Bug43684DUnitTest.createServerCache(isReplicated, isPrimaryEmpty)); + server2.invoke(() -> Bug43684DUnitTest.createServerCache(isReplicated, false)); + server3.invoke(() -> Bug43684DUnitTest.createServerCache(isReplicated, false)); - client1.invoke(Bug43684DUnitTest.class, "createClientCache", new Object[] {host, port1}); + client1.invoke(() -> Bug43684DUnitTest.createClientCache(host, port1)); createClientCache(host, port1); doOps(); - client1.invoke(Bug43684DUnitTest.class, "registerInterest", new Object[] {keys, null}); - client1.invoke(Bug43684DUnitTest.class, "verifyResponse2"); + client1.invoke(() -> Bug43684DUnitTest.registerInterest(keys, null)); + client1.invoke(() -> Bug43684DUnitTest.verifyResponse2()); } public static Integer createServerCache() throws Exception { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java index 1a02b909fd7d..193a7ddb3ca9 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java @@ -90,10 +90,8 @@ public void setUp() throws Exception { vm3 = host.getVM(3); // durable client without subscription //int mcastPort = AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS); - int port0 = (Integer) vm0.invoke(Bug47388DUnitTest.class, - "createCacheServerWithPRDatastore", new Object[] { }); - int port1 = (Integer) vm1.invoke(Bug47388DUnitTest.class, - "createCacheServerWithPRDatastore", new Object[] { }); + int port0 = (Integer) vm0.invoke(() -> Bug47388DUnitTest.createCacheServerWithPRDatastore( )); + int port1 = (Integer) vm1.invoke(() -> Bug47388DUnitTest.createCacheServerWithPRDatastore( )); vm2.invoke(Bug47388DUnitTest.class, "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 }, @@ -107,11 +105,11 @@ public void setUp() throws Exception { protected final void preTearDown() throws Exception { closeCache(); - vm2.invoke(Bug47388DUnitTest.class, "closeCache"); - vm3.invoke(Bug47388DUnitTest.class, "closeCache"); + vm2.invoke(() -> Bug47388DUnitTest.closeCache()); + vm3.invoke(() -> Bug47388DUnitTest.closeCache()); - vm0.invoke(Bug47388DUnitTest.class, "closeCache"); - vm1.invoke(Bug47388DUnitTest.class, "closeCache"); + vm0.invoke(() -> Bug47388DUnitTest.closeCache()); + vm1.invoke(() -> Bug47388DUnitTest.closeCache()); } public static void closeCache() throws Exception { @@ -272,18 +270,15 @@ public void bug51931_testQRMOfExpiredEventsProcessedSuccessfully() throws Except int totalEvents = 23; // = (numOfSets * numOfPuts) * 2 [eviction-destroys] + // 2 [last key's put and eviction-destroy] + 1 [marker // message] - vm3.invoke(Bug47388DUnitTest.class, "doPuts", new Object[] { numOfSets, - numOfPuts }); + vm3.invoke(() -> Bug47388DUnitTest.doPuts( numOfSets, + numOfPuts )); - boolean isvm0Primary = (Boolean) vm0.invoke(Bug47388DUnitTest.class, - "isPrimaryServer"); + boolean isvm0Primary = (Boolean) vm0.invoke(() -> Bug47388DUnitTest.isPrimaryServer()); - vm2.invoke(Bug47388DUnitTest.class, "waitForLastKeyDestroyed"); + vm2.invoke(() -> Bug47388DUnitTest.waitForLastKeyDestroyed()); - vm0.invoke(Bug47388DUnitTest.class, "verifyClientSubscriptionStats", - new Object[] { isvm0Primary, totalEvents }); - vm1.invoke(Bug47388DUnitTest.class, "verifyClientSubscriptionStats", - new Object[] { !isvm0Primary, totalEvents }); + vm0.invoke(() -> Bug47388DUnitTest.verifyClientSubscriptionStats( isvm0Primary, totalEvents )); + vm1.invoke(() -> Bug47388DUnitTest.verifyClientSubscriptionStats( !isvm0Primary, totalEvents )); } public void testNothingBecauseOfBug51931() { // remove this when bug #51931 is fixed diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java index 5b08a3ec0fcb..171567406333 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java @@ -79,11 +79,11 @@ public void setUp() throws Exception { protected final void preTearDown() throws Exception { closeCache(); - client0.invoke(Bug51400DUnitTest.class, "closeCache"); - client1.invoke(Bug51400DUnitTest.class, "closeCache"); + client0.invoke(() -> Bug51400DUnitTest.closeCache()); + client1.invoke(() -> Bug51400DUnitTest.closeCache()); - server0.invoke(Bug51400DUnitTest.class, "closeCache"); - server1.invoke(Bug51400DUnitTest.class, "closeCache"); + server0.invoke(() -> Bug51400DUnitTest.closeCache()); + server1.invoke(() -> Bug51400DUnitTest.closeCache()); } public static void closeCache() throws Exception { @@ -174,22 +174,19 @@ public void ticket51932_testDeadlock() throws Throwable { // Set infinite ack interval so that the queue will not be drained. int ackInterval = Integer.MAX_VALUE; - int port1 = (Integer) server0.invoke(Bug51400DUnitTest.class, - "createServerCache", new Object[] { maxQSize }); + int port1 = (Integer) server0.invoke(() -> Bug51400DUnitTest.createServerCache( maxQSize )); client1.invoke(Bug51400DUnitTest.class, "createClientCache", new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer[]{port1}, ackInterval}); // Do puts from server as well as from client on the same key. - AsyncInvocation ai1 = server0.invokeAsync(Bug51400DUnitTest.class, - "updateKey", new Object[] { 2 * maxQSize }); - AsyncInvocation ai2 = client1.invokeAsync(Bug51400DUnitTest.class, - "updateKey", new Object[] { 2 * maxQSize }); + AsyncInvocation ai1 = server0.invokeAsync(() -> Bug51400DUnitTest.updateKey( 2 * maxQSize )); + AsyncInvocation ai2 = client1.invokeAsync(() -> Bug51400DUnitTest.updateKey( 2 * maxQSize )); ai1.getResult(); ai2.getResult(); // Verify that the queue has crossed its limit of maxQSize - server0.invoke(Bug51400DUnitTest.class, "verifyQueueSize", new Object[] { - true, 2 * maxQSize }); + server0.invoke(() -> Bug51400DUnitTest.verifyQueueSize( + true, 2 * maxQSize )); } public static void updateKey(Integer num) { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java index e06e49ac31a6..faa6fb69cee7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java @@ -66,30 +66,24 @@ public void testLoader_OnAccessor_NotOnDataStore(){ host = Host.getHost(0); accessor = host.getVM(0); datastore1 = host.getVM(1); - accessor.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {new CacheLoader2(), null, 0}); - datastore1.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {null, null, 10}); + accessor.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(new CacheLoader2(), null, 0)); + datastore1.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(null, null, 10)); } public void testWriter_NotOnAccessor_OnDataStore(){ host = Host.getHost(0); accessor = host.getVM(1); datastore1 = host.getVM(2); - accessor.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {null, null, 0}); - datastore1.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {null, new CacheWriter2(), 10}); + accessor.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(null, null, 0)); + datastore1.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(null, new CacheWriter2(), 10)); } public void testWriter_OnDataStore_NotOnAccessor(){ host = Host.getHost(0); accessor = host.getVM(1); datastore1 = host.getVM(2); - datastore1.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {null, new CacheWriter2(), 10}); - accessor.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {null, null, 0}); + datastore1.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(null, new CacheWriter2(), 10)); + accessor.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(null, null, 0)); } public void testLoader_OnAccessor_NotOnFirstDataStore_OnSecondDataStore(){ @@ -97,12 +91,9 @@ public void testLoader_OnAccessor_NotOnFirstDataStore_OnSecondDataStore(){ accessor = host.getVM(1); datastore1 = host.getVM(2); datastore2 = host.getVM(3); - accessor.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {new CacheLoader2(), null, 0}); - datastore1.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {null, null, 10}); - datastore2.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegionWithPossibleFail", new Object[] {new CacheLoader2(),null, 10}); + accessor.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(new CacheLoader2(), null, 0)); + datastore1.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(null, null, 10)); + datastore2.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegionWithPossibleFail(new CacheLoader2(),null, 10)); } public void testLoader_NotOnFirstDataStore_OnAccessor_OnSecondDataStore(){ @@ -110,12 +101,9 @@ public void testLoader_NotOnFirstDataStore_OnAccessor_OnSecondDataStore(){ accessor = host.getVM(1); datastore1 = host.getVM(2); datastore2 = host.getVM(3); - datastore1.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {null, null, 10}); - accessor.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {new CacheLoader2(), null, 0}); - datastore2.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegionWithPossibleFail", new Object[] {new CacheLoader2(),null, 10}); + datastore1.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(null, null, 10)); + accessor.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(new CacheLoader2(), null, 0)); + datastore2.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegionWithPossibleFail(new CacheLoader2(),null, 10)); } public void testLoader_OnFirstDataStore_OnSecondDataStore_OnAccessor(){ @@ -123,12 +111,9 @@ public void testLoader_OnFirstDataStore_OnSecondDataStore_OnAccessor(){ accessor = host.getVM(1); datastore1 = host.getVM(2); datastore2 = host.getVM(3); - datastore1.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {new CacheLoader2(), null, 10}); - datastore2.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {new CacheLoader2(),null, 10}); - accessor.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {new CacheLoader2(), null, 0}); + datastore1.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(new CacheLoader2(), null, 10)); + datastore2.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(new CacheLoader2(),null, 10)); + accessor.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(new CacheLoader2(), null, 0)); } public void testLoader_OnFirstDataStore_OnSecondDataStore_NotOnAccessor(){ @@ -136,12 +121,9 @@ public void testLoader_OnFirstDataStore_OnSecondDataStore_NotOnAccessor(){ accessor = host.getVM(1); datastore1 = host.getVM(2); datastore2 = host.getVM(3); - datastore1.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {new CacheLoader2(), null, 10}); - datastore2.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {new CacheLoader2(),null, 10}); - accessor.invoke(PartitionedRegionLoaderWriterDUnitTest.class, - "createRegion", new Object[] {null, null, 0}); + datastore1.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(new CacheLoader2(), null, 10)); + datastore2.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(new CacheLoader2(),null, 10)); + accessor.invoke(() -> PartitionedRegionLoaderWriterDUnitTest.createRegion(null, null, 0)); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java index ce42945ee602..c715ae7f0e8f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java @@ -61,14 +61,13 @@ public void setUp() throws Exception { */ public void testNullPartitionName() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa = FixedPartitionAttributes .createFixedPartition(null, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 3, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 3, + new QuarterPartitionResolver(), null, false)); fail("IllegalStateException Expected"); } catch (Exception illegal) { @@ -88,7 +87,7 @@ public void testNullPartitionName() { public void testSamePartitionNameTwice() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -96,9 +95,8 @@ public void testSamePartitionNameTwice() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 3, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 3, + new QuarterPartitionResolver(), null, false )); fail("IllegalStateException Expected"); } catch (Exception illegal) { @@ -116,7 +114,7 @@ public void testSamePartitionNameTwice() { */ public void testFixedPartitionAttributes_Accessor() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -124,9 +122,8 @@ public void testFixedPartitionAttributes_Accessor() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 0, 3, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 0, 3, + new QuarterPartitionResolver(), null, false)); fail("IllegalStateException Expected"); } catch (Exception illegal) { @@ -147,30 +144,27 @@ public void testFixedPartitionAttributes_Accessor() { public void testSamePartitionName_Primary_OnTwoMembers() { IgnoredException ex = IgnoredException.addIgnoredException("DuplicatePrimaryPartitionException"); try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 9, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 9, + new QuarterPartitionResolver(), null, false)); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 9, - new QuarterPartitionResolver(), null, false}); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 9, + new QuarterPartitionResolver(), null, false)); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 9, - new QuarterPartitionResolver(), null, false}); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 9, + new QuarterPartitionResolver(), null, false)); fail("DuplicatePrimaryPartitionException Expected"); } catch (Exception duplicate) { @@ -192,7 +186,7 @@ public void testSamePartitionName_Primary_OnTwoMembers() { public void testSamePartitionName_DifferentNumBuckets() { IgnoredException ex = IgnoredException.addIgnoredException("IllegalStateException"); try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -200,19 +194,17 @@ public void testSamePartitionName_DifferentNumBuckets() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 9, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 9, + new QuarterPartitionResolver(), null, false)); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 8); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 9, - new QuarterPartitionResolver(), null, false}); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 9, + new QuarterPartitionResolver(), null, false)); fail("IllegalStateException Expected"); } catch (Exception illegal) { @@ -235,12 +227,11 @@ public void testSamePartitionName_DifferentNumBuckets() { public void testNumberOfPartitions() { IgnoredException expected = IgnoredException.addIgnoredException("IllegalStateException"); try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 1, 0, 9, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 1, 0, 9, + new QuarterPartitionResolver(), null, false)); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition("Q11", true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -248,11 +239,10 @@ public void testNumberOfPartitions() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 9, - new QuarterPartitionResolver(), null, false}); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 9, + new QuarterPartitionResolver(), null, false)); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition("Q12", true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition("Q13", false, 3); FixedPartitionAttributes fpa3 = FixedPartitionAttributes @@ -261,19 +251,17 @@ public void testNumberOfPartitions() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 9, - new QuarterPartitionResolver(), null, false}); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 9, + new QuarterPartitionResolver(), null, false)); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition("Q13", true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition("Q11", false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 9, - new QuarterPartitionResolver(), null, false}); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 9, + new QuarterPartitionResolver(), null, false)); fail("IllegalStateException expected"); } catch (Exception ex) { @@ -295,12 +283,11 @@ public void testNumberOfPartitions() { public void testNumBuckets_totalNumBuckets() { IgnoredException expected = IgnoredException.addIgnoredException("IllegalStateException"); try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 1, 0, 5, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 1, 0, 5, + new QuarterPartitionResolver(), null, false)); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -308,19 +295,17 @@ public void testNumBuckets_totalNumBuckets() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 5, - new QuarterPartitionResolver(), null, false}); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 5, + new QuarterPartitionResolver(), null, false)); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 5, - new QuarterPartitionResolver(), null, false}); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 5, + new QuarterPartitionResolver(), null, false)); fail("IllegalStateException expected"); } @@ -342,30 +327,26 @@ public void testNumBuckets_totalNumBuckets() { */ public void testPut_PartitionNotAvailableException() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 1, 0, 12, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 1, 0, 12, + new QuarterPartitionResolver(), null, false)); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false}); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false)); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false}); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false)); - member1.invoke(FixedPartitioningTestBase.class, "putThorughAccessor", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putThorughAccessor( "Quarter" )); fail("PartitionNotAvailableException Expected"); } catch (Exception ex) { @@ -384,19 +365,17 @@ public void testPut_PartitionNotAvailableException() { public void test_DataStoreWithoutPartition_DataStoreWithPartition() { IgnoredException expected = IgnoredException.addIgnoredException("IllegalStateException"); try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 1, 40, 12, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 1, 40, 12, + new QuarterPartitionResolver(), null, false)); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false}); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false)); } catch (Exception ex) { if (!((ex.getCause() instanceof IllegalStateException))) { @@ -416,19 +395,17 @@ public void test_DataStoreWithoutPartition_DataStoreWithPartition() { public void test_DataStoreWithPartition_DataStoreWithoutPartition() { IgnoredException expected = IgnoredException.addIgnoredException("IllegalStateException"); try { - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false}); - - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 1, 40, 12, - new QuarterPartitionResolver(), null, false}); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false)); + + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 1, 40, 12, + new QuarterPartitionResolver(), null, false)); } catch (Exception ex) { if (!((ex.getCause() instanceof IllegalStateException))) { @@ -444,59 +421,51 @@ public void test_DataStoreWithPartition_DataStoreWithoutPartition() { * primary FixedPartitionAttributes defined on datastores */ public void testPut_ValidateDataOnMember_OnlyPrimary_Accessor() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 0, 0, 12, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 0, 0, 12, + new QuarterPartitionResolver(), null, false)); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); - - member1.invoke(FixedPartitioningTestBase.class, "putThorughAccessor", - new Object[] { "Quarter" }); - - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter1 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter2 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter3 }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); + + member1.invoke(() -> FixedPartitioningTestBase.putThorughAccessor( "Quarter" )); + + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter1 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter2 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter3 )); } public void testBug43283() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); - member1.invoke(FixedPartitioningTestBase.class, "setPRObserverBeforeCalculateStartingBucketId"); - member2.invoke(FixedPartitioningTestBase.class, "setPRObserverBeforeCalculateStartingBucketId"); - member3.invoke(FixedPartitioningTestBase.class, "setPRObserverBeforeCalculateStartingBucketId"); - member4.invoke(FixedPartitioningTestBase.class, "setPRObserverBeforeCalculateStartingBucketId"); + member1.invoke(() -> FixedPartitioningTestBase.setPRObserverBeforeCalculateStartingBucketId()); + member2.invoke(() -> FixedPartitioningTestBase.setPRObserverBeforeCalculateStartingBucketId()); + member3.invoke(() -> FixedPartitioningTestBase.setPRObserverBeforeCalculateStartingBucketId()); + member4.invoke(() -> FixedPartitioningTestBase.setPRObserverBeforeCalculateStartingBucketId()); try { FixedPartitionAttributes fpa1 = FixedPartitionAttributes @@ -504,37 +473,32 @@ public void testBug43283() { List fpaList = new ArrayList(); fpaList.add(fpa1); AsyncInvocation inv1 = member1 - .invokeAsync(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", + .invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, - false }); + false )); FixedPartitionAttributes fpa2 = FixedPartitionAttributes .createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa2); AsyncInvocation inv2 = member2 - .invokeAsync(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", + .invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, - false }); + false )); FixedPartitionAttributes fpa3 = FixedPartitionAttributes .createFixedPartition(Quarter3, true, 3); fpaList = new ArrayList(); fpaList.add(fpa3); AsyncInvocation inv3 = member3 - .invokeAsync(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", + .invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, - false }); + false )); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - null, 0, 0, 12, new QuarterPartitionResolver(), null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + null, 0, 0, 12, new QuarterPartitionResolver(), null, false )); try { - member4.invoke(FixedPartitioningTestBase.class, - "putThorughAccessor_Immediate", new Object[] { "Quarter" }); + member4.invoke(() -> FixedPartitioningTestBase.putThorughAccessor_Immediate( "Quarter" )); } catch (Exception e) { e.printStackTrace(); @@ -552,10 +516,10 @@ public void testBug43283() { fail("Unexpected Exception"); } } finally { - member1.invoke(FixedPartitioningTestBase.class, "resetPRObserverBeforeCalculateStartingBucketId"); - member2.invoke(FixedPartitioningTestBase.class, "resetPRObserverBeforeCalculateStartingBucketId"); - member3.invoke(FixedPartitioningTestBase.class, "resetPRObserverBeforeCalculateStartingBucketId"); - member4.invoke(FixedPartitioningTestBase.class, "resetPRObserverBeforeCalculateStartingBucketId"); + member1.invoke(() -> FixedPartitioningTestBase.resetPRObserverBeforeCalculateStartingBucketId()); + member2.invoke(() -> FixedPartitioningTestBase.resetPRObserverBeforeCalculateStartingBucketId()); + member3.invoke(() -> FixedPartitioningTestBase.resetPRObserverBeforeCalculateStartingBucketId()); + member4.invoke(() -> FixedPartitioningTestBase.resetPRObserverBeforeCalculateStartingBucketId()); } } @@ -566,59 +530,46 @@ public void testBug43283() { */ public void testPut_ValidateDataOnMember_OnlyPrimary_Datastore() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); - - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter1 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter2 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter4 }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); + + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter1 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter2 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter4 )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); } /** @@ -626,42 +577,37 @@ public void testPut_ValidateDataOnMember_OnlyPrimary_Datastore() { * EntryNotFoundException */ public void testDelete_WithoutPut() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false )); try { - member1.invoke(FixedPartitioningTestBase.class, "deleteOperation", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.deleteOperation( "Quarter" )); fail("EntryNotFoundException expected"); } catch (Exception ex) { @@ -670,11 +616,9 @@ public void testDelete_WithoutPut() { } } - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); - member1.invoke(FixedPartitioningTestBase.class, "getThroughDataStore", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.getThroughDataStore( "Quarter" )); } @@ -685,42 +629,37 @@ public void testDelete_WithoutPut() { */ public void testPut_NoResolver() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null , false}); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null , false)); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); try { - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore_NoResolver", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore_NoResolver( "Quarter" )); fail("IllegalStateException expected"); } catch (Exception ex) { @@ -737,59 +676,46 @@ public void testPut_NoResolver() { */ public void testPut_CallBackWithResolver() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore_CallBackWithResolver", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore_CallBackWithResolver( "Quarter" )); - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter1 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter2 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter4 }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter1 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter2 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter4 )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); } /** @@ -798,28 +724,23 @@ public void testPut_CallBackWithResolver() { */ public void testPut_WithResolver_NoFPAs() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); - - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); - - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); - - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", null, 0, 40, 12, - new QuarterPartitionResolver(), null, false}); - - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); + + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); + + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); + + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, 0, 40, 12, + new QuarterPartitionResolver(), null, false)); + + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); } @@ -833,43 +754,37 @@ public void testPut_WithResolver_NoFPAs() { public void testPut_FixedPartitionResolver_NoResolver() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); try { - member1.invoke(FixedPartitioningTestBase.class, - "putThroughDataStore_FixedPartitionResolver_NoResolver", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore_FixedPartitionResolver_NoResolver( "Quarter" )); fail("IllegalStateException expected"); } catch (Exception ex) { @@ -888,43 +803,37 @@ public void testPut_FixedPartitionResolver_NoResolver() { */ public void testPut_FixedPartitionResolver_PartitionResolver() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - null, null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + null, null, false )); try { - member1.invoke(FixedPartitioningTestBase.class, - "putThroughDataStore_FixedPartitionResolver_PartitionResolver", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore_FixedPartitionResolver_PartitionResolver( "Quarter" )); fail("IllegalStateException expected"); } catch (Exception ex) { @@ -941,59 +850,46 @@ public void testPut_FixedPartitionResolver_PartitionResolver() { */ public void testFPR_DefaultNumBuckets() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 0, 40, 12, - new QuarterPartitionResolver(), null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12, + new QuarterPartitionResolver(), null, false )); - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter1 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter2 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter4 }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 1, 1 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 1, 1 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 1, 1 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 1, 1 }); + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter1 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter2 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter4 )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 1, 1 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 1, 1 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 1, 1 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 1, 1 )); } /** * This tests validate that accessor member does the put on datastores as per @@ -1005,7 +901,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor() { createRegionWithPartitionAttributes("Quarter", null, 3, 0, 12, new QuarterPartitionResolver(), null, false); - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -1016,11 +912,10 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3); @@ -1028,11 +923,10 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3); @@ -1040,11 +934,10 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3); @@ -1052,24 +945,19 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); putThroughDataStore("Quarter"); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter1, - false }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter2, - false }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter3, - false }); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter4, - false }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter1, + false )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter2, + false )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter3, + false )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter4, + false )); } /** @@ -1079,7 +967,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor() { */ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -1087,60 +975,47 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); - - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter1, false }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter2, false }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter3, false }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter4, false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); + + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter1, false )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter2, false )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, false )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter4, false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); } /** @@ -1154,50 +1029,41 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore() { */ public void testPut_ValidateDataOnMember_OnlySecondary_Datastore() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, false, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); - - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); + + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); createCacheOnMember(); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3); @@ -1208,14 +1074,10 @@ public void testPut_ValidateDataOnMember_OnlySecondary_Datastore() { Wait.pause(1000); - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 0 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 3, 3 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 0 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); checkPrimaryBucketsForQuarter(3, 3); } @@ -1250,7 +1112,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed() createRegionWithPartitionAttributes("Quarter", null, 3, 0, 12, new QuarterPartitionResolver(), null, false); - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -1261,11 +1123,10 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed() fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3); @@ -1273,11 +1134,10 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed() fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3); @@ -1285,11 +1145,10 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed() fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3); @@ -1297,53 +1156,38 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed() fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 3, 40, 12, - new QuarterPartitionResolver(), null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12, + new QuarterPartitionResolver(), null, false )); putThroughDataStore("Quarter"); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter1, - false }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter2, - false }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter3, - false }); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter4, - false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 9, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 9, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 9, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 9, 3 }); - - member4.invoke(FixedPartitioningTestBase.class, "closeCache"); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter1, + false )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter2, + false )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter3, + false )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter4, + false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 9, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 9, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 9, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 9, 3 )); + + member4.invoke(() -> FixedPartitioningTestBase.closeCache()); Wait.pause(1000); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter1, - false }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter2, - false }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData_TwoSecondaries", new Object[] { Quarter3, - false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarterAfterCacheClosed", - new Object[] { 9, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarterAfterCacheClosed", - new Object[] { 9, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarterAfterCacheClosed", - new Object[] { 9, 3 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter1, + false )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter2, + false )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData_TwoSecondaries( Quarter3, + false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarterAfterCacheClosed( 9, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarterAfterCacheClosed( 9, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarterAfterCacheClosed( 9, 3 )); } /** @@ -1372,7 +1216,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed() */ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore_CacheClosed() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -1380,103 +1224,80 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore_CacheClosed( List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); - - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter1, false }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter2, false }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter3, false }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter4, false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - - member4.invoke(FixedPartitioningTestBase.class, "closeCache"); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); + + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter1, false )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter2, false )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, false )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter4, false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + + member4.invoke(() -> FixedPartitioningTestBase.closeCache()); Wait.pause(1000); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarterAfterCacheClosed", - new Object[] { 6, 6 }); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarterAfterCacheClosed( 6, 6 )); - member1.invoke(FixedPartitioningTestBase.class, "putHAData", new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putHAData( "Quarter" )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); Wait.pause(1000); - member1.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter1, true }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter2, true }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter3, true }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter4, true }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter1, true )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter2, true )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, true )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter4, true )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); } public void test_Bug46619_Put_ValidateDataOnMember_PrimarySecondary_Datastore_CacheClosed() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember_DisableMovePrimary"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -1484,123 +1305,94 @@ public void test_Bug46619_Put_ValidateDataOnMember_PrimarySecondary_Datastore_Ca List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember_DisableMovePrimary"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember_DisableMovePrimary"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember_DisableMovePrimary"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); - - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter1, false }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter2, false }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter3, false }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter4, false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - - member4.invoke(FixedPartitioningTestBase.class, "closeCache"); - member2.invoke(FixedPartitioningTestBase.class, "closeCache"); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); + + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter1, false )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter2, false )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, false )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter4, false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + + member4.invoke(() -> FixedPartitioningTestBase.closeCache()); + member2.invoke(() -> FixedPartitioningTestBase.closeCache()); Wait.pause(1000); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarterAfterCacheClosed", - new Object[] { 6, 6 }); - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarterAfterCacheClosed", - new Object[] { 6, 6 }); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarterAfterCacheClosed( 6, 6 )); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarterAfterCacheClosed( 6, 6 )); - member1.invoke(FixedPartitioningTestBase.class, "putHAData", new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putHAData( "Quarter" )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember_DisableMovePrimary"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member4.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember_DisableMovePrimary"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 1, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12, + new QuarterPartitionResolver(), null, false )); Wait.pause(1000); - member1.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter1, true }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter2, true }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter3, true }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimarySecondaryData", - new Object[] { Quarter4, true }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 6 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 0 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 6 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 0 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter1, true )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter2, true )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, true )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter4, true )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 6 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 0 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 6 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 0 )); - member4.invoke(FixedPartitioningTestBase.class, "doRebalance"); + member4.invoke(() -> FixedPartitioningTestBase.doRebalance()); Wait.pause(2000); - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryBucketsForQuarter", - new Object[] { 6, 3 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); } /** @@ -1627,7 +1419,7 @@ public void test_Bug46619_Put_ValidateDataOnMember_PrimarySecondary_Datastore_Ca */ public void testPut_ValidateDataOnMember_MultiplePrimaries_Datastore_CacheClosed() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); List fpaList = new ArrayList(); @@ -1636,22 +1428,20 @@ public void testPut_ValidateDataOnMember_MultiplePrimaries_Datastore_CacheClosed fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3)); - member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 2, 40, 12, - new QuarterPartitionResolver(), null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 2, 40, 12, + new QuarterPartitionResolver(), null, false )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpaList = new ArrayList(); fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3)); - member2.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 2, 40, 12, - new QuarterPartitionResolver(), null, false }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 2, 40, 12, + new QuarterPartitionResolver(), null, false )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpaList = new ArrayList(); fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3)); fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3)); @@ -1659,35 +1449,32 @@ public void testPut_ValidateDataOnMember_MultiplePrimaries_Datastore_CacheClosed fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3)); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 2, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 2, 40, 12, + new QuarterPartitionResolver(), null, false )); - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); - member1.invoke(FixedPartitioningTestBase.class, "checkStartingBucketIDs"); - member2.invoke(FixedPartitioningTestBase.class, "checkStartingBucketIDs"); - member3.invoke(FixedPartitioningTestBase.class, "checkStartingBucketIDs"); + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); + member1.invoke(() -> FixedPartitioningTestBase.checkStartingBucketIDs()); + member2.invoke(() -> FixedPartitioningTestBase.checkStartingBucketIDs()); + member3.invoke(() -> FixedPartitioningTestBase.checkStartingBucketIDs()); - member3.invoke(FixedPartitioningTestBase.class, "closeCache"); + member3.invoke(() -> FixedPartitioningTestBase.closeCache()); Wait.pause(1000); - member1.invoke(FixedPartitioningTestBase.class, "checkStartingBucketIDs_Nodedown"); - member2.invoke(FixedPartitioningTestBase.class, "checkStartingBucketIDs_Nodedown"); + member1.invoke(() -> FixedPartitioningTestBase.checkStartingBucketIDs_Nodedown()); + member2.invoke(() -> FixedPartitioningTestBase.checkStartingBucketIDs_Nodedown()); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); - member3.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes", - new Object[] { "Quarter", fpaList, 2, 40, 12, - new QuarterPartitionResolver(), null, false }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 2, 40, 12, + new QuarterPartitionResolver(), null, false )); Wait.pause(3000); - member1.invoke(FixedPartitioningTestBase.class, "checkStartingBucketIDs_Nodeup"); - member2.invoke(FixedPartitioningTestBase.class, "checkStartingBucketIDs_Nodeup"); - member3.invoke(FixedPartitioningTestBase.class, "checkStartingBucketIDs_Nodeup"); + member1.invoke(() -> FixedPartitioningTestBase.checkStartingBucketIDs_Nodeup()); + member2.invoke(() -> FixedPartitioningTestBase.checkStartingBucketIDs_Nodeup()); + member3.invoke(() -> FixedPartitioningTestBase.checkStartingBucketIDs_Nodeup()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java index 95ea49f0b41e..b1a2895c6fec 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java @@ -1321,10 +1321,10 @@ public static void resetPRObserverBeforeCalculateStartingBucketId() protected final void preTearDown() throws Exception { try { closeCache(); - member1.invoke(FixedPartitioningTestBase.class, "closeCache"); - member2.invoke(FixedPartitioningTestBase.class, "closeCache"); - member3.invoke(FixedPartitioningTestBase.class, "closeCache"); - member4.invoke(FixedPartitioningTestBase.class, "closeCache"); + member1.invoke(() -> FixedPartitioningTestBase.closeCache()); + member2.invoke(() -> FixedPartitioningTestBase.closeCache()); + member3.invoke(() -> FixedPartitioningTestBase.closeCache()); + member4.invoke(() -> FixedPartitioningTestBase.closeCache()); } finally { // locally destroy all root regions and close the cache @@ -1334,7 +1334,7 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(h); for (int v = 0; v < host.getVMCount(); v++) { VM vm = host.getVM(v); - vm.invoke(FixedPartitioningTestBase.class, "remoteTearDown"); + vm.invoke(() -> FixedPartitioningTestBase.remoteTearDown()); } } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java index 8a06f7ed020f..d07179239e65 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java @@ -52,21 +52,19 @@ public void setUp() throws Exception { public void testColocation_WithFPROnChildRegion() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition("Customer100", true, 2); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", - fpaList, 0, 40, 8, null, null, false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", + fpaList, 0, 40, 8, null, null, false )); fpa1 = FixedPartitionAttributes.createFixedPartition("Order100", true, 2); fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", - fpaList, 0, 40, 8, null, "Customer", false }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", + fpaList, 0, 40, 8, null, "Customer", false )); fail("IllegalStateException expected"); } catch (Exception illegal) { @@ -95,10 +93,10 @@ public void testColocation_WithFPROnChildRegion() { public void testColocation_FPRs_ChildUsingAttributesOfParent() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition("10", true, 5); @@ -110,10 +108,9 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); + false )); fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5); @@ -122,10 +119,9 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); + false )); fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); @@ -134,10 +130,9 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); + false )); fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); @@ -146,87 +141,62 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); + false )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); + false )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member3.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member4.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member4.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putOrderPartitionedRegion", new Object[] { "Order" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putCustomerPartitionedRegion", new Object[] { "Customer" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putShipmentPartitionedRegion", new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); + false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member3.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member4.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member4.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.putOrderPartitionedRegion( "Order" )); + + member1.invoke(() -> FixedPartitioningTestBase.putCustomerPartitionedRegion( "Customer" )); + + member1.invoke(() -> FixedPartitioningTestBase.putShipmentPartitionedRegion( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); } catch (Exception e) { @@ -236,10 +206,10 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent() { public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition("10", true, 5); @@ -251,10 +221,9 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5); @@ -263,10 +232,9 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); @@ -275,10 +243,9 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); @@ -287,87 +254,62 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); + false )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member3.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member4.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member4.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putOrderPartitionedRegion", new Object[] { "Order" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putCustomerPartitionedRegion", new Object[] { "Customer" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putShipmentPartitionedRegion", new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); + false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member3.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member4.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member4.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.putOrderPartitionedRegion( "Order" )); + + member1.invoke(() -> FixedPartitioningTestBase.putCustomerPartitionedRegion( "Customer" )); + + member1.invoke(() -> FixedPartitioningTestBase.putShipmentPartitionedRegion( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); } catch (Exception e) { @@ -382,9 +324,9 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent() { public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition("10", true, 5); @@ -396,10 +338,9 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); + false )); fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5); @@ -408,10 +349,9 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); + false )); fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("40", true, 5); @@ -423,82 +363,60 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa2); fpaList.add(fpa3); fpaList.add(fpa4); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); + false )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); + false )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member3.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putCustomerPartitionedRegion", new Object[] { "Customer" }); - member1.invoke(FixedPartitioningTestBase.class, - "putOrderPartitionedRegion", new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, - "putShipmentPartitionedRegion", new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 20, 10, - "Customer", "Order", "Shipment" }); - - member3.invoke(FixedPartitioningTestBase.class, "closeCache"); + false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member3.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.putCustomerPartitionedRegion( "Customer" )); + member1.invoke(() -> FixedPartitioningTestBase.putOrderPartitionedRegion( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.putShipmentPartitionedRegion( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 20, 10, + "Customer", "Order", "Shipment" )); + + member3.invoke(() -> FixedPartitioningTestBase.closeCache()); Wait.pause(4000); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocationAfterCacheClosed", new Object[] { - 15, 5, "Customer", "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocationAfterCacheClosed", new Object[] { - 15, 5, "Customer", "Order", "Shipment" }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocationAfterCacheClosed( + 15, 5, "Customer", "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocationAfterCacheClosed( + 15, 5, "Customer", "Order", "Shipment" )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5); @@ -506,30 +424,25 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); + false )); Wait.pause(4000); - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5); @@ -537,37 +450,29 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); + false )); Wait.pause(4000); - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); } catch (Exception e) { @@ -577,9 +482,9 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() { public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition("10", true, 5); @@ -591,10 +496,9 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5); @@ -603,10 +507,9 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("40", true, 5); @@ -618,82 +521,60 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa2); fpaList.add(fpa3); fpaList.add(fpa4); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); + false )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member3.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putCustomerPartitionedRegion", new Object[] { "Customer" }); - member1.invoke(FixedPartitioningTestBase.class, - "putOrderPartitionedRegion", new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, - "putShipmentPartitionedRegion", new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 20, 10, - "Customer", "Order", "Shipment" }); - - member3.invoke(FixedPartitioningTestBase.class, "closeCache"); + false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member3.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.putCustomerPartitionedRegion( "Customer" )); + member1.invoke(() -> FixedPartitioningTestBase.putOrderPartitionedRegion( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.putShipmentPartitionedRegion( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 20, 10, + "Customer", "Order", "Shipment" )); + + member3.invoke(() -> FixedPartitioningTestBase.closeCache()); Wait.pause(4000); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocationAfterCacheClosed", new Object[] { - 15, 5, "Customer", "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocationAfterCacheClosed", new Object[] { - 15, 5, "Customer", "Order", "Shipment" }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocationAfterCacheClosed( + 15, 5, "Customer", "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocationAfterCacheClosed( + 15, 5, "Customer", "Order", "Shipment" )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5); @@ -701,30 +582,25 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); + false )); Wait.pause(4000); - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5); @@ -732,37 +608,29 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() { fpaList.add(fpa1); fpaList.add(fpa2); fpaList.add(fpa3); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 2, 50, 20, new CustomerFixedPartitionResolver(), null, - false }); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 2, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); + false )); Wait.pause(4000); - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 15, 5, "Customer", - "Order", "Shipment" }); + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 15, 5, "Customer", + "Order", "Shipment" )); } catch (Exception e) { @@ -775,79 +643,62 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() { * alive and other members goes down and come up */ public void testFPR_Persistence_OneMemberAlive() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); List fpaList = new ArrayList(); fpaList.add(fpa1); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true )); - member1.invoke(FixedPartitioningTestBase.class, "putForQuarter", - new Object[] { "Quarter", "Q1" }); - member1.invoke(FixedPartitioningTestBase.class, "putForQuarter", - new Object[] { "Quarter", "Q2" }); + member1.invoke(() -> FixedPartitioningTestBase.putForQuarter( "Quarter", "Q1" )); + member1.invoke(() -> FixedPartitioningTestBase.putForQuarter( "Quarter", "Q2" )); - member2.invoke(FixedPartitioningTestBase.class, "closeCache"); + member2.invoke(() -> FixedPartitioningTestBase.closeCache()); Wait.pause(1000); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true )); - member2.invoke(FixedPartitioningTestBase.class, "getForQuarter", - new Object[] { "Quarter", "Q2" }); + member2.invoke(() -> FixedPartitioningTestBase.getForQuarter( "Quarter", "Q2" )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true }); - - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); - - member1.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter1 }); - member2.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter2 }); - member3.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter3 }); - member4.invoke(FixedPartitioningTestBase.class, "checkPrimaryData", - new Object[] { Quarter4 }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 3, 3 }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 3, 3 }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 3, 3 }); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 3, 3 }); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true )); + + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter1 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter2 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryData( Quarter4 )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 3, 3 )); } @@ -857,7 +708,7 @@ public void testFPR_Persistence_OneMemberAlive() { * */ public void testFPR_Persistence() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -865,85 +716,65 @@ public void testFPR_Persistence() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member1.invoke(FixedPartitioningTestBase.class, "putForQuarter", - new Object[] { "Quarter", "Q1" }); - member1.invoke(FixedPartitioningTestBase.class, "putForQuarter", - new Object[] { "Quarter", "Q2" }); + member1.invoke(() -> FixedPartitioningTestBase.putForQuarter( "Quarter", "Q1" )); + member1.invoke(() -> FixedPartitioningTestBase.putForQuarter( "Quarter", "Q2" )); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryDataPersistence", new Object[] { Quarter1 }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryDataPersistence", new Object[] { Quarter2 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryDataPersistence( Quarter1 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryDataPersistence( Quarter2 )); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); - member1.invoke(FixedPartitioningTestBase.class, "closeCache"); - member2.invoke(FixedPartitioningTestBase.class, "closeCache"); + member1.invoke(() -> FixedPartitioningTestBase.closeCache()); + member2.invoke(() -> FixedPartitioningTestBase.closeCache()); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); Wait.pause(4000); - member2.invoke(FixedPartitioningTestBase.class, "getForQuarter", - new Object[] { "Quarter", Quarter1 }); - member2.invoke(FixedPartitioningTestBase.class, "getForQuarter", - new Object[] { "Quarter", Quarter2 }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryDataPersistence", new Object[] { Quarter2 }); + member2.invoke(() -> FixedPartitioningTestBase.getForQuarter( "Quarter", Quarter1 )); + member2.invoke(() -> FixedPartitioningTestBase.getForQuarter( "Quarter", Quarter2 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryDataPersistence( Quarter2 )); Wait.pause(2000); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 6 }); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 6 )); - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); Wait.pause(4000); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryDataPersistence", new Object[] { Quarter1 }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryDataPersistence", new Object[] { Quarter2 }); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryDataPersistence( Quarter1 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryDataPersistence( Quarter2 )); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); - member1.invoke(FixedPartitioningTestBase.class, "getForQuarter", - new Object[] { "Quarter", Quarter1 }); + member1.invoke(() -> FixedPartitioningTestBase.getForQuarter( "Quarter", Quarter1 )); - member2.invoke(FixedPartitioningTestBase.class, "getForQuarter", - new Object[] { "Quarter", Quarter2 }); + member2.invoke(() -> FixedPartitioningTestBase.getForQuarter( "Quarter", Quarter2 )); } /** @@ -952,8 +783,8 @@ public void testFPR_Persistence() { */ public void testColocation_FPR_Persistence_Colocation_OneMemberAlive() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition("10", true, 5); @@ -962,119 +793,87 @@ public void testColocation_FPR_Persistence_Colocation_OneMemberAlive() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 1, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 1, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); + false )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putCustomerPartitionedRegion_Persistence1", - new Object[] { "Customer" }); - member1.invoke(FixedPartitioningTestBase.class, - "putOrderPartitionedRegion_Persistence1", new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, - "putShipmentPartitionedRegion_Persistence1", - new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 10, 5, "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 10, 5, "Customer", - "Order", "Shipment" }); - - member2.invoke(FixedPartitioningTestBase.class, "closeCache"); - member1.invoke(FixedPartitioningTestBase.class, - "putCustomerPartitionedRegion_Persistence2", - new Object[] { "Customer" }); - member1.invoke(FixedPartitioningTestBase.class, - "putOrderPartitionedRegion_Persistence2", new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, - "putShipmentPartitionedRegion_Persistence2", - new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 10, 10, - "Customer", "Order", "Shipment" }); - - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.putCustomerPartitionedRegion_Persistence1( "Customer" )); + member1.invoke(() -> FixedPartitioningTestBase.putOrderPartitionedRegion_Persistence1( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.putShipmentPartitionedRegion_Persistence1( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 10, 5, "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 10, 5, "Customer", + "Order", "Shipment" )); + + member2.invoke(() -> FixedPartitioningTestBase.closeCache()); + member1.invoke(() -> FixedPartitioningTestBase.putCustomerPartitionedRegion_Persistence2( "Customer" )); + member1.invoke(() -> FixedPartitioningTestBase.putOrderPartitionedRegion_Persistence2( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.putShipmentPartitionedRegion_Persistence2( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 10, 10, + "Customer", "Order", "Shipment" )); + + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); AsyncInvocation[] async = new AsyncInvocation[2]; - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 1, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + true )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); + false )); Wait.pause(4000); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 10, 5, "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 10, 5, "Customer", - "Order", "Shipment" }); - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 10, 5, "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 10, 5, "Customer", + "Order", "Shipment" )); + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); } catch (Exception e) { @@ -1090,8 +889,8 @@ public void testColocation_FPR_Persistence_Colocation_OneMemberAlive() { public void testColocation_FPR_Persistence_Colocation() { try { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition("10", true, 5); @@ -1100,85 +899,65 @@ public void testColocation_FPR_Persistence_Colocation() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 1, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 1, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Order", null, + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Customer", - false }); + false )); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Shipment", + false )); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Shipment", null, 1, 50, 20, new CustomerFixedPartitionResolver(), "Order", - false }); - - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Order" }); - member2.invoke(FixedPartitioningTestBase.class, "checkFPR", - new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "putCustomerPartitionedRegion_Persistence", - new Object[] { "Customer" }); - member1.invoke(FixedPartitioningTestBase.class, - "putOrderPartitionedRegion_Persistence", new Object[] { "Order" }); - member1.invoke(FixedPartitioningTestBase.class, - "putShipmentPartitionedRegion_Persistence", - new Object[] { "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "validateAfterPutPartitionedRegion", new Object[] { "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 10, 5, "Customer", - "Order", "Shipment" }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForColocation", new Object[] { 10, 5, "Customer", - "Order", "Shipment" }); - - member1.invoke(FixedPartitioningTestBase.class, "closeCache"); - member2.invoke(FixedPartitioningTestBase.class, "closeCache"); - - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Order" )); + member2.invoke(() -> FixedPartitioningTestBase.checkFPR( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.putCustomerPartitionedRegion_Persistence( "Customer" )); + member1.invoke(() -> FixedPartitioningTestBase.putOrderPartitionedRegion_Persistence( "Order" )); + member1.invoke(() -> FixedPartitioningTestBase.putShipmentPartitionedRegion_Persistence( "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.validateAfterPutPartitionedRegion( "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 10, 5, "Customer", + "Order", "Shipment" )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForColocation( 10, 5, "Customer", + "Order", "Shipment" )); + + member1.invoke(() -> FixedPartitioningTestBase.closeCache()); + member2.invoke(() -> FixedPartitioningTestBase.closeCache()); + + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5); fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Customer", + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer", fpaList, 1, 50, 20, new CustomerFixedPartitionResolver(), null, - true }); + true )); Wait.pause(4000); - member2.invoke(FixedPartitioningTestBase.class, "getForColocation", - new Object[] { "Customer", "Order", "Shipment" }); + member2.invoke(() -> FixedPartitioningTestBase.getForColocation( "Customer", "Order", "Shipment" )); } catch (Exception e) { @@ -1187,7 +966,7 @@ public void testColocation_FPR_Persistence_Colocation() { } public void testFPR_Persistence2() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -1195,76 +974,61 @@ public void testFPR_Persistence2() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true )); - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter1, false }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter3, false }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter1, false )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, false )); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 6 }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 6 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 6 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 6 )); - member1.invoke(FixedPartitioningTestBase.class, "closeCache"); - member2.invoke(FixedPartitioningTestBase.class, "closeCache"); + member1.invoke(() -> FixedPartitioningTestBase.closeCache()); + member2.invoke(() -> FixedPartitioningTestBase.closeCache()); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invokeAsync(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true )); - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invokeAsync(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true }); + member1.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true )); Wait.pause(4000); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter3, false }); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, false )); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 6 }); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 6 )); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter1, false }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter3, false }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter1, false )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, false )); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 6 }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 6 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 6 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 6 )); } public void testFPR_Persistence3() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); FixedPartitionAttributes fpa1 = FixedPartitionAttributes .createFixedPartition(Quarter1, true, 3); FixedPartitionAttributes fpa2 = FixedPartitionAttributes @@ -1272,130 +1036,105 @@ public void testFPR_Persistence3() { List fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member3.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member4.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); - - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter1, false }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter2, false }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter3, false }); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter4, false }); - - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); - - member1.invoke(FixedPartitioningTestBase.class, "closeCache"); - member2.invoke(FixedPartitioningTestBase.class, "closeCache"); - member3.invoke(FixedPartitioningTestBase.class, "closeCache"); - member4.invoke(FixedPartitioningTestBase.class, "closeCache"); - - member4.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); + + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter1, false )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter2, false )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, false )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter4, false )); + + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); + + member1.invoke(() -> FixedPartitioningTestBase.closeCache()); + member2.invoke(() -> FixedPartitioningTestBase.closeCache()); + member3.invoke(() -> FixedPartitioningTestBase.closeCache()); + member4.invoke(() -> FixedPartitioningTestBase.closeCache()); + + member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member4.invokeAsync(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member4.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member3.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member3.invokeAsync(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member3.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member2.invokeAsync(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3); fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3); fpaList = new ArrayList(); fpaList.add(fpa1); fpaList.add(fpa2); - member1.invokeAsync(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", - fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member1.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", + fpaList, 1, 40, 12, new QuarterPartitionResolver(), null, true )); Wait.pause(4000); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter4, false }); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter4, false )); - member4.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); + member4.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter3, false }); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter3, false )); - member3.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); + member3.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter2, false }); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter2, false )); - member2.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); + member2.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimarySecondaryData", new Object[] { Quarter1, false }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimarySecondaryData( Quarter1, false )); - member1.invoke(FixedPartitioningTestBase.class, - "checkPrimaryBucketsForQuarter", new Object[] { 6, 3 }); + member1.invoke(() -> FixedPartitioningTestBase.checkPrimaryBucketsForQuarter( 6, 3 )); } @@ -1406,31 +1145,26 @@ public void testFPR_Persistence3() { * verified. */ public void testPR_Persistence() { - member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member1.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", null, - 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, + 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", null, - 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, + 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member1.invoke(FixedPartitioningTestBase.class, "putThroughDataStore", - new Object[] { "Quarter" }); + member1.invoke(() -> FixedPartitioningTestBase.putThroughDataStore( "Quarter" )); - member1.invoke(FixedPartitioningTestBase.class, "closeCache"); - member2.invoke(FixedPartitioningTestBase.class, "closeCache"); + member1.invoke(() -> FixedPartitioningTestBase.closeCache()); + member2.invoke(() -> FixedPartitioningTestBase.closeCache()); Wait.pause(1000); - member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember"); - member2.invoke(FixedPartitioningTestBase.class, - "createRegionWithPartitionAttributes", new Object[] { "Quarter", null, - 1, 40, 12, new QuarterPartitionResolver(), null, true }); + member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember()); + member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", null, + 1, 40, 12, new QuarterPartitionResolver(), null, true )); - member2.invoke(FixedPartitioningTestBase.class, "getThroughDataStore", - new Object[] { "Quarter" }); + member2.invoke(() -> FixedPartitioningTestBase.getThroughDataStore( "Quarter" )); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java index c28f9e72c1a8..b69c973fbcfc 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java @@ -163,10 +163,9 @@ else if (type.equals(ARRAY_INDEX_OUT_BOUND_EX)) { */ public void testForFaultyDeltaImplementationForEOFEX() { boolean matched = false; - ((Integer)server.invoke(Bug40396DUnitTest.class, "createServerCache")).intValue(); - ((Integer)server2.invoke(Bug40396DUnitTest.class, "createServerCache")).intValue(); - Exception xp = (Exception)server.invoke(Bug40396DUnitTest.class, - "putDelta", new Object[] { REGION_NAME, END_OF_FILE_EX }); + ((Integer)server.invoke(() -> Bug40396DUnitTest.createServerCache())).intValue(); + ((Integer)server2.invoke(() -> Bug40396DUnitTest.createServerCache())).intValue(); + Exception xp = (Exception)server.invoke(() -> Bug40396DUnitTest.putDelta( REGION_NAME, END_OF_FILE_EX )); StackTraceElement[] st = xp.getCause().getStackTrace(); matched = getMatched(st); @@ -191,10 +190,10 @@ private boolean getMatched(StackTraceElement[] ste){ */ public void testForFaultyDeltaImplementationForAIOBEX() { boolean matched = false; - ((Integer)server.invoke(Bug40396DUnitTest.class, "createServerCache")).intValue(); - ((Integer)server2.invoke(Bug40396DUnitTest.class, "createServerCache")).intValue(); - Exception xp = (Exception) server.invoke(Bug40396DUnitTest.class, "putDelta", new Object[] { - REGION_NAME, ARRAY_INDEX_OUT_BOUND_EX }); + ((Integer)server.invoke(() -> Bug40396DUnitTest.createServerCache())).intValue(); + ((Integer)server2.invoke(() -> Bug40396DUnitTest.createServerCache())).intValue(); + Exception xp = (Exception) server.invoke(() -> Bug40396DUnitTest.putDelta( + REGION_NAME, ARRAY_INDEX_OUT_BOUND_EX )); StackTraceElement[] st = xp.getStackTrace(); matched = getMatched(st); @@ -205,9 +204,9 @@ public void testForFaultyDeltaImplementationForAIOBEX() { @Override protected final void preTearDown() throws Exception { // then close the servers - server.invoke(Bug40396DUnitTest.class, "removeExceptions"); - server.invoke(Bug40396DUnitTest.class, "closeCache"); - server2.invoke(Bug40396DUnitTest.class, "closeCache"); + server.invoke(() -> Bug40396DUnitTest.removeExceptions()); + server.invoke(() -> Bug40396DUnitTest.closeCache()); + server2.invoke(() -> Bug40396DUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java index 3d53df93e18e..ae91f21752f6 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java @@ -136,17 +136,13 @@ public static Integer createServerCache() throws Exception { @Override protected final void postTearDown() throws Exception { - client1.invoke(BackwardCompatibilityHigherVersionClientDUnitTest.class, - "unsetHandshakeVersionForTesting"); - client1.invoke(BackwardCompatibilityHigherVersionClientDUnitTest.class, - "unsetConnectionToServerFailed"); + client1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.unsetHandshakeVersionForTesting()); + client1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.unsetConnectionToServerFailed()); // close the clients first - client1.invoke(BackwardCompatibilityHigherVersionClientDUnitTest.class, - "closeCache"); + client1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.closeCache()); // then close the servers - server1.invoke(BackwardCompatibilityHigherVersionClientDUnitTest.class, - "closeCache"); + server1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.closeCache()); } public static void closeCache() { @@ -161,17 +157,12 @@ public static void closeCache() { * Verify that server responds to a higher versioned client. */ public void testHigherVersionedClient() { - Integer port1 = ((Integer)server1.invoke( - BackwardCompatibilityHigherVersionClientDUnitTest.class, - "createServerCache")); - - client1.invoke(BackwardCompatibilityHigherVersionClientDUnitTest.class, - "setHandshakeVersionForTesting"); - client1.invoke(BackwardCompatibilityHigherVersionClientDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client1.invoke(BackwardCompatibilityHigherVersionClientDUnitTest.class, - "verifyConnectionToServerFailed"); + Integer port1 = ((Integer)server1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.createServerCache())); + + client1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.setHandshakeVersionForTesting()); + client1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.verifyConnectionToServerFailed()); } /* diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java index c8ac91ed06d8..12cd163b590d 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java @@ -82,10 +82,8 @@ public void setUp() throws Exception { // Server2 VM server2 = host.getVM(1); - PORT1 = ((Integer)server1.invoke(Bug36269DUnitTest.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)server2.invoke(Bug36269DUnitTest.class, - "createServerCache")).intValue(); + PORT1 = ((Integer)server1.invoke(() -> Bug36269DUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)server2.invoke(() -> Bug36269DUnitTest.createServerCache())).intValue(); } @@ -109,8 +107,8 @@ public void testRegionDestroyNotReceivedBySender() throws Exception try { createClientCache(); acquireConnectionsAndDestroyRegion(NetworkUtils.getServerHostName(Host.getHost(0))); - server1.invoke(Bug36269DUnitTest.class, "verifyRegionDestroy"); - server2.invoke(Bug36269DUnitTest.class, "verifyRegionDestroy"); + server1.invoke(() -> Bug36269DUnitTest.verifyRegionDestroy()); + server2.invoke(() -> Bug36269DUnitTest.verifyRegionDestroy()); Wait.pause(5000); verifyNoRegionDestroyOnOriginator(); } @@ -222,7 +220,7 @@ public static void closeCache() protected final void preTearDown() throws Exception { closeCache(); // close server - server1.invoke(Bug36269DUnitTest.class, "closeCache"); - server2.invoke(Bug36269DUnitTest.class, "closeCache"); + server1.invoke(() -> Bug36269DUnitTest.closeCache()); + server2.invoke(() -> Bug36269DUnitTest.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java index cff2266613ec..81693d963cb2 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java @@ -142,11 +142,11 @@ public static Integer createServerCache() throws Exception @Override protected final void preTearDown() throws Exception { // close the clients first - client1.invoke(Bug36457DUnitTest.class, "closeCache"); - client2.invoke(Bug36457DUnitTest.class, "closeCache"); + client1.invoke(() -> Bug36457DUnitTest.closeCache()); + client2.invoke(() -> Bug36457DUnitTest.closeCache()); // then close the servers - server1.invoke(Bug36457DUnitTest.class, "closeCache"); - server2.invoke(Bug36457DUnitTest.class, "closeCache"); + server1.invoke(() -> Bug36457DUnitTest.closeCache()); + server2.invoke(() -> Bug36457DUnitTest.closeCache()); } public static void closeCache() @@ -159,20 +159,17 @@ public static void closeCache() public void testBug36457() { - Integer port1 = ((Integer)server1.invoke(Bug36457DUnitTest.class, - "createServerCache")); - Integer port2 = ((Integer)server2.invoke(Bug36457DUnitTest.class, - "createServerCache")); - client1.invoke(Bug36457DUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); - client2.invoke(Bug36457DUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); + Integer port1 = ((Integer)server1.invoke(() -> Bug36457DUnitTest.createServerCache())); + Integer port2 = ((Integer)server2.invoke(() -> Bug36457DUnitTest.createServerCache())); + client1.invoke(() -> Bug36457DUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); + client2.invoke(() -> Bug36457DUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); //set a cllabck so that we come to know that whether a failover is called or not // if failover is called means this bug is present. - client2.invoke(Bug36457DUnitTest.class, "setClientServerObserver"); - client1.invoke(Bug36457DUnitTest.class, "destroyRegion"); - isFaileoverHappened = ((Boolean)client2.invoke(Bug36457DUnitTest.class, - "isFaileoverHappened")).booleanValue(); + client2.invoke(() -> Bug36457DUnitTest.setClientServerObserver()); + client1.invoke(() -> Bug36457DUnitTest.destroyRegion()); + isFaileoverHappened = ((Boolean)client2.invoke(() -> Bug36457DUnitTest.isFaileoverHappened())).booleanValue(); if (isFaileoverHappened) { //if failover is called means this bug is present, else fixed fail("Test failed because of unregistration failed due to region is destroyed on server"); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java index d9f1a2e23ab2..0aafb77761f7 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java @@ -136,11 +136,11 @@ public static Integer createServerCache() throws Exception @Override protected final void preTearDown() throws Exception { // close the clients first - client1.invoke(Bug36805DUnitTest.class, "closeCache"); - client2.invoke(Bug36805DUnitTest.class, "closeCache"); + client1.invoke(() -> Bug36805DUnitTest.closeCache()); + client2.invoke(() -> Bug36805DUnitTest.closeCache()); // then close the servers - server1.invoke(Bug36805DUnitTest.class, "closeCache"); - server2.invoke(Bug36805DUnitTest.class, "closeCache"); + server1.invoke(() -> Bug36805DUnitTest.closeCache()); + server2.invoke(() -> Bug36805DUnitTest.closeCache()); } public static void closeCache() @@ -153,28 +153,24 @@ public static void closeCache() public void testBug36805() { - Integer port1 = ((Integer)server1.invoke(Bug36805DUnitTest.class, - "createServerCache")); - Integer port2 = ((Integer)server2.invoke(Bug36805DUnitTest.class, - "createServerCache")); - client1.invoke(Bug36805DUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); - client2.invoke(Bug36805DUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); + Integer port1 = ((Integer)server1.invoke(() -> Bug36805DUnitTest.createServerCache())); + Integer port2 = ((Integer)server2.invoke(() -> Bug36805DUnitTest.createServerCache())); + client1.invoke(() -> Bug36805DUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); + client2.invoke(() -> Bug36805DUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); // set a cllabck so that we come to know that whether a failover is called // or not // if failover is called means this bug is present. - // client2.invoke(Bug36805DUnitTest.class, "setClientServerObserver"); - client1.invoke(Bug36805DUnitTest.class, "registerInterest"); // register + // client2.invoke(() -> Bug36805DUnitTest.setClientServerObserver()); + client1.invoke(() -> Bug36805DUnitTest.registerInterest()); // register // interest // shoud not // cause any // failure - client2.invoke(Bug36805DUnitTest.class, "verifyDeadAndLiveServers", - new Object[] { new Integer(0), new Integer(2) }); - client1.invoke(Bug36805DUnitTest.class, "verifyDeadAndLiveServers", - new Object[] { new Integer(0), new Integer(2) }); + client2.invoke(() -> Bug36805DUnitTest.verifyDeadAndLiveServers( new Integer(0), new Integer(2) )); + client1.invoke(() -> Bug36805DUnitTest.verifyDeadAndLiveServers( new Integer(0), new Integer(2) )); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java index ceac13bb7bbc..def774a83923 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java @@ -62,16 +62,14 @@ public void testBug36829() { final int durableClientTimeout = 600; // keep the client alive for 600 - PORT = ((Integer)this.serverVM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { "DUMMY_REGION", new Boolean(true) - })).intValue(); + PORT = ((Integer)this.serverVM.invoke(() -> CacheServerTestUtil.createCacheServer( "DUMMY_REGION", new Boolean(true) + ))).intValue(); - this.ClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.ClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(ClientVM.getHost()), PORT, true, 0), regionName, getClientDistributedSystemProperties(durableClientId, - durableClientTimeout), Boolean.TRUE }); + durableClientTimeout), Boolean.TRUE )); // Send clientReady message this.ClientVM.invoke(new CacheSerializableRunnable("Send clientReady") { @@ -82,23 +80,20 @@ public void run2() throws CacheException { // We expect in registerKey() that the RegionNotFoundException is thrown. // If exception is not thrown then the test fails. - this.ClientVM.invoke(Bug36829DUnitTest.class, "registerKey", - new Object[] { "Key1" }); + this.ClientVM.invoke(() -> Bug36829DUnitTest.registerKey( "Key1" )); // creating REgion on the Server -/* this.serverVM.invoke(CacheServerTestUtil.class, "createRegion", - new Object[] { regionName }); +/* this.serverVM.invoke(() -> CacheServerTestUtil.createRegion( regionName )); // should be successful. - this.ClientVM.invoke(Bug36829DUnitTest.class, "registerKeyAfterRegionCreation", - new Object[] { "Key1" });*/ + this.ClientVM.invoke(() -> Bug36829DUnitTest.registerKeyAfterRegionCreation( "Key1" ));*/ // Stop the durable client - this.ClientVM.invoke(CacheServerTestUtil.class, "closeCache"); + this.ClientVM.invoke(() -> CacheServerTestUtil.closeCache()); // Stop server 1 - this.serverVM.invoke(CacheServerTestUtil.class, "closeCache"); + this.serverVM.invoke(() -> CacheServerTestUtil.closeCache()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java index 872f95c18b68..30fb4c6d65e3 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java @@ -142,9 +142,9 @@ public static Integer createServerCache() throws Exception @Override protected final void preTearDown() throws Exception { closeCache(); - server1.invoke(Bug36995DUnitTest.class, "closeCache"); - server2.invoke(Bug36995DUnitTest.class, "closeCache"); - server3.invoke(Bug36995DUnitTest.class, "closeCache"); + server1.invoke(() -> Bug36995DUnitTest.closeCache()); + server2.invoke(() -> Bug36995DUnitTest.closeCache()); + server3.invoke(() -> Bug36995DUnitTest.closeCache()); } public static void closeCache() @@ -160,12 +160,9 @@ public static void closeCache() */ public void testBug36995_Default() { - Integer port1 = ((Integer)server1.invoke(Bug36995DUnitTest.class, - "createServerCache")); - Integer port2 = ((Integer)server2.invoke(Bug36995DUnitTest.class, - "createServerCache")); - Integer port3 = ((Integer)server3.invoke(Bug36995DUnitTest.class, - "createServerCache")); + Integer port1 = ((Integer)server1.invoke(() -> Bug36995DUnitTest.createServerCache())); + Integer port2 = ((Integer)server2.invoke(() -> Bug36995DUnitTest.createServerCache())); + Integer port3 = ((Integer)server3.invoke(() -> Bug36995DUnitTest.createServerCache())); createClientCacheWithDefaultMessageTrackingTimeout( NetworkUtils.getServerHostName(server1.getHost()), port1.intValue(), port2 .intValue(), port3.intValue()); @@ -180,12 +177,9 @@ public void testBug36995_UserSpecified() { //work around GEODE-507 IgnoredException.addIgnoredException("Connection reset"); - Integer port1 = ((Integer)server1.invoke(Bug36995DUnitTest.class, - "createServerCache")); - Integer port2 = ((Integer)server2.invoke(Bug36995DUnitTest.class, - "createServerCache")); - Integer port3 = ((Integer)server3.invoke(Bug36995DUnitTest.class, - "createServerCache")); + Integer port1 = ((Integer)server1.invoke(() -> Bug36995DUnitTest.createServerCache())); + Integer port2 = ((Integer)server2.invoke(() -> Bug36995DUnitTest.createServerCache())); + Integer port3 = ((Integer)server3.invoke(() -> Bug36995DUnitTest.createServerCache())); createClientCache(NetworkUtils.getServerHostName(server1.getHost()), port1.intValue(), port2.intValue(), port3.intValue()); assertEquals(54321, pool.getSubscriptionMessageTrackingTimeout()); @@ -196,16 +190,13 @@ public void testBug36995_UserSpecified() */ public void testBug36526() { - Integer port1 = ((Integer)server1.invoke(Bug36995DUnitTest.class, - "createServerCache")); - Integer port2 = ((Integer)server2.invoke(Bug36995DUnitTest.class, - "createServerCache")); - Integer port3 = ((Integer)server3.invoke(Bug36995DUnitTest.class, - "createServerCache")); + Integer port1 = ((Integer)server1.invoke(() -> Bug36995DUnitTest.createServerCache())); + Integer port2 = ((Integer)server2.invoke(() -> Bug36995DUnitTest.createServerCache())); + Integer port3 = ((Integer)server3.invoke(() -> Bug36995DUnitTest.createServerCache())); createClientCache(NetworkUtils.getServerHostName(server1.getHost()), port1.intValue(), port2.intValue(), port3.intValue()); verifyDeadAndLiveServers(0, 3); - server2.invoke(Bug36995DUnitTest.class, "stopServer"); + server2.invoke(() -> Bug36995DUnitTest.stopServer()); verifyDeadAndLiveServers(1, 2); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java index 050a8fcb3721..994da5878845 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java @@ -92,7 +92,7 @@ public void setUp() throws Exception server = host.getVM(0); client = host.getVM(2); PORT = ((Integer)server - .invoke(Bug37210DUnitTest.class, "createServerCache")).intValue(); + .invoke(() -> Bug37210DUnitTest.createServerCache())).intValue(); } /** @@ -126,10 +126,10 @@ private Cache createCache(Properties props) throws Exception @Override protected final void preTearDown() throws Exception { // close client - client.invoke(Bug37210DUnitTest.class, "closeCache"); + client.invoke(() -> Bug37210DUnitTest.closeCache()); // close server - server.invoke(Bug37210DUnitTest.class, "closeCache"); + server.invoke(() -> Bug37210DUnitTest.closeCache()); } /** @@ -149,17 +149,14 @@ public void testHAStatsCleanup() throws Exception LogWriterUtils.getLogWriter().info("testHAStatsCleanup : BEGIN"); IgnoredException.addIgnoredException("java.net.SocketException"); IgnoredException.addIgnoredException("Unexpected IOException"); - client.invoke(Bug37210DUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) }); - server.invoke(Bug37210DUnitTest.class, "doEntryOperations"); + client.invoke(() -> Bug37210DUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) )); + server.invoke(() -> Bug37210DUnitTest.doEntryOperations()); - server.invoke(Bug37210DUnitTest.class, - "closeCacheClientProxyAndVerifyStats"); - client.invoke(Bug37210DUnitTest.class, "closeCache"); + server.invoke(() -> Bug37210DUnitTest.closeCacheClientProxyAndVerifyStats()); + client.invoke(() -> Bug37210DUnitTest.closeCache()); //we don't send close response thus needs to wait for client termination Thread.currentThread().sleep(1000); - server.invoke(Bug37210DUnitTest.class, - "closeCacheClientProxyAndVerifyStats2"); + server.invoke(() -> Bug37210DUnitTest.closeCacheClientProxyAndVerifyStats2()); LogWriterUtils.getLogWriter().info("testHAStatsCleanup : END"); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java index f7adf6a0ad46..4c1c8965de87 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java @@ -68,28 +68,26 @@ public void setUp() throws Exception { @Override protected final void preTearDown() throws Exception { // Stop server 1 - this.server1VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server1VM.invoke(() -> CacheServerTestUtil.closeCache()); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } public void testFunctionality() { // Step 1: Starting the servers - PORT1 = ((Integer)this.server1VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true), - })).intValue(); + PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true), + ))).intValue(); final int durableClientTimeout = 600; // Step 2: Starting Client and creating durableRegion final String durableClientId = getName() + "_client"; - this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0), regionName, getDurableClientDistributedSystemProperties(durableClientId, - durableClientTimeout), Boolean.TRUE }); + durableClientTimeout), Boolean.TRUE )); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -99,10 +97,10 @@ public void run2() throws CacheException { } }); - this.server1VM.invoke(Bug37805DUnitTest.class, "checkRootRegions"); + this.server1VM.invoke(() -> Bug37805DUnitTest.checkRootRegions()); - this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache"); + this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache()); } public static void checkRootRegions() { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java index 236076a0e5b8..bdc96a791ce9 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java @@ -115,30 +115,26 @@ public void setUp() throws Exception public void testOneServerToClientTransactionsPropagation() { Integer port1 = initServerCache(server1); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); Wait.pause(PAUSE); server1.invoke(resetFlags()); client1.invoke(resetFlags()); client2.invoke(resetFlags()); - server1.invoke(CacheServerTransactionsDUnitTest.class, "putInTransaction", - new Object[] { "server1" }); + server1.invoke(() -> CacheServerTransactionsDUnitTest.putInTransaction( "server1" )); Wait.pause(PAUSE); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated"); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyNotUpdated()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyNotUpdated()); - server1.invoke(CacheServerTransactionsDUnitTest.class, - "commitTransactionOnServer1"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnServer1()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); } @@ -152,10 +148,8 @@ public void testServerToClientTransactionsPropagation() { Integer port1 = initServerCache(server1); Integer port2 = initServerCache(server2); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); Wait.pause(PAUSE); server1.invoke(resetFlags()); @@ -163,22 +157,20 @@ public void testServerToClientTransactionsPropagation() client1.invoke(resetFlags()); client2.invoke(resetFlags()); - server1.invoke(CacheServerTransactionsDUnitTest.class, "putInTransaction", - new Object[] { "server1" }); + server1.invoke(() -> CacheServerTransactionsDUnitTest.putInTransaction( "server1" )); Wait.pause(PAUSE); - server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated"); + server2.invoke(() -> CacheServerTransactionsDUnitTest.verifyNotUpdated()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyNotUpdated()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyNotUpdated()); - server1.invoke(CacheServerTransactionsDUnitTest.class, - "commitTransactionOnServer1"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnServer1()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); - server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); + server2.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); } /** @@ -190,10 +182,8 @@ public void testServerToClientTransactionsPropagationWithOneClientConnectedToOne { Integer port1 = initServerCache(server1); Integer port2 = initServerCache(server2); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 }); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port2 )); Wait.pause(PAUSE); server1.invoke(resetFlags()); @@ -201,22 +191,20 @@ public void testServerToClientTransactionsPropagationWithOneClientConnectedToOne client1.invoke(resetFlags()); client2.invoke(resetFlags()); - server1.invoke(CacheServerTransactionsDUnitTest.class, "putInTransaction", - new Object[] { "server1" }); + server1.invoke(() -> CacheServerTransactionsDUnitTest.putInTransaction( "server1" )); Wait.pause(PAUSE); - server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated"); + server2.invoke(() -> CacheServerTransactionsDUnitTest.verifyNotUpdated()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyNotUpdated()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyNotUpdated()); - server1.invoke(CacheServerTransactionsDUnitTest.class, - "commitTransactionOnServer1"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnServer1()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); - server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); + server2.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdates()); } /** @@ -226,25 +214,21 @@ public void testServerToClientTransactionsPropagationWithOneClientConnectedToOne public void testInvalidatesOneServerToClientTransactionsPropagation() { Integer port1 = initServerCache(server1); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); Wait.pause(PAUSE); server1.invoke(resetFlags()); client1.invoke(resetFlags()); client2.invoke(resetFlags()); - server1.invoke(CacheServerTransactionsDUnitTest.class, "invalidateInTransaction", - new Object[] { "server1" }); - server1.invoke(CacheServerTransactionsDUnitTest.class, - "commitTransactionOnServer1"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.invalidateInTransaction( "server1" )); + server1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnServer1()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); } /** @@ -255,10 +239,8 @@ public void testInvalidatesServerToClientTransactionsPropagation() { Integer port1 = initServerCache(server1); Integer port2 = initServerCache(server2); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); Wait.pause(PAUSE); server1.invoke(resetFlags()); @@ -266,16 +248,14 @@ public void testInvalidatesServerToClientTransactionsPropagation() client1.invoke(resetFlags()); client2.invoke(resetFlags()); - server1.invoke(CacheServerTransactionsDUnitTest.class, "invalidateInTransaction", - new Object[] { "server1" }); - server1.invoke(CacheServerTransactionsDUnitTest.class, - "commitTransactionOnServer1"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.invalidateInTransaction( "server1" )); + server1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnServer1()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); - server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); + server2.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); } /** @@ -287,10 +267,8 @@ public void testInvalidatesServerToClientTransactionsPropagationWithOneConnectio { Integer port1 = initServerCache(server1); Integer port2 = initServerCache(server2); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 }); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port2 )); Wait.pause(PAUSE); server1.invoke(resetFlags()); @@ -298,16 +276,14 @@ public void testInvalidatesServerToClientTransactionsPropagationWithOneConnectio client1.invoke(resetFlags()); client2.invoke(resetFlags()); - server1.invoke(CacheServerTransactionsDUnitTest.class, "invalidateInTransaction", - new Object[] { "server1" }); - server1.invoke(CacheServerTransactionsDUnitTest.class, - "commitTransactionOnServer1"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.invalidateInTransaction( "server1" )); + server1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnServer1()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); - server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); + server2.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyInvalidates()); } @@ -319,25 +295,21 @@ public void testInvalidatesServerToClientTransactionsPropagationWithOneConnectio public void testDestroysOneServerToClientTransactionsPropagation() { Integer port1 = initServerCache(server1); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); Wait.pause(PAUSE); server1.invoke(resetFlags()); client1.invoke(resetFlags()); client2.invoke(resetFlags()); - server1.invoke(CacheServerTransactionsDUnitTest.class, "destroyInTransaction", - new Object[] { "server1" }); - server1.invoke(CacheServerTransactionsDUnitTest.class, - "commitTransactionOnServer1"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.destroyInTransaction( "server1" )); + server1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnServer1()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); } /** @@ -348,10 +320,8 @@ public void testDestroysServerToClientTransactionsPropagation() { Integer port1 = initServerCache(server1); Integer port2 = initServerCache(server2); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 }); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1, port2 )); Wait.pause(PAUSE); server1.invoke(resetFlags()); @@ -359,16 +329,14 @@ public void testDestroysServerToClientTransactionsPropagation() client1.invoke(resetFlags()); client2.invoke(resetFlags()); - server1.invoke(CacheServerTransactionsDUnitTest.class, "destroyInTransaction", - new Object[] { "server1" }); - server1.invoke(CacheServerTransactionsDUnitTest.class, - "commitTransactionOnServer1"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.destroyInTransaction( "server1" )); + server1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnServer1()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); - server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); + server2.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); } @@ -380,10 +348,8 @@ public void testDestroysServerToClientTransactionsPropagationWithOneConnection() { Integer port1 = initServerCache(server1); Integer port2 = initServerCache(server2); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 }); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port2 )); Wait.pause(PAUSE); server1.invoke(resetFlags()); @@ -391,16 +357,14 @@ public void testDestroysServerToClientTransactionsPropagationWithOneConnection() client1.invoke(resetFlags()); client2.invoke(resetFlags()); - server1.invoke(CacheServerTransactionsDUnitTest.class, "destroyInTransaction", - new Object[] { "server1" }); - server1.invoke(CacheServerTransactionsDUnitTest.class, - "commitTransactionOnServer1"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.destroyInTransaction( "server1" )); + server1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnServer1()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); - server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); - client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); + server2.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); + client1.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyDestroys()); } /** @@ -409,20 +373,16 @@ public void testDestroysServerToClientTransactionsPropagationWithOneConnection() * */ public void YOGESH_testClientToServerCommits(){ - Integer port1 = ((Integer)server1.invoke( - CacheServerTransactionsDUnitTest.class, "createServerCache")); - Integer port2 = ((Integer)server2.invoke( - CacheServerTransactionsDUnitTest.class, "createServerCache")); - client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 }); - client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 }); - client1.invoke(CacheServerTransactionsDUnitTest.class, "commitTransactionOnClient"); + Integer port1 = ((Integer)server1.invoke(() -> CacheServerTransactionsDUnitTest.createServerCache())); + Integer port2 = ((Integer)server2.invoke(() -> CacheServerTransactionsDUnitTest.createServerCache())); + client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 )); + client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port2 )); + client1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnClient()); Wait.pause(PAUSE); - server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdatesOnServer"); - server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdatesOnServer"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdatesOnServer"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdatesOnServer()); + server2.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdatesOnServer()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.verifyUpdatesOnServer()); } private CacheSerializableRunnable resetFlags() @@ -846,10 +806,10 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { // close the clients first - client1.invoke(CacheServerTransactionsDUnitTest.class, "closeCache"); - client2.invoke(CacheServerTransactionsDUnitTest.class, "closeCache"); + client1.invoke(() -> CacheServerTransactionsDUnitTest.closeCache()); + client2.invoke(() -> CacheServerTransactionsDUnitTest.closeCache()); // then close the servers - server1.invoke(CacheServerTransactionsDUnitTest.class, "closeCache"); - server2.invoke(CacheServerTransactionsDUnitTest.class, "closeCache"); + server1.invoke(() -> CacheServerTransactionsDUnitTest.closeCache()); + server2.invoke(() -> CacheServerTransactionsDUnitTest.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java index 15beecd925d8..e71bebb7c7ac 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java @@ -100,15 +100,11 @@ public void setUp() throws Exception { //client 2 VM client2 = host.getVM(3); - int PORT1 = ((Integer)server1.invoke(ClearPropagationDUnitTest.class, - "createServerCache")).intValue(); - int PORT2 = ((Integer)server2.invoke(ClearPropagationDUnitTest.class, - "createServerCache")).intValue(); + int PORT1 = ((Integer)server1.invoke(() -> ClearPropagationDUnitTest.createServerCache())).intValue(); + int PORT2 = ((Integer)server2.invoke(() -> ClearPropagationDUnitTest.createServerCache())).intValue(); - client1.invoke(ClearPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) }); - client2.invoke(ClearPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) }); + client1.invoke(() -> ClearPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) )); + client2.invoke(() -> ClearPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) )); CacheObserverHolder.setInstance(new CacheObserverAdapter()); @@ -151,26 +147,24 @@ public void run2() throws CacheException //First create entries on both servers via the two client - client1.invoke(ClearPropagationDUnitTest.class, "createEntriesK1andK2"); - client2.invoke(ClearPropagationDUnitTest.class, "createEntriesK1andK2"); - client1.invoke(ClearPropagationDUnitTest.class, "registerKeysK1andK2"); - client2.invoke(ClearPropagationDUnitTest.class, "registerKeysK1andK2"); + client1.invoke(() -> ClearPropagationDUnitTest.createEntriesK1andK2()); + client2.invoke(() -> ClearPropagationDUnitTest.createEntriesK1andK2()); + client1.invoke(() -> ClearPropagationDUnitTest.registerKeysK1andK2()); + client2.invoke(() -> ClearPropagationDUnitTest.registerKeysK1andK2()); server1.invoke(checkSizeRegion(2, false/*Do not Block*/)); server2.invoke(checkSizeRegion(2, false/*Do not Block*/)); client1.invoke(checkSizeRegion(2, false/*Do not Block*/)); client2.invoke(checkSizeRegion(2, false/*Do not Block*/)); - client1.invoke(ClearPropagationDUnitTest.class, - "acquireConnectionsAndClear", - new Object[] { NetworkUtils.getServerHostName(client1.getHost())}); + client1.invoke(() -> ClearPropagationDUnitTest.acquireConnectionsAndClear( NetworkUtils.getServerHostName(client1.getHost()))); client1.invoke(checkSizeRegion(2, false/*Do not Block*/)); client2.invoke(checkSizeRegion(0, true /* block*/)); server1.invoke(checkSizeRegion(0, false/*Do not Block*/)); server2.invoke(checkSizeRegion(0, false/*Do not Block*/)); - client1.invoke(ClearPropagationDUnitTest.class, "verifyNoUpdates"); + client1.invoke(() -> ClearPropagationDUnitTest.verifyNoUpdates()); } @@ -202,26 +196,24 @@ public void run2() throws CacheException client1.invoke(resetFlags); client2.invoke(resetFlags); - client1.invoke(ClearPropagationDUnitTest.class, "createEntriesK1andK2"); - client2.invoke(ClearPropagationDUnitTest.class, "createEntriesK1andK2"); - client1.invoke(ClearPropagationDUnitTest.class, "registerKeysK1andK2"); - client2.invoke(ClearPropagationDUnitTest.class, "registerKeysK1andK2"); + client1.invoke(() -> ClearPropagationDUnitTest.createEntriesK1andK2()); + client2.invoke(() -> ClearPropagationDUnitTest.createEntriesK1andK2()); + client1.invoke(() -> ClearPropagationDUnitTest.registerKeysK1andK2()); + client2.invoke(() -> ClearPropagationDUnitTest.registerKeysK1andK2()); server1.invoke(checkSizeRegion(2, false/*Do not Block*/)); server2.invoke(checkSizeRegion(2, false/*Do not Block*/)); client1.invoke(checkSizeRegion(2, false/*Do not Block*/)); client2.invoke(checkSizeRegion(2, false/*Do not Block*/)); - client1.invoke(ClearPropagationDUnitTest.class, - "acquireConnectionsAndDestroyRegion", - new Object[] { NetworkUtils.getServerHostName(client1.getHost())}); + client1.invoke(() -> ClearPropagationDUnitTest.acquireConnectionsAndDestroyRegion( NetworkUtils.getServerHostName(client1.getHost()))); client1.invoke(checkSizeRegion(2, false/*Do not Block*/)); client2.invoke(checkDestroyRegion(true /* block*/)); server1.invoke(checkDestroyRegion(false/*Do not Block*/)); server2.invoke(checkDestroyRegion(false/*Do not Block*/)); - client1.invoke(ClearPropagationDUnitTest.class, "verifyNoUpdates"); + client1.invoke(() -> ClearPropagationDUnitTest.verifyNoUpdates()); } @@ -479,10 +471,10 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { //close client - client1.invoke(ClearPropagationDUnitTest.class, "closeCache"); - client2.invoke(ClearPropagationDUnitTest.class, "closeCache"); + client1.invoke(() -> ClearPropagationDUnitTest.closeCache()); + client2.invoke(() -> ClearPropagationDUnitTest.closeCache()); //close server - server1.invoke(ClearPropagationDUnitTest.class, "closeCache"); - server2.invoke(ClearPropagationDUnitTest.class, "closeCache"); + server1.invoke(() -> ClearPropagationDUnitTest.closeCache()); + server2.invoke(() -> ClearPropagationDUnitTest.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java index 3a7c246748ee..21a920fa3441 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java @@ -81,8 +81,8 @@ public void setUp() throws Exception { vm0 = host.getVM(0); vm1 = host.getVM(1); setIsSlowStart(); - vm0.invoke(ClientConflationDUnitTest.class, "setIsSlowStart"); - PORT = ((Integer)vm0.invoke(ClientConflationDUnitTest.class, "createServerCache" )).intValue(); + vm0.invoke(() -> ClientConflationDUnitTest.setIsSlowStart()); + PORT = ((Integer)vm0.invoke(() -> ClientConflationDUnitTest.createServerCache())).intValue(); } private Cache createCache(Properties props) throws Exception @@ -134,19 +134,19 @@ public void testConflationOff() { private void performSteps(String conflation) throws Exception { createClientCacheFeeder(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)); - vm1.invoke(ClientConflationDUnitTest.class, "createClientCache", new Object[] { NetworkUtils.getServerHostName(vm1.getHost()), new Integer(PORT), - conflation}); - vm1.invoke(ClientConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery"); - vm1.invoke(ClientConflationDUnitTest.class, "setAllCountersZero"); - vm1.invoke(ClientConflationDUnitTest.class, "assertAllCountersZero"); - vm1.invoke(ClientConflationDUnitTest.class, "registerInterest"); + vm1.invoke(() -> ClientConflationDUnitTest.createClientCache( NetworkUtils.getServerHostName(vm1.getHost()), new Integer(PORT), + conflation)); + vm1.invoke(() -> ClientConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery()); + vm1.invoke(() -> ClientConflationDUnitTest.setAllCountersZero()); + vm1.invoke(() -> ClientConflationDUnitTest.assertAllCountersZero()); + vm1.invoke(() -> ClientConflationDUnitTest.registerInterest()); putEntries(); - vm0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); + vm0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); Thread.sleep(20000); - vm0.invoke(ClientConflationDUnitTest.class, "assertAllQueuesEmpty"); + vm0.invoke(() -> ClientConflationDUnitTest.assertAllQueuesEmpty()); - vm1.invoke(ClientConflationDUnitTest.class, "assertCounterSizes", new Object[] {conflation}); - vm1.invoke(ClientConflationDUnitTest.class, "assertValue"); + vm1.invoke(() -> ClientConflationDUnitTest.assertCounterSizes(conflation)); + vm1.invoke(() -> ClientConflationDUnitTest.assertValue()); } /** @@ -532,9 +532,9 @@ public static void putEntries() protected final void preTearDown() throws Exception { // close client closeCacheFeeder(); - vm1.invoke(ClientConflationDUnitTest.class, "closeCacheClient"); + vm1.invoke(() -> ClientConflationDUnitTest.closeCacheClient()); // close server - vm0.invoke(ClientConflationDUnitTest.class, "closeCacheServer"); + vm0.invoke(() -> ClientConflationDUnitTest.closeCacheServer()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java index 22f36cd847b6..3d0364ce3a38 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java @@ -185,81 +185,77 @@ private void performSteps() throws Exception { PORT = createServerCache(); // Create a feeder. - vm0.invoke(ClientInterestNotifyDUnitTest.class, "createClientCacheFeeder", - new Object[] {NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)}); + vm0.invoke(() -> ClientInterestNotifyDUnitTest.createClientCacheFeeder(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT))); // Client 1 overrides NBS to true. // Client 2 "overrides" NSB to false. // Client 3 uses the default NBS which is false on the server. - vm1.invoke(ClientInterestNotifyDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn"}); + vm1.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn")); /* - vm2.invoke(ClientInterestNotifyDUnitTest.class, "createClientCache", - new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT), - DistributionConfig.NOTIFY_BY_SUBSCRIPTION_OVERRIDE_PROP_VALUE_OFF, "ClientOff"}); - vm3.invoke(ClientInterestNotifyDUnitTest.class, "createClientCache", - new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT), - DistributionConfig.NOTIFY_BY_SUBSCRIPTION_OVERRIDE_PROP_VALUE_DEFAULT, "ClientDefault"}); + vm2.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( getServerHostName(Host.getHost(0)), new Integer(PORT), + DistributionConfig.NOTIFY_BY_SUBSCRIPTION_OVERRIDE_PROP_VALUE_OFF, "ClientOff")); + vm3.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( getServerHostName(Host.getHost(0)), new Integer(PORT), + DistributionConfig.NOTIFY_BY_SUBSCRIPTION_OVERRIDE_PROP_VALUE_DEFAULT, "ClientDefault")); */ // Feeder doFeed does one put on one key for each of the 3 regions so // that the following client RI with ALL_KEYS and KEYS_VALUE result works. - vm0.invoke(ClientInterestNotifyDUnitTest.class, "doFeed"); + vm0.invoke(() -> ClientInterestNotifyDUnitTest.doFeed()); // RI on ALL_KEYS with InterestResultPolicy KEYS_VALUES. - vm1.invoke(ClientInterestNotifyDUnitTest.class, "registerInterest"); + vm1.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest()); /* - vm2.invoke(ClientInterestNotifyDUnitTest.class, "registerInterest"); - vm3.invoke(ClientInterestNotifyDUnitTest.class, "registerInterest"); + vm2.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest()); + vm3.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest()); */ // Get key for region 3 for all clients to check no unwanted notifications // arrive on client 1 region 3 since we do not register interest on any // client but notifications should arrive for client 2 and client 3. - vm1.invoke(ClientInterestNotifyDUnitTest.class, "getEntries"); + vm1.invoke(() -> ClientInterestNotifyDUnitTest.getEntries()); /* - vm2.invoke(ClientInterestNotifyDUnitTest.class, "getEntries"); - vm3.invoke(ClientInterestNotifyDUnitTest.class, "getEntries"); + vm2.invoke(() -> ClientInterestNotifyDUnitTest.getEntries()); + vm3.invoke(() -> ClientInterestNotifyDUnitTest.getEntries()); */ // Feeder doEntryOps does 2 puts, 1 invalidate and 1 destroy on a // single key for each of the 3 regions. - vm0.invoke(ClientInterestNotifyDUnitTest.class, "doEntryOps"); + vm0.invoke(() -> ClientInterestNotifyDUnitTest.doEntryOps()); waitForQueuesToDrain(); // Unregister interest to check it works and no extra notifications received. - vm1.invoke(ClientInterestNotifyDUnitTest.class, "unregisterInterest"); + vm1.invoke(() -> ClientInterestNotifyDUnitTest.unregisterInterest()); /* - vm2.invoke(ClientInterestNotifyDUnitTest.class, "unregisterInterest"); - vm3.invoke(ClientInterestNotifyDUnitTest.class, "unregisterInterest"); + vm2.invoke(() -> ClientInterestNotifyDUnitTest.unregisterInterest()); + vm3.invoke(() -> ClientInterestNotifyDUnitTest.unregisterInterest()); */ // Feeder doEntryOps again does 2 puts, 1 invalidate and 1 destroy on a // single key for each of the 3 regions while no interest on the clients. - vm0.invoke(ClientInterestNotifyDUnitTest.class, "doEntryOps"); + vm0.invoke(() -> ClientInterestNotifyDUnitTest.doEntryOps()); assertAllQueuesEmpty(); // since no client has registered interest // Re-register interest on all clients except for region 3 again. - vm1.invoke(ClientInterestNotifyDUnitTest.class, "registerInterest"); + vm1.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest()); /* - vm2.invoke(ClientInterestNotifyDUnitTest.class, "registerInterest"); - vm3.invoke(ClientInterestNotifyDUnitTest.class, "registerInterest"); + vm2.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest()); + vm3.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest()); */ // Feeder doEntryOps again does 2 puts, 1 invalidate and 1 destroy on a // single key for each of the 3 regions after clients re-register interest. - vm0.invoke(ClientInterestNotifyDUnitTest.class, "doEntryOps"); + vm0.invoke(() -> ClientInterestNotifyDUnitTest.doEntryOps()); waitForQueuesToDrain(); @@ -295,27 +291,18 @@ private void performSteps() throws Exception { // Region 3 of clients 2 and 3 receive an invalidate and a destroy each // because NBS is set to false for those clients. - vm1.invoke(ClientInterestNotifyDUnitTest.class, "doValidation", - new Object[] {REGION_NAME1, 1, 3, 2, 2}); - vm1.invoke(ClientInterestNotifyDUnitTest.class, "doValidation", - new Object[] {REGION_NAME2, 0, 0, 1, 1}); - vm1.invoke(ClientInterestNotifyDUnitTest.class, "doValidation", - new Object[] {REGION_NAME3, 1, 0, 0, 0}); + vm1.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME1, 1, 3, 2, 2)); + vm1.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME2, 0, 0, 1, 1)); + vm1.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME3, 1, 0, 0, 0)); /* - vm2.invoke(ClientInterestNotifyDUnitTest.class, "doValidation", - new Object[] {REGION_NAME1, 0, 0, 1, 1}); - vm2.invoke(ClientInterestNotifyDUnitTest.class, "doValidation", - new Object[] {REGION_NAME2, 0, 0, 1, 1}); - vm2.invoke(ClientInterestNotifyDUnitTest.class, "doValidation", - new Object[] {REGION_NAME3, 1, 0, 1, 1}); - - vm3.invoke(ClientInterestNotifyDUnitTest.class, "doValidation", - new Object[] {REGION_NAME1, 0, 0, 1, 1}); - vm3.invoke(ClientInterestNotifyDUnitTest.class, "doValidation", - new Object[] {REGION_NAME2, 0, 0, 1, 1}); - vm3.invoke(ClientInterestNotifyDUnitTest.class, "doValidation", - new Object[] {REGION_NAME3, 1, 0, 1, 1}); + vm2.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME1, 0, 0, 1, 1)); + vm2.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME2, 0, 0, 1, 1)); + vm2.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME3, 1, 0, 1, 1)); + + vm3.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME1, 0, 0, 1, 1)); + vm3.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME2, 0, 0, 1, 1)); + vm3.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME3, 1, 0, 1, 1)); */ } @@ -639,11 +626,11 @@ public static void getEntries() */ @Override protected final void preTearDown() throws Exception { - vm0.invoke(ClientInterestNotifyDUnitTest.class, "closeCache"); - vm1.invoke(ClientInterestNotifyDUnitTest.class, "closeCache"); + vm0.invoke(() -> ClientInterestNotifyDUnitTest.closeCache()); + vm1.invoke(() -> ClientInterestNotifyDUnitTest.closeCache()); /* - vm2.invoke(ClientInterestNotifyDUnitTest.class, "closeCache"); - vm3.invoke(ClientInterestNotifyDUnitTest.class, "closeCache"); + vm2.invoke(() -> ClientInterestNotifyDUnitTest.closeCache()); + vm3.invoke(() -> ClientInterestNotifyDUnitTest.closeCache()); */ closeCacheServer(); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java index 0f4042884123..2170ce9cb77a 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java @@ -148,8 +148,8 @@ public void testConcurrentOperationsWithDRandPR() throws Exception { int port1 = initServerCache(true); // vm0 int port2 = initServerCache2(true); // vm1 String serverName = NetworkUtils.getServerHostName(Host.getHost(0)); - host.getVM(2).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port1}); - host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2}); + host.getVM(2).invoke(() -> this.createClientCacheV(serverName, port1)); + host.getVM(3).invoke(() -> this.createClientCacheV(serverName, port2)); LogWriterUtils.getLogWriter().info("Testing concurrent map operations from a client with a distributed region"); concurrentMapTest(host.getVM(2), "/" + REGION_NAME1); // TODO add verification in vm3 @@ -162,8 +162,8 @@ public void testConcurrentOperationsWithDRandPRandEmptyClient() throws Exception int port1 = initServerCache(true); // vm0 int port2 = initServerCache2(true); // vm1 String serverName = NetworkUtils.getServerHostName(Host.getHost(0)); - host.getVM(2).invoke(this.getClass(), "createEmptyClientCache", new Object[]{serverName, port1}); - host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2}); + host.getVM(2).invoke(() -> this.createEmptyClientCache(serverName, port1)); + host.getVM(3).invoke(() -> this.createClientCacheV(serverName, port2)); LogWriterUtils.getLogWriter().info("Testing concurrent map operations from a client with a distributed region"); concurrentMapTest(host.getVM(2), "/" + REGION_NAME1); // TODO add verification in vm3 @@ -382,7 +382,7 @@ public void testForTwoRegionHavingDifferentInterestList() createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1); populateCache(); registerInterest(); - server1.invoke(ClientServerMiscDUnitTest.class, "put"); + server1.invoke(() -> ClientServerMiscDUnitTest.put()); // pause(5000 + 5000 + 10000); /*final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue(); @@ -417,9 +417,8 @@ public void testForTwoRegionHavingALLKEYSInterest() registerInterestInBothTheRegions(); closeRegion1(); Wait.pause(6000); - server1.invoke(ClientServerMiscDUnitTest.class, - "verifyInterestListOnServer"); - server1.invoke(ClientServerMiscDUnitTest.class, "put"); + server1.invoke(() -> ClientServerMiscDUnitTest.verifyInterestListOnServer()); + server1.invoke(() -> ClientServerMiscDUnitTest.put()); //pause(5000); verifyUpdatesOnRegion2(); } @@ -443,8 +442,7 @@ public void testRegionClose() throws Exception assertEquals(false, pool.isDestroyed()); pool.destroy(); assertEquals(true, pool.isDestroyed()); - server1.invoke(ClientServerMiscDUnitTest.class, - "verifyNoCacheClientProxyOnServer"); + server1.invoke(() -> ClientServerMiscDUnitTest.verifyNoCacheClientProxyOnServer()); } @@ -465,9 +463,8 @@ public void testCCPDestroyOnLastDestroyRegion() throws Exception PoolImpl pool = (PoolImpl)createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)),PORT1); destroyRegion1(); // pause(5000); - server1.invoke(ClientServerMiscDUnitTest.class, - "verifyCacheClientProxyOnServer", new Object[] { new String( - REGION_NAME1) }); + server1.invoke(() -> ClientServerMiscDUnitTest.verifyCacheClientProxyOnServer( new String( + REGION_NAME1) )); Connection conn = pool.acquireConnection(); assertNotNull(conn); assertEquals(1, pool.getConnectedServerCount()); @@ -479,8 +476,7 @@ public void testCCPDestroyOnLastDestroyRegion() throws Exception pool.destroy(); assertEquals(true, pool.isDestroyed()); // pause(5000); - server1.invoke(ClientServerMiscDUnitTest.class, - "verifyNoCacheClientProxyOnServer"); + server1.invoke(() -> ClientServerMiscDUnitTest.verifyNoCacheClientProxyOnServer()); try { getCache().createRegion(REGION_NAME2, attrs); fail("expected IllegalStateException"); @@ -502,7 +498,7 @@ public void testInvalidatesPropagateOnTwoRegions() createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1); registerInterestForInvalidatesInBothTheRegions(); populateCache(); - server1.invoke(ClientServerMiscDUnitTest.class, "put"); + server1.invoke(() -> ClientServerMiscDUnitTest.put()); //pause(5000); verifyInvalidatesOnBothRegions(); @@ -594,7 +590,7 @@ public void testInvalidatesPropagateOnRegionHavingNoPool() assertNotNull(conn); populateCache(); - server1.invoke(ClientServerMiscDUnitTest.class, "put"); + server1.invoke(() -> ClientServerMiscDUnitTest.put()); // pause(5000); WaitCriterion wc = new WaitCriterion() { String excuse; @@ -692,8 +688,7 @@ public void testProxyCreationBeforeCacheCreation() throws Exception //region1.registerInterest(CacheClientProxy.ALL_KEYS); region2.registerInterest("ALL_KEYS"); Wait.pause(6000); - server1.invoke(ClientServerMiscDUnitTest.class, - "verifyInterestListOnServer"); + server1.invoke(() -> ClientServerMiscDUnitTest.verifyInterestListOnServer()); } /** @@ -1368,7 +1363,7 @@ protected final void postTearDownCacheTestCase() throws Exception { // close the clients first closeCache(); // then close the servers - server1.invoke(ClientServerMiscDUnitTest.class, "closeCache"); + server1.invoke(() -> ClientServerMiscDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java index 88bdb20e1852..4844ec85511a 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java @@ -90,7 +90,7 @@ public void setUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); vm2 = host.getVM(2); - PORT = ((Integer)vm0.invoke(ConflationDUnitTest.class, "createServerCache" )).intValue(); + PORT = ((Integer)vm0.invoke(() -> ConflationDUnitTest.createServerCache())).intValue(); } private Cache createCache(Properties props) throws Exception @@ -140,24 +140,23 @@ public static void unsetIsSlowStart() public void testTwoRegionsTwoWriters() { try { - vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart"); + vm0.invoke(() -> ConflationDUnitTest.setIsSlowStart()); createClientCache1UniqueWriter ( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)); - vm2.invoke(ConflationDUnitTest.class, "createClientCache2UniqueWriter", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)}); - vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery"); - vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero"); - vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero"); - vm2.invoke(ConflationDUnitTest.class, "registerInterest"); + vm2.invoke(() -> ConflationDUnitTest.createClientCache2UniqueWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT))); + vm2.invoke(() -> ConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery()); + vm2.invoke(() -> ConflationDUnitTest.setAllCountersZero()); + vm2.invoke(() -> ConflationDUnitTest.assertAllCountersZero()); + vm2.invoke(() -> ConflationDUnitTest.registerInterest()); create(); put(); createMarker(); - vm2.invoke(ConflationDUnitTest.class, "waitForMarker"); - vm2.invoke(ConflationDUnitTest.class, "assertValue"); - vm2.invoke(ConflationDUnitTest.class, "destroyMarker"); + vm2.invoke(() -> ConflationDUnitTest.waitForMarker()); + vm2.invoke(() -> ConflationDUnitTest.assertValue()); + vm2.invoke(() -> ConflationDUnitTest.destroyMarker()); destroy(); createMarker(); - vm2.invoke(ConflationDUnitTest.class, "waitForMarker"); - vm2.invoke(ConflationDUnitTest.class, "assertCounterSizes"); + vm2.invoke(() -> ConflationDUnitTest.waitForMarker()); + vm2.invoke(() -> ConflationDUnitTest.assertCounterSizes()); } catch( Exception e ) { Assert.fail("Test failed due to exception", e); @@ -171,24 +170,23 @@ public void testTwoRegionsTwoWriters() public void testTwoRegionsOneWriter() { try { - vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart"); + vm0.invoke(() -> ConflationDUnitTest.setIsSlowStart()); createClientCache1CommonWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)); - vm2.invoke(ConflationDUnitTest.class, "createClientCache2CommonWriter", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)}); - vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery"); - vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero"); - vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero"); - vm2.invoke(ConflationDUnitTest.class, "registerInterest"); + vm2.invoke(() -> ConflationDUnitTest.createClientCache2CommonWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT))); + vm2.invoke(() -> ConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery()); + vm2.invoke(() -> ConflationDUnitTest.setAllCountersZero()); + vm2.invoke(() -> ConflationDUnitTest.assertAllCountersZero()); + vm2.invoke(() -> ConflationDUnitTest.registerInterest()); create(); put(); createMarker(); - vm2.invoke(ConflationDUnitTest.class, "waitForMarker"); - vm2.invoke(ConflationDUnitTest.class, "assertValue"); - vm2.invoke(ConflationDUnitTest.class, "destroyMarker"); + vm2.invoke(() -> ConflationDUnitTest.waitForMarker()); + vm2.invoke(() -> ConflationDUnitTest.assertValue()); + vm2.invoke(() -> ConflationDUnitTest.destroyMarker()); destroy(); createMarker(); - vm2.invoke(ConflationDUnitTest.class, "waitForMarker"); - vm2.invoke(ConflationDUnitTest.class, "assertCounterSizes"); + vm2.invoke(() -> ConflationDUnitTest.waitForMarker()); + vm2.invoke(() -> ConflationDUnitTest.assertCounterSizes()); } catch( Exception e ) { Assert.fail("Test failed due to exception", e); @@ -203,27 +201,26 @@ public void testTwoRegionsOneWriter() public void testNotMoreMessagesSent() { try { - vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart"); + vm0.invoke(() -> ConflationDUnitTest.setIsSlowStart()); createClientCache1CommonWriterTest3(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)); - vm2.invoke(ConflationDUnitTest.class, - "createClientCache2CommonWriterTest3", new Object[] { - NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) }); - vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery"); - vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero"); - vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero"); - vm2.invoke(ConflationDUnitTest.class, "registerInterest"); + vm2.invoke(() -> ConflationDUnitTest.createClientCache2CommonWriterTest3( + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) )); + vm2.invoke(() -> ConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery()); + vm2.invoke(() -> ConflationDUnitTest.setAllCountersZero()); + vm2.invoke(() -> ConflationDUnitTest.assertAllCountersZero()); + vm2.invoke(() -> ConflationDUnitTest.registerInterest()); create(); put200(); createMarker(); - vm2.invoke(ConflationDUnitTest.class, "waitForMarker"); - vm2.invoke(ConflationDUnitTest.class, "assertValue"); - vm2.invoke(ConflationDUnitTest.class, "destroyMarker"); + vm2.invoke(() -> ConflationDUnitTest.waitForMarker()); + vm2.invoke(() -> ConflationDUnitTest.assertValue()); + vm2.invoke(() -> ConflationDUnitTest.destroyMarker()); destroy(); createMarker(); - vm2.invoke(ConflationDUnitTest.class, "waitForMarker"); - vm2.invoke(ConflationDUnitTest.class, "assertCounterSizesLessThan200"); - vm0.invoke(ConflationDUnitTest.class, "getStatsOnServer"); - vm0.invoke(ConflationDUnitTest.class, "assertConflationStatus"); + vm2.invoke(() -> ConflationDUnitTest.waitForMarker()); + vm2.invoke(() -> ConflationDUnitTest.assertCounterSizesLessThan200()); + vm0.invoke(() -> ConflationDUnitTest.getStatsOnServer()); + vm0.invoke(() -> ConflationDUnitTest.assertConflationStatus()); } catch (Exception e) { Assert.fail("Test failed due to exception", e); @@ -912,9 +909,9 @@ public static void destroyMarker() protected final void preTearDown() throws Exception { // close client closeCache(); - vm2.invoke(ConflationDUnitTest.class, "closeCache"); + vm2.invoke(() -> ConflationDUnitTest.closeCache()); // close server - vm0.invoke(ConflationDUnitTest.class, "closeCache"); + vm0.invoke(() -> ConflationDUnitTest.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java index 06abd14b8d98..b0a2e14f8755 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java @@ -159,12 +159,12 @@ public static Integer createServerCache(Integer maxThreads) throws Exception { protected final void preTearDown() throws Exception { try { // close the clients first - client1.invoke(DataSerializerPropogationDUnitTest.class, "closeCache"); - client2.invoke(DataSerializerPropogationDUnitTest.class, "closeCache"); + client1.invoke(() -> DataSerializerPropogationDUnitTest.closeCache()); + client2.invoke(() -> DataSerializerPropogationDUnitTest.closeCache()); closeCache(); - server1.invoke(DataSerializerPropogationDUnitTest.class, "closeCache"); - server2.invoke(DataSerializerPropogationDUnitTest.class, "closeCache"); + server1.invoke(() -> DataSerializerPropogationDUnitTest.closeCache()); + server2.invoke(() -> DataSerializerPropogationDUnitTest.closeCache()); client1 = null; client2 = null; @@ -404,23 +404,18 @@ public void testServerUpFirstClientLater() throws Exception { Wait.pause(3000); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject1"); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject2"); + server1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject1()); + server1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject2()); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(2) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(2) )); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); // wait for client2 to come online Wait.pause(3000); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(2) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(2) )); // Put some entries from the client client1.invoke(new CacheSerializableRunnable("Put entries from client") { @@ -470,31 +465,24 @@ public void testDataSerializersWith2ClientsN2Servers() throws Exception { PORT1 = initServerCache(server1); PORT2 = initServerCache(server2); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) )); // wait for client2 to come online Wait.pause(2000); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject3"); + client1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject3()); Wait.pause(4000); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); - server2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); } // this test is for bug 44112 @@ -502,61 +490,48 @@ public void testLocalOnlyDS() throws Exception { PORT1 = initServerCache(server1); PORT2 = initServerCache(server2); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) )); // wait for client2 to come online Wait.pause(2000); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObjectLocalOnly", new Object[] { }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObjectLocalOnly( )); Wait.pause(4000); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); - server2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(0) }); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(0) )); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1), Boolean.TRUE }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1), Boolean.TRUE )); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(0) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(0) )); } public void testDataSerializersWithServerKill() throws Exception { PORT1 = initServerCache(server1); PORT2 = initServerCache(server2); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) )); // wait for client2 to come online Wait.pause(2000); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject4"); + client1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject4()); // wait for successful registration - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { Integer.valueOf(1) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( Integer.valueOf(1) )); - server2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { Integer.valueOf(1) }); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( Integer.valueOf(1) )); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { Integer.valueOf(1) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( Integer.valueOf(1) )); // can get server connectivity exception final IgnoredException expectedEx = IgnoredException.addIgnoredException( @@ -564,25 +539,19 @@ public void testDataSerializersWithServerKill() throws Exception { // stop the cache server - server1.invoke(DataSerializerPropogationDUnitTest.class, "stopServer"); + server1.invoke(() -> DataSerializerPropogationDUnitTest.stopServer()); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject5"); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject6"); + server1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject5()); + server1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject6()); - server2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(3) }); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(3) )); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(3) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(3) )); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer( - instanceCountWithOnePut) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer( + instanceCountWithOnePut) )); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(3) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(3) )); expectedEx.remove(); } @@ -591,101 +560,80 @@ public void testDataSerializers() throws Exception { PORT1 = initServerCache(server1); PORT2 = initServerCache(server2); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) )); // wait for client2 to come online Wait.pause(2000); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject10"); + client1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject10()); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject11"); + server1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject11()); Wait.pause(4000); - server2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(2) }); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(2) )); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(2) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(2) )); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(2) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(2) )); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(2) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(2) )); } public void testDataSerializersWithServerKillAndReInvoked() throws Exception { PORT1 = initServerCache(server1); PORT2 = initServerCache(server2); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) }); - - client1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject7"); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer( - instanceCountWithOnePut) }); - - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer( - instanceCountWithOnePut) }); - - server2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer( - instanceCountWithOnePut) }); - - client2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer( - instanceCountWithOnePut) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) )); + + client1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject7()); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer( + instanceCountWithOnePut) )); + + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer( + instanceCountWithOnePut) )); + + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer( + instanceCountWithOnePut) )); + + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer( + instanceCountWithOnePut) )); // can get server connectivity exception final IgnoredException expectedEx = IgnoredException.addIgnoredException( "Server unreachable", client1); - server1.invoke(DataSerializerPropogationDUnitTest.class, "stopServer"); + server1.invoke(() -> DataSerializerPropogationDUnitTest.stopServer()); try { - client1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject8"); + client1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject8()); } catch (Exception e) {// we are putting in a client whose server is dead } try { - client1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject9"); + client1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject9()); } catch (Exception e) {// we are putting in a client whose server is // dead } - server1.invoke(DataSerializerPropogationDUnitTest.class, "startServer"); + server1.invoke(() -> DataSerializerPropogationDUnitTest.startServer()); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer( - instanceCountWithAllPuts) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer( + instanceCountWithAllPuts) )); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer( - instanceCountWithAllPuts) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer( + instanceCountWithAllPuts) )); - server2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer( - instanceCountWithAllPuts) }); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer( + instanceCountWithAllPuts) )); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer( - instanceCountWithAllPuts) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer( + instanceCountWithAllPuts) )); expectedEx.remove(); } @@ -694,32 +642,25 @@ public void testDataSerializerCount() throws Exception { PORT1 = initServerCache(server1); PORT2 = initServerCache(server2); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); createClientCache(NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2)); // wait for client2 to come online Wait.pause(2000); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "registerDSObject12"); + client1.invoke(() -> DataSerializerPropogationDUnitTest.registerDSObject12()); Wait.pause(4000); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); - server2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); verifyDataSerializers(1); } @@ -737,19 +678,17 @@ public void testDataSerializersEventIdVerificationClientsAndServers() createClientCache(NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1)); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) )); setClientServerObserver1(); client2 - .invoke(DataSerializerPropogationDUnitTest.class, "setClientServerObserver2"); + .invoke(() -> DataSerializerPropogationDUnitTest.setClientServerObserver2()); registerDSObject13(); Wait.pause(10000); - Boolean pass = (Boolean)client2.invoke( - DataSerializerPropogationDUnitTest.class, "verifyResult"); + Boolean pass = (Boolean)client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyResult()); assertTrue("EventId found Different", pass.booleanValue()); PoolImpl.IS_INSTANTIATOR_CALLBACK = false; @@ -760,67 +699,60 @@ public void testLazyLoadingOfDataSerializersWith2ClientsN2Servers() throws Excep PORT1 = initServerCache(server1); PORT2 = initServerCache(server2); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, - "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) )); // wait for client2 to come online Wait.pause(2000); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "registerTestDataSerializer"); + client1.invoke(() -> DataSerializerPropogationDUnitTest.registerTestDataSerializer()); Wait.pause(4000); - client1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); // Verify through InternalDataSerializer's map entries - client1.invoke(DataSerializerPropogationDUnitTest.class, "verifyLoadedDataSerializers", new Object[] { new Integer(1) }); - client1.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerClassNamesMap", new Object[] { new Integer(0) }); - client1.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerIDMap", new Object[] { new Integer(0) }); - client1.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerSupportedClassNamesMap", new Object[] { new Integer(0) }); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyLoadedDataSerializers( new Integer(1) )); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerClassNamesMap( new Integer(0) )); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerIDMap( new Integer(0) )); + client1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerSupportedClassNamesMap( new Integer(0) )); - server1.invoke(DataSerializerPropogationDUnitTest.class, "verifyLoadedDataSerializers", new Object[] { new Integer(1) }); - server1.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerClassNamesMap", new Object[] { new Integer(0) }); - server1.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerIDMap", new Object[] { new Integer(0) }); - server1.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerSupportedClassNamesMap", new Object[] { new Integer(0) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyLoadedDataSerializers( new Integer(1) )); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerClassNamesMap( new Integer(0) )); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerIDMap( new Integer(0) )); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerSupportedClassNamesMap( new Integer(0) )); - server2.invoke(DataSerializerPropogationDUnitTest.class, "verifyLoadedDataSerializers", new Object[] { new Integer(1) }); - server2.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerClassNamesMap", new Object[] { new Integer(0) }); - server2.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerIDMap", new Object[] { new Integer(0) }); - server2.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerSupportedClassNamesMap", new Object[] { new Integer(0) }); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyLoadedDataSerializers( new Integer(1) )); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerClassNamesMap( new Integer(0) )); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerIDMap( new Integer(0) )); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerSupportedClassNamesMap( new Integer(0) )); // Verify by boolean flag in static initializer. - server1.invoke(DataSerializerPropogationDUnitTest.class, "verifyTestDataSerializerLoaded"); - server2.invoke(DataSerializerPropogationDUnitTest.class, "verifyTestDataSerializerLoaded"); - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyTestDataSerializerNotLoaded"); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyTestDataSerializerLoaded()); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyTestDataSerializerLoaded()); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyTestDataSerializerNotLoaded()); // Verify through InternalDataSerializer.getSerializers() - server1.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); - server2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + server1.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); + server2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); // Verify through InternalDataSerializer's map entries - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyLoadedDataSerializers", new Object[] { new Integer(0) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerClassNamesMap", new Object[] { new Integer(1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerIDMap", new Object[] { new Integer(1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerSupportedClassNamesMap", new Object[] { new Integer(3) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyLoadedDataSerializers( new Integer(0) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerClassNamesMap( new Integer(1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerIDMap( new Integer(1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerSupportedClassNamesMap( new Integer(3) )); // Force TestDataSerializer to be loaded into vm by invoking InternalDataSerialier.getSerializers() - client2.invoke(DataSerializerPropogationDUnitTest.class, - "verifyDataSerializers", new Object[] { new Integer(1) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializers( new Integer(1) )); // Verify by boolean flag in static initializer. - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyTestDataSerializerLoaded"); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyTestDataSerializerLoaded()); // Verify through InternalDataSerializer's map entries - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyLoadedDataSerializers", new Object[] { new Integer(1) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerClassNamesMap", new Object[] { new Integer(0) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerIDMap", new Object[] { new Integer(0) }); - client2.invoke(DataSerializerPropogationDUnitTest.class, "verifyDataSerializerSupportedClassNamesMap", new Object[] { new Integer(0) }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyLoadedDataSerializers( new Integer(1) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerClassNamesMap( new Integer(0) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerIDMap( new Integer(0) )); + client2.invoke(() -> DataSerializerPropogationDUnitTest.verifyDataSerializerSupportedClassNamesMap( new Integer(0) )); } public static void verifyTestDataSerializerNotLoaded() { @@ -925,8 +857,7 @@ public static void setClientServerObserver1() { @Override public void beforeSendingToServer(EventID eventID) { eventId = eventID; - client2.invoke(DataSerializerPropogationDUnitTest.class, "setEventId", - new Object[] { eventId }); + client2.invoke(() -> DataSerializerPropogationDUnitTest.setEventId( eventId )); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java index 5ba03bd541e9..a70284e8ace1 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java @@ -101,13 +101,11 @@ public void setUp() throws Exception { //client 2 VM vm3 = host.getVM(3); - PORT1 = ((Integer)vm0.invoke(DestroyEntryPropagationDUnitTest.class, "createServerCache" )).intValue(); - PORT2 = ((Integer)vm1.invoke(DestroyEntryPropagationDUnitTest.class, "createServerCache" )).intValue(); + PORT1 = ((Integer)vm0.invoke(() -> DestroyEntryPropagationDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)vm1.invoke(() -> DestroyEntryPropagationDUnitTest.createServerCache())).intValue(); - vm2.invoke(DestroyEntryPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)}); - vm3.invoke(DestroyEntryPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)}); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2))); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2))); } @@ -125,28 +123,24 @@ private void createCache(Properties props) throws Exception public void testDestroyPropagation() { //First create entries on both servers via the two clients - vm2.invoke(DestroyEntryPropagationDUnitTest.class, "createEntriesK1andK2"); - vm3.invoke(DestroyEntryPropagationDUnitTest.class, "createEntriesK1andK2"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2()); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2()); // register interest for key-1 - vm2.invoke(DestroyEntryPropagationDUnitTest.class, "registerKey1"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.registerKey1()); // register interest for key-1 - vm3.invoke(DestroyEntryPropagationDUnitTest.class, "registerKey1"); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.registerKey1()); //destroy entry key-1 , key-2 - vm2.invoke(DestroyEntryPropagationDUnitTest.class, "destroyEntriesK1andK2"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.destroyEntriesK1andK2()); // verify destroy entry on first server - vm0.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyEntriesAreDestroyed"); + vm0.invoke(() -> DestroyEntryPropagationDUnitTest.verifyEntriesAreDestroyed()); // verify destroy entry on second server - vm1.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyEntriesAreDestroyed"); + vm1.invoke(() -> DestroyEntryPropagationDUnitTest.verifyEntriesAreDestroyed()); // verify destroy entry in originator vm - vm2.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyEntriesAreDestroyed"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.verifyEntriesAreDestroyed()); // verify only key-1 is destroyed - vm3.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyOnlyRegisteredEntriesAreDestroyed"); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.verifyOnlyRegisteredEntriesAreDestroyed()); } @@ -158,26 +152,22 @@ public void testDestroyPropagation() public void testDestroyOnServerPropagation() { //First create entries on both servers via the two client - vm2.invoke(DestroyEntryPropagationDUnitTest.class, "createEntriesK1andK2"); - vm3.invoke(DestroyEntryPropagationDUnitTest.class, "createEntriesK1andK2"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2()); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2()); - vm2.invoke(DestroyEntryPropagationDUnitTest.class, "registerKey1"); - vm3.invoke(DestroyEntryPropagationDUnitTest.class, "registerKey1"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.registerKey1()); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.registerKey1()); //destroy entry on server directly - vm0.invoke(DestroyEntryPropagationDUnitTest.class, "destroyEntriesK1andK2"); + vm0.invoke(() -> DestroyEntryPropagationDUnitTest.destroyEntriesK1andK2()); // verify destroy entry on server 1 - vm0.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyEntriesAreDestroyed"); + vm0.invoke(() -> DestroyEntryPropagationDUnitTest.verifyEntriesAreDestroyed()); // verify destroy entry on second server - vm1.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyEntriesAreDestroyed"); + vm1.invoke(() -> DestroyEntryPropagationDUnitTest.verifyEntriesAreDestroyed()); // verify destroy entry only for registered keys in client1 - vm2.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyOnlyRegisteredEntriesAreDestroyed"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.verifyOnlyRegisteredEntriesAreDestroyed()); // verify destroy entry only for registered keys in client 2 - vm3.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyOnlyRegisteredEntriesAreDestroyed"); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.verifyOnlyRegisteredEntriesAreDestroyed()); } @@ -194,12 +184,12 @@ public void testVerifyDestroyNotReceivedBySender() { final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue(); //First create entries on both servers via the two client - vm2.invoke(DestroyEntryPropagationDUnitTest.class, "createEntriesK1andK2"); - vm3.invoke(DestroyEntryPropagationDUnitTest.class, "createEntriesK1andK2"); - vm2.invoke(DestroyEntryPropagationDUnitTest.class, "registerKey1"); - vm3.invoke(DestroyEntryPropagationDUnitTest.class, "registerKey1"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2()); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createEntriesK1andK2()); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.registerKey1()); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.registerKey1()); //Induce fail over of InterestList Endpoint to Server 2 by killing server1 - vm0.invoke(DestroyEntryPropagationDUnitTest.class, "killServer", new Object[]{new Integer(PORT1) }); + vm0.invoke(() -> DestroyEntryPropagationDUnitTest.killServer(new Integer(PORT1) )); //Wait for 10 seconds to allow fail over. This would mean that Interest // has failed over to Server2. vm2.invoke(new CacheSerializableRunnable("Wait for server on port1 to be dead") { @@ -232,7 +222,7 @@ public String description() { //Start Server1 again so that both clients1 & Client 2 will establish // connection to server1 too. - vm0.invoke(DestroyEntryPropagationDUnitTest.class, "startServer", new Object[]{new Integer(PORT1) }); + vm0.invoke(() -> DestroyEntryPropagationDUnitTest.startServer(new Integer(PORT1) )); vm2.invoke(new CacheSerializableRunnable("Wait for server on port1 to spring to life") { public void run2() throws CacheException @@ -256,17 +246,13 @@ public String description() { //Do a destroy on Server1 via Connection object from client1. // Client1 should not receive updated value while client2 should receive - vm2.invoke(DestroyEntryPropagationDUnitTest.class, - "acquireConnectionsAndDestroyEntriesK1andK2"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.acquireConnectionsAndDestroyEntriesK1andK2()); // pause(10000); // Check if both the puts ( on key1 & key2 ) have reached the servers - vm0.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyEntriesAreDestroyed"); - vm1.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyEntriesAreDestroyed"); + vm0.invoke(() -> DestroyEntryPropagationDUnitTest.verifyEntriesAreDestroyed()); + vm1.invoke(() -> DestroyEntryPropagationDUnitTest.verifyEntriesAreDestroyed()); - vm2.invoke(DestroyEntryPropagationDUnitTest.class, - "verifyNoDestroyEntryInSender"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.verifyNoDestroyEntryInSender()); } @@ -502,10 +488,10 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { //close client - vm2.invoke(DestroyEntryPropagationDUnitTest.class, "closeCache"); - vm3.invoke(DestroyEntryPropagationDUnitTest.class, "closeCache"); + vm2.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache()); + vm3.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache()); //close server - vm0.invoke(DestroyEntryPropagationDUnitTest.class, "closeCache"); - vm1.invoke(DestroyEntryPropagationDUnitTest.class, "closeCache"); + vm0.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache()); + vm1.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java index dbe2355ff1c0..648718f54446 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java @@ -83,10 +83,8 @@ public void setUp() throws Exception { vm2 = Host.getHost(0).getVM(2); vm3 = Host.getHost(0).getVM(3); - port0 = (Integer) vm0.invoke(DurableClientQueueSizeDUnitTest.class, - "createCacheServer", new Object[] { }); - port1 = (Integer) vm1.invoke(DurableClientQueueSizeDUnitTest.class, - "createCacheServer", new Object[] { }); + port0 = (Integer) vm0.invoke(() -> DurableClientQueueSizeDUnitTest.createCacheServer( )); + port1 = (Integer) vm1.invoke(() -> DurableClientQueueSizeDUnitTest.createCacheServer( )); IgnoredException.addIgnoredException("java.net.SocketException"); IgnoredException.addIgnoredException("Unexpected IOException"); } @@ -95,19 +93,18 @@ public void setUp() throws Exception { protected final void preTearDown() throws Exception { closeCache(); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache"); - vm3.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache"); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache()); + vm3.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache()); - vm0.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache"); - vm1.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache"); + vm0.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache()); + vm1.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache()); } public void testNonDurableClientFails() throws Exception { vm2.invoke(DurableClientQueueSizeDUnitTest.class, "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 }, false }); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { EXCEPTION }); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( EXCEPTION )); } // this test is disabled due to a high rate of failure. It fails with @@ -117,23 +114,20 @@ public void disabledtestSinglePoolClientReconnectsBeforeTimeOut() throws Excepti int num = 10; vm2.invoke(DurableClientQueueSizeDUnitTest.class, "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 }}); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE }); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "doRI"); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "readyForEvents"); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE )); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.doRI()); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.readyForEvents()); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache", new Object[] {Boolean.TRUE}); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache(Boolean.TRUE)); - vm0.invoke(DurableClientQueueSizeDUnitTest.class, "doPuts", new Object[] {num}); + vm0.invoke(() -> DurableClientQueueSizeDUnitTest.doPuts(num)); vm2.invoke(DurableClientQueueSizeDUnitTest.class, "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 }}); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { num + 1 /* +1 for marker */}); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "readyForEvents"); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { EXCEPTION }); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( num + 1 /* +1 for marker */)); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.readyForEvents()); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( EXCEPTION )); } @@ -145,55 +139,48 @@ public void testSinglePoolClientReconnectsAfterTimeOut() throws Exception { "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 }, String.valueOf(timeoutSeconds), true }); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "doRI"); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "readyForEvents"); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.doRI()); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.readyForEvents()); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache", new Object[] {Boolean.TRUE}); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache(Boolean.TRUE)); - vm0.invoke(DurableClientQueueSizeDUnitTest.class, "doPuts", new Object[] {num}); + vm0.invoke(() -> DurableClientQueueSizeDUnitTest.doPuts(num)); Thread.sleep(timeoutSeconds * 1000); // TODO use a waitCriterion vm2.invoke(DurableClientQueueSizeDUnitTest.class, "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 }}); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { PoolImpl.PRIMARY_QUEUE_TIMED_OUT }); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( PoolImpl.PRIMARY_QUEUE_TIMED_OUT )); } public void testPrimaryServerRebootReturnsCorrectResponse() throws Exception { int num = 10; vm2.invoke(DurableClientQueueSizeDUnitTest.class, "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 } }); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "doRI"); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "readyForEvents"); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.doRI()); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.readyForEvents()); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache", - new Object[] { Boolean.TRUE }); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache( Boolean.TRUE )); - vm0.invoke(DurableClientQueueSizeDUnitTest.class, "doPuts", - new Object[] { num }); + vm0.invoke(() -> DurableClientQueueSizeDUnitTest.doPuts( num )); // Identify primary and restart it - boolean isVM0Primary = (Boolean) vm0.invoke( - DurableClientQueueSizeDUnitTest.class, "isPrimary"); + boolean isVM0Primary = (Boolean) vm0.invoke(() -> DurableClientQueueSizeDUnitTest.isPrimary()); int port = 0; if (isVM0Primary) { - vm0.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache"); - vm0.invoke(DurableClientQueueSizeDUnitTest.class, "createCacheServer", - new Object[] { port0 }); + vm0.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache()); + vm0.invoke(() -> DurableClientQueueSizeDUnitTest.createCacheServer( port0 )); port = port0; } else { // vm1 is primary - vm1.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache"); - vm1.invoke(DurableClientQueueSizeDUnitTest.class, "createCacheServer", - new Object[] { port1 }); + vm1.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache()); + vm1.invoke(() -> DurableClientQueueSizeDUnitTest.createCacheServer( port1 )); port = port1; } vm2.invoke(DurableClientQueueSizeDUnitTest.class, "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port } }); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE }); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE )); } public void bug51854_testMultiPoolClientReconnectsBeforeTimeOut() throws Exception { @@ -201,24 +188,21 @@ public void bug51854_testMultiPoolClientReconnectsBeforeTimeOut() throws Excepti vm2.invoke(DurableClientQueueSizeDUnitTest.class, "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 }, "300", true/* durable */, true /* multiPool */}); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE, PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE }); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "doRI"); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "readyForEvents"); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE, PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE )); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.doRI()); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.readyForEvents()); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache", new Object[] {Boolean.TRUE}); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache(Boolean.TRUE)); - vm0.invoke(DurableClientQueueSizeDUnitTest.class, "doPuts", new Object[] {num}); + vm0.invoke(() -> DurableClientQueueSizeDUnitTest.doPuts(num)); vm2.invoke(DurableClientQueueSizeDUnitTest.class, "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 }, "300", true/* durable */, true /* multiPool */}); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { num + 1 /* +1 for marker */, (num * 2) + 1}); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "readyForEvents"); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { EXCEPTION, EXCEPTION }); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( num + 1 /* +1 for marker */, (num * 2) + 1)); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.readyForEvents()); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( EXCEPTION, EXCEPTION )); } public void bug51854_testMultiPoolClientReconnectsAfterTimeOut() throws Exception { @@ -229,14 +213,13 @@ public void bug51854_testMultiPoolClientReconnectsAfterTimeOut() throws Exceptio "createClientCache", new Object[] { vm2.getHost(), new Integer[] { port0, port1 }, String.valueOf(timeout), true/* durable */, true /* multiPool */}); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE, PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE }); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "doRI"); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "readyForEvents"); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE, PoolImpl.PRIMARY_QUEUE_NOT_AVAILABLE )); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.doRI()); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.readyForEvents()); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache", new Object[] {Boolean.TRUE}); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache(Boolean.TRUE)); - vm0.invoke(DurableClientQueueSizeDUnitTest.class, "doPuts", new Object[] {num}); + vm0.invoke(() -> DurableClientQueueSizeDUnitTest.doPuts(num)); // vm0.invoke(DurableClientQueueSizeDUnitTest.class, // "verifyQueueSizeAtServer", new Object[] { DEFAULT_POOL_NAME, num + 1 }); // vm0.invoke(DurableClientQueueSizeDUnitTest.class, @@ -247,8 +230,7 @@ public void bug51854_testMultiPoolClientReconnectsAfterTimeOut() throws Exceptio new Object[] { vm2.getHost(), new Integer[] { port0, port1 }, "300", true/* durable */, true /* multiPool */}); - vm2.invoke(DurableClientQueueSizeDUnitTest.class, "verifyQueueSize", - new Object[] { PoolImpl.PRIMARY_QUEUE_TIMED_OUT, PoolImpl.PRIMARY_QUEUE_TIMED_OUT}); + vm2.invoke(() -> DurableClientQueueSizeDUnitTest.verifyQueueSize( PoolImpl.PRIMARY_QUEUE_TIMED_OUT, PoolImpl.PRIMARY_QUEUE_TIMED_OUT)); } public void _testMultiPoolClientFailsOver() throws Exception { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java index 6ade4bd3cf66..5f25c3adbb6b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java @@ -106,10 +106,10 @@ public void setUp() throws Exception server4 = host.getVM(3); // start servers first - PORT1 = ((Integer) server1.invoke(DurableClientReconnectDUnitTest.class, "createServerCache")); - PORT2 = ((Integer) server2.invoke(DurableClientReconnectDUnitTest.class, "createServerCache")); - PORT3 = ((Integer) server3.invoke(DurableClientReconnectDUnitTest.class, "createServerCache")); - PORT4 = ((Integer) server4.invoke(DurableClientReconnectDUnitTest.class, "createServerCache")); + PORT1 = ((Integer) server1.invoke(() -> DurableClientReconnectDUnitTest.createServerCache())); + PORT2 = ((Integer) server2.invoke(() -> DurableClientReconnectDUnitTest.createServerCache())); + PORT3 = ((Integer) server3.invoke(() -> DurableClientReconnectDUnitTest.createServerCache())); + PORT4 = ((Integer) server4.invoke(() -> DurableClientReconnectDUnitTest.createServerCache())); SERVER1 = NetworkUtils.getServerHostName(host)+PORT1; SERVER2 = NetworkUtils.getServerHostName(host)+PORT2; SERVER3 = NetworkUtils.getServerHostName(host)+PORT3; @@ -488,46 +488,46 @@ public static Integer createServerCache() throws Exception private void determineAndVerfiyRedundantServers(Collection redundantServers) { if(redundantServers.contains(SERVER1)){ - server1.invoke(DurableClientReconnectDUnitTest.class, "verifyDurableClientOnServer"); + server1.invoke(() -> DurableClientReconnectDUnitTest.verifyDurableClientOnServer()); } if(redundantServers.contains(SERVER2)){ - server2.invoke(DurableClientReconnectDUnitTest.class, "verifyDurableClientOnServer"); + server2.invoke(() -> DurableClientReconnectDUnitTest.verifyDurableClientOnServer()); } if (redundantServers.contains(SERVER3)){ - server3.invoke(DurableClientReconnectDUnitTest.class, "verifyDurableClientOnServer"); + server3.invoke(() -> DurableClientReconnectDUnitTest.verifyDurableClientOnServer()); } if(redundantServers.contains(SERVER4)){ - server4.invoke(DurableClientReconnectDUnitTest.class, "verifyDurableClientOnServer"); + server4.invoke(() -> DurableClientReconnectDUnitTest.verifyDurableClientOnServer()); } } private void determineAndVerfiyNonRedundantServers(Collection redundantServers) { if(!redundantServers.contains(SERVER1)){ - server1.invoke(DurableClientReconnectDUnitTest.class, "verifyNoDurableClientOnServer"); + server1.invoke(() -> DurableClientReconnectDUnitTest.verifyNoDurableClientOnServer()); } if(!redundantServers.contains(SERVER2)){ - server2.invoke(DurableClientReconnectDUnitTest.class, "verifyNoDurableClientOnServer"); + server2.invoke(() -> DurableClientReconnectDUnitTest.verifyNoDurableClientOnServer()); } if (!redundantServers.contains(SERVER3)){ - server3.invoke(DurableClientReconnectDUnitTest.class, "verifyNoDurableClientOnServer"); + server3.invoke(() -> DurableClientReconnectDUnitTest.verifyNoDurableClientOnServer()); } if(!redundantServers.contains(SERVER4)){ - server4.invoke(DurableClientReconnectDUnitTest.class, "verifyNoDurableClientOnServer"); + server4.invoke(() -> DurableClientReconnectDUnitTest.verifyNoDurableClientOnServer()); } } private void closeServer(String server) { if(server.equals(SERVER1)){ - server1.invoke(DurableClientReconnectDUnitTest.class, "closeCache"); + server1.invoke(() -> DurableClientReconnectDUnitTest.closeCache()); } if(server.equals(SERVER2)){ - server2.invoke(DurableClientReconnectDUnitTest.class, "closeCache"); + server2.invoke(() -> DurableClientReconnectDUnitTest.closeCache()); } if (server.equals(SERVER3)){ - server3.invoke(DurableClientReconnectDUnitTest.class, "closeCache"); + server3.invoke(() -> DurableClientReconnectDUnitTest.closeCache()); } if(server.equals(SERVER4)){ - server4.invoke(DurableClientReconnectDUnitTest.class, "closeCache"); + server4.invoke(() -> DurableClientReconnectDUnitTest.closeCache()); } } @@ -737,10 +737,10 @@ protected final void preTearDown() throws Exception { closeCache(); // then close the servers - server1.invoke(DurableClientReconnectDUnitTest.class, "closeCache"); - server2.invoke(DurableClientReconnectDUnitTest.class, "closeCache"); - server3.invoke(DurableClientReconnectDUnitTest.class, "closeCache"); - server4.invoke(DurableClientReconnectDUnitTest.class, "closeCache"); + server1.invoke(() -> DurableClientReconnectDUnitTest.closeCache()); + server2.invoke(() -> DurableClientReconnectDUnitTest.closeCache()); + server3.invoke(() -> DurableClientReconnectDUnitTest.closeCache()); + server4.invoke(() -> DurableClientReconnectDUnitTest.closeCache()); } public void closeCache(boolean keepAlive) diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java index 97cb31ccbb82..e3e38a41dc15 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java @@ -82,7 +82,7 @@ public void setUp() throws Exception { @Override protected final void preTearDown() throws Exception { // Stop server 1 - this.server1VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server1VM.invoke(() -> CacheServerTestUtil.closeCache()); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } @@ -90,10 +90,9 @@ public void testNonDurableClientStatistics() { // Step 1: Starting the servers - PORT1 = ((Integer)this.server1VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true) - })).intValue(); - this.server1VM.invoke(DurableClientStatsDUnitTest.class, "checkStatistics"); + PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true) + ))).intValue(); + this.server1VM.invoke(() -> DurableClientStatsDUnitTest.checkStatistics()); // Step 2: Bring Up the Client // Start a durable client that is not kept alive on the server when it // stops normally @@ -109,8 +108,7 @@ public void testNonDurableClientStatistics() { startRegisterAndCloseNonDurableClientCache( durableClientTimeout); Wait.pause(500); - this.server1VM.invoke(DurableClientStatsDUnitTest.class, "putValue", - new Object[] { K1, "Value1" }); //////// -> Enqueue Message1 + this.server1VM.invoke(() -> DurableClientStatsDUnitTest.putValue( K1, "Value1" )); //////// -> Enqueue Message1 Wait.pause(500); startAndCloseNonDurableClientCache(1); //////// -> Reconnection2 @@ -120,24 +118,21 @@ public void testNonDurableClientStatistics() { startRegisterAndCloseNonDurableClientCache( durableClientTimeout); Wait.pause(500); - this.server1VM.invoke(DurableClientStatsDUnitTest.class, "putValue", - new Object[] { K1, "NewValue1" }); //////// -> Enqueue Message2 + this.server1VM.invoke(() -> DurableClientStatsDUnitTest.putValue( K1, "NewValue1" )); //////// -> Enqueue Message2 startAndCloseNonDurableClientCache(durableClientTimeout); //////// -> Reconnection3 - this.server1VM.invoke(DurableClientStatsDUnitTest.class, - "checkStatisticsWithExpectedValues", new Object[] { new Integer(0), - new Integer(0), new Integer(0) }); + this.server1VM.invoke(() -> DurableClientStatsDUnitTest.checkStatisticsWithExpectedValues( new Integer(0), + new Integer(0), new Integer(0) )); } public void testDurableClientStatistics() { // Step 1: Starting the servers - PORT1 = ((Integer)this.server1VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true) - })).intValue(); - this.server1VM.invoke(DurableClientStatsDUnitTest.class, "checkStatistics"); + PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true) + ))).intValue(); + this.server1VM.invoke(() -> DurableClientStatsDUnitTest.checkStatistics()); // Step 2: Bring Up the Client // Start a durable client that is not kept alive on the server when it // stops normally @@ -153,8 +148,7 @@ public void testDurableClientStatistics() { startRegisterAndCloseDurableClientCache( durableClientTimeout); Wait.pause(500); - this.server1VM.invoke(DurableClientStatsDUnitTest.class, "putValue", - new Object[] { K1, "Value1" }); //////// -> Enqueue Message1 + this.server1VM.invoke(() -> DurableClientStatsDUnitTest.putValue( K1, "Value1" )); //////// -> Enqueue Message1 Wait.pause(500); startAndCloseDurableClientCache(1); //////// -> Reconnection2 @@ -164,14 +158,12 @@ public void testDurableClientStatistics() { startRegisterAndCloseDurableClientCache( durableClientTimeout); Wait.pause(500); - this.server1VM.invoke(DurableClientStatsDUnitTest.class, "putValue", - new Object[] { K1, "NewValue1" }); //////// -> Enqueue Message2 + this.server1VM.invoke(() -> DurableClientStatsDUnitTest.putValue( K1, "NewValue1" )); //////// -> Enqueue Message2 startAndCloseDurableClientCache(durableClientTimeout); //////// -> Reconnection3 - this.server1VM.invoke(DurableClientStatsDUnitTest.class, - "checkStatisticsWithExpectedValues", new Object[] { new Integer(3), - new Integer(4), new Integer(2) }); + this.server1VM.invoke(() -> DurableClientStatsDUnitTest.checkStatisticsWithExpectedValues( new Integer(3), + new Integer(4), new Integer(2) )); } @@ -179,12 +171,11 @@ public void testDurableClientStatistics() { public void startRegisterAndCloseDurableClientCache(int durableClientTimeout) { final String durableClientId = getName() + "_client"; - this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0), regionName, getDurableClientDistributedSystemProperties(durableClientId, - durableClientTimeout), Boolean.TRUE }); + durableClientTimeout), Boolean.TRUE )); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -195,21 +186,19 @@ public void run2() throws CacheException { } }); - this.durableClientVM.invoke(DurableClientStatsDUnitTest.class, - "registerKey", new Object[] { K1, new Boolean(true) }); + this.durableClientVM.invoke(() -> DurableClientStatsDUnitTest.registerKey( K1, new Boolean(true) )); - this.durableClientVM.invoke(DurableClientStatsDUnitTest.class, "closeCache"); + this.durableClientVM.invoke(() -> DurableClientStatsDUnitTest.closeCache()); } public void startRegisterAndCloseNonDurableClientCache(int durableClientTimeout) { final String durableClientId = getName() + "_client"; - this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0), regionName, getNonDurableClientDistributedSystemProperties(durableClientId, - durableClientTimeout), Boolean.TRUE }); + durableClientTimeout), Boolean.TRUE )); // Send clientReady message // this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -219,22 +208,20 @@ public void startRegisterAndCloseNonDurableClientCache(int durableClientTimeout) // } // }); - this.durableClientVM.invoke(DurableClientStatsDUnitTest.class, - "registerKey", new Object[] { K1, new Boolean(false) }); + this.durableClientVM.invoke(() -> DurableClientStatsDUnitTest.registerKey( K1, new Boolean(false) )); - this.durableClientVM.invoke(DurableClientStatsDUnitTest.class, "closeCache"); + this.durableClientVM.invoke(() -> DurableClientStatsDUnitTest.closeCache()); } public void startAndCloseDurableClientCache(int durableClientTimeout) { final String durableClientId = getName() + "_client"; - this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0), regionName, getDurableClientDistributedSystemProperties(durableClientId, - durableClientTimeout), Boolean.TRUE }); + durableClientTimeout), Boolean.TRUE )); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -245,7 +232,7 @@ public void run2() throws CacheException { } }); - this.durableClientVM.invoke(DurableClientStatsDUnitTest.class, "closeCache"); + this.durableClientVM.invoke(() -> DurableClientStatsDUnitTest.closeCache()); } @@ -253,12 +240,11 @@ public void startAndCloseNonDurableClientCache(int durableClientTimeout) { final String durableClientId = getName() + "_client"; - this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, true, 0), regionName, getNonDurableClientDistributedSystemProperties(durableClientId, - durableClientTimeout), Boolean.TRUE }); + durableClientTimeout), Boolean.TRUE )); // Send clientReady message // this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -268,7 +254,7 @@ public void startAndCloseNonDurableClientCache(int durableClientTimeout) { // } // }); - this.durableClientVM.invoke(DurableClientStatsDUnitTest.class, "closeCache"); + this.durableClientVM.invoke(() -> DurableClientStatsDUnitTest.closeCache()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java index 141bb0b37394..683ec0383e8e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java @@ -113,12 +113,10 @@ public void setUp() throws Exception { public void testSimpleDurableClient() { // Step 1: Starting the servers - PORT1 = ((Integer)this.server1VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true) - })).intValue(); - PORT2 = ((Integer)this.server2VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true), - })).intValue(); + PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true) + ))).intValue(); + PORT2 = ((Integer)this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true), + ))).intValue(); // Step 2: Bring Up the Client // Start a durable client that is not kept alive on the server when it @@ -127,12 +125,11 @@ public void testSimpleDurableClient() { final int durableClientTimeout = 600; // keep the client alive for 600 // seconds - this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), regionName, getClientDistributedSystemProperties(durableClientId, - durableClientTimeout), Boolean.TRUE }); + durableClientTimeout), Boolean.TRUE )); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -146,66 +143,46 @@ public void run2() throws CacheException { // KEY_STONE1, KEY_STONE2 are registered as durableKeys & KEY_STONE3, // KEY_STONE4 as non-durableKeys - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K1, new Boolean(false) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K2, new Boolean(false) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K3, new Boolean(true) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K4, new Boolean(true) }); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K1, new Boolean(false) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K2, new Boolean(false) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K3, new Boolean(true) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K4, new Boolean(true) )); // Step 4: Update Values on the Server for KEY_STONE1, KEY_STONE2, // KEY_STONE3, KEY_STONE4 - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K1, "Value1" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K2, "Value2" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K3, "Value3" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K4, "Value4" }); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K1, "Value1" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K2, "Value2" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K3, "Value3" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K4, "Value4" )); Wait.pause(1000); // Step 5: Verify Updates on the Client - assertEquals("Value1", this.server2VM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K1 })); - assertEquals("Value1", this.server1VM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K1 })); + assertEquals("Value1", this.server2VM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); + assertEquals("Value1", this.server1VM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); - assertEquals("Value1", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K1 })); - assertEquals("Value2", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K2 })); - assertEquals("Value3", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K3 })); - assertEquals("Value4", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K4 })); + assertEquals("Value1", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); + assertEquals("Value2", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K2 ))); + assertEquals("Value3", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K3 ))); + assertEquals("Value4", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K4 ))); // Step 6: Close Cache of the DurableClient - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "closeCache"); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.closeCache()); // pause(5000); // Step 7: Update KEY_STONE1,KEY_STONE2,KEY_STONE3,KEY_STONE4 on the // Server say with values PingPong1, PingPong2, PingPong3, PingPong4 - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K1, "PingPong1" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K2, "PingPong2" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K3, "PingPong3" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K4, "PingPong4" }); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K1, "PingPong1" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K2, "PingPong2" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K3, "PingPong3" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K4, "PingPong4" )); // Step 8: Re-start the Client this.durableClientVM - .invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), + .invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), regionName, getClientDistributedSystemProperties(durableClientId), - Boolean.TRUE }); + Boolean.TRUE )); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -217,61 +194,46 @@ public void run2() throws CacheException { Wait.pause(5000); - assertNull(this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "getValue", new Object[] { K1 })); - assertNull(this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "getValue", new Object[] { K2 })); + assertNull(this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); + assertNull(this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K2 ))); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K1, new Boolean(false) }); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K1, new Boolean(false) )); Wait.pause(5000); - assertNull(this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "getValue", new Object[] { K1 })); - assertNull(this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "getValue", new Object[] { K2 })); - - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K1, "PingPong_updated_1" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K2, "PingPong_updated_2" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K3, "PingPong_updated_3" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K4, "PingPong_updated_4" }); + assertNull(this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); + assertNull(this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K2 ))); + + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K1, "PingPong_updated_1" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K2, "PingPong_updated_2" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K3, "PingPong_updated_3" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K4, "PingPong_updated_4" )); Wait.pause(5000); // Step 9: Verify Updates on the Client - assertEquals("PingPong_updated_1", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K1 })); - assertNull(this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "getValue", new Object[] { K2 })); - assertEquals("PingPong_updated_3", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K3 })); - assertEquals("PingPong_updated_4", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K4 })); + assertEquals("PingPong_updated_1", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); + assertNull(this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K2 ))); + assertEquals("PingPong_updated_3", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K3 ))); + assertEquals("PingPong_updated_4", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K4 ))); // Step 10 : Stop all VMs // Stop the durable client - this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache"); + this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache()); // Stop server 2 - this.server2VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server2VM.invoke(() -> CacheServerTestUtil.closeCache()); // Stop server 1 - this.server1VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server1VM.invoke(() -> CacheServerTestUtil.closeCache()); } public void testSimpleDurableClientWithRegistration() { // Step 1: Starting the servers - PORT1 = ((Integer)this.server1VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true) - })).intValue(); - PORT2 = ((Integer)this.server2VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true) - })).intValue(); + PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true) + ))).intValue(); + PORT2 = ((Integer)this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true) + ))).intValue(); // Step 2: Bring Up the Client // Start a durable client that is not kept alive on the server when it @@ -279,12 +241,11 @@ public void testSimpleDurableClientWithRegistration() { final String durableClientId = getName() + "_client"; // keep the client alive for 600 seconds final int durableClientTimeout = 600; - this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), regionName, getClientDistributedSystemProperties(durableClientId, - durableClientTimeout) }); + durableClientTimeout) )); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -298,66 +259,46 @@ public void run2() throws CacheException { // KEY_STONE1, KEY_STONE2 are registered as durableKeys & KEY_STONE3, // KEY_STONE4 as non-durableKeys - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K1, new Boolean(false) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K2, new Boolean(false) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K3, new Boolean(true) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K4, new Boolean(true) }); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K1, new Boolean(false) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K2, new Boolean(false) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K3, new Boolean(true) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K4, new Boolean(true) )); // Step 4: Update Values on the Server for KEY_STONE1, KEY_STONE2, // KEY_STONE3, KEY_STONE4 - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K1, "Value1" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K2, "Value2" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K3, "Value3" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K4, "Value4" }); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K1, "Value1" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K2, "Value2" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K3, "Value3" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K4, "Value4" )); Wait.pause(1000); // Step 5: Verify Updates on the Client - assertEquals("Value1", this.server2VM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K1 })); - assertEquals("Value1", this.server1VM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K1 })); + assertEquals("Value1", this.server2VM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); + assertEquals("Value1", this.server1VM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); - assertEquals("Value1", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K1 })); - assertEquals("Value2", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K2 })); - assertEquals("Value3", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K3 })); - assertEquals("Value4", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K4 })); + assertEquals("Value1", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); + assertEquals("Value2", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K2 ))); + assertEquals("Value3", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K3 ))); + assertEquals("Value4", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K4 ))); // Step 6: Close Cache of the DurableClient - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "closeCache"); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.closeCache()); // pause(5000); // Step 7: Update KEY_STONE1,KEY_STONE2,KEY_STONE3,KEY_STONE4 on the // Server say with values PingPong1, PingPong2, PingPong3, PingPong4 - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K1, "PingPong1" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K2, "PingPong2" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K3, "PingPong3" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K4, "PingPong4" }); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K1, "PingPong1" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K2, "PingPong2" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K3, "PingPong3" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K4, "PingPong4" )); // Step 8: Re-start the Client this.durableClientVM - .invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), + .invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 0), regionName, getClientDistributedSystemProperties(durableClientId), - Boolean.TRUE }); + Boolean.TRUE )); // Step 9: Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -370,89 +311,71 @@ public void run2() throws CacheException { // pause(1000); // Step 10: Register all Keys - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K3, new Boolean(true) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K4, new Boolean(true) }); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K3, new Boolean(true) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K4, new Boolean(true) )); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K1, new Boolean(false) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K2, new Boolean(false) }); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K1, new Boolean(false) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K2, new Boolean(false) )); // Step 11: Unregister Some Keys (Here K1, K3) - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "unregisterKey", new Object[] { K1 }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "unregisterKey", new Object[] { K3 }); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.unregisterKey( K1 )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.unregisterKey( K3 )); Wait.pause(5000); // Step 12: Modify values on the server for all the Keys - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K1, "PingPong_updated_1" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K2, "PingPong_updated_2" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K3, "PingPong_updated_3" }); - this.server2VM.invoke(DurableRegistrationDUnitTest.class, "putValue", - new Object[] { K4, "PingPong_updated_4" }); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K1, "PingPong_updated_1" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K2, "PingPong_updated_2" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K3, "PingPong_updated_3" )); + this.server2VM.invoke(() -> DurableRegistrationDUnitTest.putValue( K4, "PingPong_updated_4" )); Wait.pause(5000); // Step 13: Check the values for the ones not unregistered and the // Unregistered Keys' Values should be null try { - assertEquals("PingPong_updated_2", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K2 })); + assertEquals("PingPong_updated_2", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K2 ))); } catch (Exception e) { fail("Prob in KEY_STONE2: " - + this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "getValue", new Object[] { K2 })); + + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K2 ))); } try { - assertEquals("PingPong_updated_4", this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K4 })); + assertEquals("PingPong_updated_4", this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K4 ))); } catch (Exception e) { fail("Prob in KEY_STONE4: " - + this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "getValue", new Object[] { K4 })); + + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K4 ))); } try { - assertNull(this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K1 })); + assertNull(this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); } catch (Exception e) { fail("Prob in KEY_STONE1: " - + this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "getValue", new Object[] { K1 })); + + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K1 ))); } try { - assertNull(this.durableClientVM.invoke( - DurableRegistrationDUnitTest.class, "getValue", new Object[] { K3 })); + assertNull(this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K3 ))); } catch (Exception e) { fail("Prob in KEY_STONE3: " - + this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "getValue", new Object[] { K3 })); + + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.getValue( K3 ))); } // Stop the durable client - this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache"); + this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache()); // Stop server 2 - this.server2VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server2VM.invoke(() -> CacheServerTestUtil.closeCache()); // Stop server 1 - this.server1VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server1VM.invoke(() -> CacheServerTestUtil.closeCache()); } @@ -461,21 +384,19 @@ public void testDurableClientWithRegistrationHA() { // Step 1: Start server1 PORT2 = new Integer(AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET)); - PORT1 = ((Integer)this.server1VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true) - })).intValue(); + PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true) + ))).intValue(); // Step 2: Bring Up the Client final String durableClientId = getName() + "_client"; // keep the client alive for 600 seconds final int durableClientTimeout = 600; - this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), regionName, getClientDistributedSystemProperties(durableClientId, - durableClientTimeout) }); + durableClientTimeout) )); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -486,20 +407,15 @@ public void run2() throws CacheException { }); // Step 3: Client registers Interests - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K1, new Boolean(false) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K2, new Boolean(false) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K3, new Boolean(true) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K4, new Boolean(true) }); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K1, new Boolean(false) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K2, new Boolean(false) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K3, new Boolean(true) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K4, new Boolean(true) )); // Step 4: Bring up the server2 - this.server2VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true), - PORT2 }); + this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true), + PORT2 )); Wait.pause(3000); @@ -546,13 +462,13 @@ public void run2() throws CacheException // Stop the durable client - this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache"); + this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache()); // Stop server 2 - this.server2VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server2VM.invoke(() -> CacheServerTestUtil.closeCache()); // Stop server 1 - this.server1VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server1VM.invoke(() -> CacheServerTestUtil.closeCache()); } @@ -561,21 +477,19 @@ public void testDurableClientDisConnectWithRegistrationHA() { // Step 1: Start server1 PORT2 = new Integer(AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET)); - PORT1 = ((Integer)this.server1VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true) - })).intValue(); + PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true) + ))).intValue(); // Step 2: Bring Up the Client final String durableClientId = getName() + "_client"; // keep the client alive for 600 seconds final int durableClientTimeout = 600; - this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { + this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), regionName, getClientDistributedSystemProperties(durableClientId, - durableClientTimeout) }); + durableClientTimeout) )); // Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -586,28 +500,22 @@ public void run2() throws CacheException { }); // Step 3: Client registers Interests - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K1, new Boolean(false) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K2, new Boolean(false) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K3, new Boolean(true) }); - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "registerKey", new Object[] { K4, new Boolean(true) }); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K1, new Boolean(false) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K2, new Boolean(false) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K3, new Boolean(true) )); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.registerKey( K4, new Boolean(true) )); // Close Cache of the DurableClient - this.durableClientVM.invoke(DurableRegistrationDUnitTest.class, - "closeCache"); + this.durableClientVM.invoke(() -> DurableRegistrationDUnitTest.closeCache()); Wait.pause(2000); //Re-start the Client this.durableClientVM - .invoke(CacheServerTestUtil.class, "createCacheClient", - new Object[] { getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), + .invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, PORT2, true, 1), regionName, getClientDistributedSystemProperties(durableClientId), - Boolean.TRUE }); + Boolean.TRUE )); //Send clientReady message this.durableClientVM.invoke(new CacheSerializableRunnable( @@ -618,9 +526,8 @@ public void run2() throws CacheException { }); // Step 4: Bring up the server2 - this.server2VM.invoke(CacheServerTestUtil.class, - "createCacheServer", new Object[] { regionName, new Boolean(true), - PORT2 }); + this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true), + PORT2 )); Wait.pause(3000); @@ -666,13 +573,13 @@ public void run2() throws CacheException // Stop the durable client - this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache"); + this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache()); // Stop server 2 - this.server2VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server2VM.invoke(() -> CacheServerTestUtil.closeCache()); // Stop server 1 - this.server1VM.invoke(CacheServerTestUtil.class, "closeCache"); + this.server1VM.invoke(() -> CacheServerTestUtil.closeCache()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java index 4f1028c45a1f..bc49f9334174 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java @@ -69,8 +69,7 @@ public void setUp() throws Exception final Host host = Host.getHost(0); server1 = host.getVM(0); // start servers first - PORT1 = ((Integer)server1.invoke(DurableResponseMatrixDUnitTest.class, - "createServerCache")); + PORT1 = ((Integer)server1.invoke(() -> DurableResponseMatrixDUnitTest.createServerCache())); createCacheClient(NetworkUtils.getServerHostName(server1.getHost())); //Disconnecting the client can cause this IgnoredException.addIgnoredException("Connection reset||Unexpected IOException"); @@ -79,8 +78,7 @@ public void setUp() throws Exception public void testRegisterInterestResponse_NonExistent_Invalid() throws Exception { - server1.invoke(DurableResponseMatrixDUnitTest.class, "invalidateEntry", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.invalidateEntry( KEY )); Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.registerInterest(KEY, InterestResultPolicy.KEYS_VALUES); assertFalse(r.containsValueForKey(KEY)); // invalidate @@ -89,8 +87,7 @@ public void testRegisterInterestResponse_NonExistent_Invalid() public void testRegisterInterestResponse_NonExistent_Valid() throws Exception { - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.registerInterest(KEY, InterestResultPolicy.KEYS_VALUES); assertEquals("ValueMatrix1", r.getEntry(KEY).getValue()); @@ -100,8 +97,7 @@ public void BROKEN_testRegisterInterestResponse_Valid_Invalid() throws Exception { Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.put(KEY, "ValueMatrix1"); - server1.invoke(DurableResponseMatrixDUnitTest.class, "invalidateEntry", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.invalidateEntry( KEY )); r.registerInterest(KEY, InterestResultPolicy.KEYS_VALUES); assertEquals("ValueMatrix1", r.getEntry(KEY).getValue()); } @@ -118,8 +114,7 @@ public void testRegisterInterestResponse_Invalid_Invalid() throws Exception { Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); invalidateEntry(KEY); - server1.invoke(DurableResponseMatrixDUnitTest.class, "invalidateEntry", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.invalidateEntry( KEY )); r.registerInterest(KEY, InterestResultPolicy.KEYS_VALUES); assertEquals(null, r.getEntry(KEY).getValue()); } @@ -129,8 +124,7 @@ public void BROKEN_testRegisterInterestResponse_Invalid_Valid() { Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); invalidateEntry(KEY); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); r.registerInterest(KEY, InterestResultPolicy.KEYS_VALUES); assertEquals("ValueMatrix1", r.getEntry(KEY).getValue()); } @@ -140,8 +134,7 @@ public void testRegisterInterestResponse_Destroyed_Invalid() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.put(KEY, "DummyValue"); r.destroy(KEY); - server1.invoke(DurableResponseMatrixDUnitTest.class, "invalidateEntry", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.invalidateEntry( KEY )); r.registerInterest(KEY, InterestResultPolicy.KEYS_VALUES); assertFalse(r.containsValueForKey(KEY)); // invalidate assertEquals(null, r.getEntry(KEY).getValue()); // invalidate @@ -152,8 +145,7 @@ public void testRegisterInterestResponse_Destroyed_Valid() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.put(KEY, "DummyValue"); r.destroy(KEY); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); r.registerInterest(KEY, InterestResultPolicy.KEYS_VALUES); assertEquals("ValueMatrix1", r.getEntry(KEY).getValue()); } @@ -172,8 +164,7 @@ public void beforeInterestRegistration() Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.put(KEY, "DummyValue"); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); r.registerInterest(KEY, InterestResultPolicy.KEYS_VALUES); assertEquals(null, r.getEntry(KEY)); @@ -208,8 +199,7 @@ public void testNotification_NonExistent_Create() throws Exception { Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); waitForValue(r, KEY, "ValueMatrix1"); } @@ -217,32 +207,26 @@ public void testNotification_NonExistent_Update() throws Exception { Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix2" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix2" )); waitForValue(r, KEY, "ValueMatrix2"); } public void testNotification_NonExistent_Invalid() throws Exception { Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "invalidateEntryOnly", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.invalidateEntryOnly( KEY )); waitForValue(r, KEY, null); // invalidate } public void testNotification_NonExistent_Destroy() throws Exception { Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "destroyEntry", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.destroyEntry( KEY )); waitForValue(r, KEY, null); // destroyed } @@ -251,8 +235,7 @@ public void testNotification_Valid_Create() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.put(KEY, "DummyValue"); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); waitForValue(r, KEY, "ValueMatrix1"); } @@ -261,8 +244,7 @@ public void testNotification_Valid_Update() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.put(KEY, "DummyValue"); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix2" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix2" )); waitForValue(r, KEY, "ValueMatrix2"); } @@ -271,8 +253,7 @@ public void BROKEN_testNotification_Valid_Invalid() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.put(KEY, "DummyValue"); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "invalidateEntryOnly", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.invalidateEntryOnly( KEY )); waitForValue(r, KEY, null); // invalidate } @@ -281,8 +262,7 @@ public void testNotification_Valid_Destroy() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); r.put(KEY, "DummyValue"); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "destroyEntry", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.destroyEntry( KEY )); waitForValue(r, KEY, null); // destroyed } @@ -291,8 +271,7 @@ public void testNotification_Invalid_Create() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); invalidateEntry(KEY); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); waitForValue(r, KEY, "ValueMatrix1"); } @@ -301,8 +280,7 @@ public void testNotification_Invalid_Update() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); invalidateEntry(KEY); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); waitForValue(r, KEY, "ValueMatrix1"); } @@ -311,8 +289,7 @@ public void BROKEN_testNotification_Invalid_Invalid() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); invalidateEntry(KEY); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "invalidateEntryOnly", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.invalidateEntryOnly( KEY )); waitForValue(r, KEY, null); // invalidate } @@ -321,8 +298,7 @@ public void testNotification_Invalid_Destroy() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); invalidateEntry(KEY); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "destroyEntry", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.destroyEntry( KEY )); waitForValue(r, KEY, null); // destroyed } @@ -331,8 +307,7 @@ public void testNotification_LocalInvalid_Create() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); localInvalidateEntry(KEY); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); waitForValue(r, KEY, "ValueMatrix1"); } @@ -341,8 +316,7 @@ public void testNotification_LocalInvalid_Update() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); localInvalidateEntry(KEY); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "updateEntry", - new Object[] { KEY, "ValueMatrix1" }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.updateEntry( KEY, "ValueMatrix1" )); waitForValue(r, KEY, "ValueMatrix1"); } @@ -351,8 +325,7 @@ public void BROKEN_testNotification_LocalInvalid_Invalid() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); localInvalidateEntry(KEY); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "invalidateEntryOnly", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.invalidateEntryOnly( KEY )); waitForValue(r, KEY, null); // invalidate } @@ -361,8 +334,7 @@ public void testNotification_LocalInvalid_Destroy() throws Exception Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME); invalidateEntry(KEY); r.registerInterest("ALL_KEYS", InterestResultPolicy.NONE); - server1.invoke(DurableResponseMatrixDUnitTest.class, "destroyEntry", - new Object[] { KEY }); + server1.invoke(() -> DurableResponseMatrixDUnitTest.destroyEntry( KEY )); waitForValue(r, KEY, null); // destroyed } @@ -513,7 +485,7 @@ protected final void preTearDown() throws Exception { // close the clients first closeCache(); // then close the servers - server1.invoke(DurableResponseMatrixDUnitTest.class, "closeCache"); + server1.invoke(() -> DurableResponseMatrixDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java index 78e0f4181f3a..a0926f2b5615 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java @@ -92,10 +92,8 @@ public void setUp() throws Exception vm1 = host.getVM(1); //start servers first - PORT1 = ((Integer)vm0.invoke(EventIDVerificationDUnitTest.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)vm1.invoke(EventIDVerificationDUnitTest.class, - "createServerCache")).intValue(); + PORT1 = ((Integer)vm0.invoke(() -> EventIDVerificationDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)vm1.invoke(() -> EventIDVerificationDUnitTest.createServerCache())).intValue(); //vm2.invoke(EventIDVerificationDUnitTest.class, "createClientCache", new // Object[] { new Integer(PORT1),new Integer(PORT2)}); @@ -107,24 +105,20 @@ public void setUp() throws Exception public void testEventIDOnServer() { createEntry(); - Boolean pass = (Boolean)vm0.invoke(EventIDVerificationDUnitTest.class, - "verifyResult"); + Boolean pass = (Boolean)vm0.invoke(() -> EventIDVerificationDUnitTest.verifyResult()); assertTrue(pass.booleanValue()); put(); - pass = (Boolean)vm0.invoke(EventIDVerificationDUnitTest.class, - "verifyResult"); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationDUnitTest.verifyResult()); assertTrue(pass.booleanValue()); destroy(); - pass = (Boolean)vm0.invoke(EventIDVerificationDUnitTest.class, - "verifyResult"); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationDUnitTest.verifyResult()); assertTrue(pass.booleanValue()); put(); cache.getLogger().info("going to remove"); remove(); cache.getLogger().info("after remove"); - pass = (Boolean)vm0.invoke(EventIDVerificationDUnitTest.class, - "verifyResult"); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationDUnitTest.verifyResult()); assertTrue(pass.booleanValue()); } @@ -136,11 +130,9 @@ public void testEventIDOnServer() public void testEventIDPrapogationOnServerDuringRegionDestroy() { destroyRegion(); - Boolean pass = (Boolean)vm0.invoke(EventIDVerificationDUnitTest.class, - "verifyResult"); + Boolean pass = (Boolean)vm0.invoke(() -> EventIDVerificationDUnitTest.verifyResult()); assertTrue(pass.booleanValue()); - pass = (Boolean)vm1.invoke(EventIDVerificationDUnitTest.class, - "verifyResult"); + pass = (Boolean)vm1.invoke(() -> EventIDVerificationDUnitTest.verifyResult()); assertTrue(pass.booleanValue()); } @@ -152,11 +144,9 @@ public void testEventIDPrapogationOnServerDuringRegionDestroy() public void testEventIDPrapogationOnServerDuringRegionClear() { clearRegion(); - Boolean pass = (Boolean)vm0.invoke(EventIDVerificationDUnitTest.class, - "verifyResult"); + Boolean pass = (Boolean)vm0.invoke(() -> EventIDVerificationDUnitTest.verifyResult()); assertTrue(pass.booleanValue()); - pass = (Boolean)vm1.invoke(EventIDVerificationDUnitTest.class, - "verifyResult"); + pass = (Boolean)vm1.invoke(() -> EventIDVerificationDUnitTest.verifyResult()); assertTrue(pass.booleanValue()); } @@ -190,10 +180,8 @@ public static void createClientCache(String host, Integer port1, Integer port2) CacheWriter writer = new CacheWriterAdapter() { public void beforeCreate(EntryEvent event) { - vm0.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((EntryEventImpl)event).getEventId() }); - vm1.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((EntryEventImpl)event).getEventId() }); + vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() )); + vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() )); try { super.beforeCreate(event); } @@ -207,10 +195,8 @@ public void beforeCreate(EntryEvent event) public void beforeUpdate(EntryEvent event) { - vm0.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((EntryEventImpl)event).getEventId() }); - vm1.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((EntryEventImpl)event).getEventId() }); + vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() )); + vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() )); try { super.beforeUpdate(event); } @@ -224,10 +210,8 @@ public void beforeUpdate(EntryEvent event) public void beforeDestroy(EntryEvent event) { - vm0.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((EntryEventImpl)event).getEventId() }); - vm1.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((EntryEventImpl)event).getEventId() }); + vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() )); + vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() )); try { super.beforeDestroy(event); } @@ -241,10 +225,8 @@ public void beforeDestroy(EntryEvent event) public void beforeRegionDestroy(RegionEvent event) { - vm0.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((RegionEventImpl)event).getEventId() }); - vm1.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((RegionEventImpl)event).getEventId() }); + vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() )); + vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() )); try { super.beforeRegionDestroy(event); } @@ -257,10 +239,8 @@ public void beforeRegionDestroy(RegionEvent event) public void beforeRegionClear(RegionEvent event) { - vm0.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((RegionEventImpl)event).getEventId() }); - vm1.invoke(EventIDVerificationDUnitTest.class, "setEventIDData", - new Object[] { ((RegionEventImpl)event).getEventId() }); + vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() )); + vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() )); try { super.beforeRegionClear(event); } @@ -493,8 +473,8 @@ protected final void preTearDown() throws Exception { // close the clients first closeCache(); // then close the servers - vm0.invoke(EventIDVerificationDUnitTest.class, "closeCache"); - vm1.invoke(EventIDVerificationDUnitTest.class, "closeCache"); + vm0.invoke(() -> EventIDVerificationDUnitTest.closeCache()); + vm1.invoke(() -> EventIDVerificationDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java index 15a709bef0ec..2df2cf6c21e1 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java @@ -82,40 +82,33 @@ public void setUp() throws Exception public void testEventIDsDACK() throws Exception { createServerCache(new Integer(DISTRIBUTED_ACK)); - vm0.invoke(EventIDVerificationInP2PDUnitTest.class, "createServerCache", - new Object[] { new Integer(DISTRIBUTED_ACK) }); + vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.createServerCache( new Integer(DISTRIBUTED_ACK) )); verifyOperations(); } public void testEventIDsGLOBAL() throws Exception { createServerCache(new Integer(GLOBAL)); - vm0.invoke(EventIDVerificationInP2PDUnitTest.class, "createServerCache", - new Object[] { new Integer(GLOBAL) }); + vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.createServerCache( new Integer(GLOBAL) )); verifyOperations(); } public void _testEventIDsNOACK() throws Exception { createServerCache(new Integer(0)); - vm0.invoke(EventIDVerificationInP2PDUnitTest.class, "createServerCache", - new Object[] { new Integer(0) }); + vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.createServerCache( new Integer(0) )); createEntry(); - Boolean pass = (Boolean)vm0.invoke(EventIDVerificationInP2PDUnitTest.class, - "verifyResult", new Object[]{eventId} ); + Boolean pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId)); assertFalse(pass.booleanValue()); put(); - pass = (Boolean)vm0.invoke(EventIDVerificationInP2PDUnitTest.class, - "verifyResult", new Object[]{eventId} ); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId)); assertFalse(pass.booleanValue()); destroy(); - pass = (Boolean)vm0.invoke(EventIDVerificationInP2PDUnitTest.class, - "verifyResult", new Object[]{eventId} ); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId)); assertFalse(pass.booleanValue()); destroyRegion(); - pass = (Boolean)vm0.invoke(EventIDVerificationInP2PDUnitTest.class, - "verifyResult", new Object[]{eventId} ); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId)); assertFalse(pass.booleanValue()); } @@ -297,31 +290,26 @@ public static Boolean verifyResult(EventID correctId) public static void verifyOperations() { createEntry(); - Boolean pass = (Boolean)vm0.invoke(EventIDVerificationInP2PDUnitTest.class, - "verifyResult", new Object[]{eventId} ); + Boolean pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId)); assertTrue(pass.booleanValue()); put(); - pass = (Boolean)vm0.invoke(EventIDVerificationInP2PDUnitTest.class, - "verifyResult", new Object[]{eventId} ); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId)); assertTrue(pass.booleanValue()); invalidateRegion(); - pass = (Boolean)vm0.invoke(EventIDVerificationInP2PDUnitTest.class, - "verifyResult", new Object[]{eventId} ); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId)); assertTrue(pass.booleanValue()); destroy(); - pass = (Boolean)vm0.invoke(EventIDVerificationInP2PDUnitTest.class, - "verifyResult", new Object[]{eventId} ); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId)); assertTrue(pass.booleanValue()); destroyRegion(); - pass = (Boolean)vm0.invoke(EventIDVerificationInP2PDUnitTest.class, - "verifyResult", new Object[]{eventId} ); + pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId)); assertTrue(pass.booleanValue()); } @Override protected final void preTearDown() throws Exception { closeCache(); - vm0.invoke(EventIDVerificationInP2PDUnitTest.class, "closeCache"); + vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java index 08175dd0abc8..df81db85d03b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java @@ -89,19 +89,19 @@ public void setUp() throws Exception @Override protected final void preTearDown() throws Exception { - server1.invoke(HABug36738DUnitTest.class, "closeCache"); - server2.invoke(HABug36738DUnitTest.class, "closeCache"); + server1.invoke(() -> HABug36738DUnitTest.closeCache()); + server2.invoke(() -> HABug36738DUnitTest.closeCache()); } public void testBug36768() throws Exception { createServer1(); Wait.pause(10000); - server1.invoke(HABug36738DUnitTest.class, "checkRegionQueueSize"); + server1.invoke(() -> HABug36738DUnitTest.checkRegionQueueSize()); createServer2(); - server1.invoke(HABug36738DUnitTest.class, "checkRegionQueueSize"); - server2.invoke(HABug36738DUnitTest.class, "checkRegionQueueSize"); - server2.invoke(HABug36738DUnitTest.class, "printRecs"); + server1.invoke(() -> HABug36738DUnitTest.checkRegionQueueSize()); + server2.invoke(() -> HABug36738DUnitTest.checkRegionQueueSize()); + server2.invoke(() -> HABug36738DUnitTest.printRecs()); } public static void printRecs() @@ -122,15 +122,13 @@ public static void printRecs() // function to create server and region in it. private void createServer1() throws Exception { - server1.invoke(HABug36738DUnitTest.class, "createServerCache", - new Object[] { new Boolean(true) }); + server1.invoke(() -> HABug36738DUnitTest.createServerCache( new Boolean(true) )); } // function to create server without region. private void createServer2() throws Exception { - server2.invoke(HABug36738DUnitTest.class, "createServerCache", - new Object[] { new Boolean(false) }); + server2.invoke(() -> HABug36738DUnitTest.createServerCache( new Boolean(false) )); } public static void createServerCache(Boolean isRegion) throws Exception diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java index fc9211d2606f..d236bc573329 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java @@ -33,14 +33,14 @@ public HAInterestPart1DUnitTest(String name) { public void testInterestRegistrationOnBothPrimaryAndSecondary() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); // register K1 and K2 registerK1AndK2(); - server1.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); - server2.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); - server3.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + server1.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); + server2.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); + server3.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); } /** @@ -50,9 +50,9 @@ public void testInterestRegistrationOnBothPrimaryAndSecondary() throws Exception public void testInterestRegistrationResponseOnBothPrimaryAndSecondary() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); // register interest and verify response registerK1AndK2OnPrimaryAndSecondaryAndVerifyResponse(); } @@ -64,15 +64,15 @@ public void testInterestRegistrationResponseOnBothPrimaryAndSecondary() throws E public void testRERegistrationWillNotCreateDuplicateKeysOnServerInterstMaps() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); // register multiple times reRegisterK1AndK2(); - server1.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); - server2.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); - server3.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + server1.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); + server2.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); + server3.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); } /** @@ -83,9 +83,9 @@ public void testRERegistrationWillNotCreateDuplicateKeysOnServerInterstMaps() th public void testPrimaryFailureInRegisterInterest() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); // stop primary VM oldPrimary = getPrimaryVM(); stopPrimaryAndRegisterK1AndK2AndVerifyResponse(); @@ -93,8 +93,8 @@ public void testPrimaryFailureInRegisterInterest() throws Exception { verifyDeadAndLiveServers(1, 2); // new primary VM newPrimary = getPrimaryVM(oldPrimary); - newPrimary.invoke(HAInterestTestCase.class, "verifyDispatcherIsAlive"); - newPrimary.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + newPrimary.invoke(() -> HAInterestTestCase.verifyDispatcherIsAlive()); + newPrimary.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); } /** @@ -104,17 +104,17 @@ public void testPrimaryFailureInRegisterInterest() throws Exception { public void testSecondaryFailureInRegisterInterest() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); VM primary = getPrimaryVM(); stopSecondaryAndRegisterK1AndK2AndVerifyResponse(); verifyDeadAndLiveServers(1, 2); // still primary - primary.invoke(HAInterestTestCase.class, "verifyDispatcherIsAlive"); - primary.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + primary.invoke(() -> HAInterestTestCase.verifyDispatcherIsAlive()); + primary.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); } /** @@ -126,17 +126,17 @@ public void testSecondaryFailureInRegisterInterest() throws Exception { public void testBothPrimaryAndSecondaryFailureInRegisterInterest() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); // stop server1 and server2 VM oldPrimary = getPrimaryVM(); stopBothPrimaryAndSecondaryAndRegisterK1AndK2AndVerifyResponse(); verifyDeadAndLiveServers(2, 1); VM newPrimary = getPrimaryVM(oldPrimary); - newPrimary.invoke(HAInterestTestCase.class, "verifyDispatcherIsAlive"); - newPrimary.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + newPrimary.invoke(() -> HAInterestTestCase.verifyDispatcherIsAlive()); + newPrimary.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); } /** @@ -150,17 +150,17 @@ public void testBothPrimaryAndSecondaryFailureInRegisterInterest() throws Except public void testProbablePrimaryFailureInRegisterInterest() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); VM oldPrimary = getPrimaryVM(); stopPrimaryAndRegisterK1AndK2AndVerifyResponse(); verifyDeadAndLiveServers(1, 2); VM newPrimary = getPrimaryVM(oldPrimary); - newPrimary.invoke(HAInterestTestCase.class, "verifyDispatcherIsAlive"); - newPrimary.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + newPrimary.invoke(() -> HAInterestTestCase.verifyDispatcherIsAlive()); + newPrimary.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); } /** @@ -174,40 +174,40 @@ public void testInterstRegistrationOnRecoveredEPbyDSM() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); registerK1AndK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); - server1.invoke(HAInterestTestCase.class, "stopServer"); - server2.invoke(HAInterestTestCase.class, "stopServer"); - server3.invoke(HAInterestTestCase.class, "stopServer"); + server1.invoke(() -> HAInterestTestCase.stopServer()); + server2.invoke(() -> HAInterestTestCase.stopServer()); + server3.invoke(() -> HAInterestTestCase.stopServer()); // All servers are dead at this point , no primary in the system. verifyDeadAndLiveServers(3, 0); // now start one of the servers - server2.invoke(HAInterestTestCase.class, "startServer"); + server2.invoke(() -> HAInterestTestCase.startServer()); verifyDeadAndLiveServers(2, 1); // verify that is it primary , and dispatcher is running - server2.invoke(HAInterestTestCase.class, "verifyDispatcherIsAlive"); + server2.invoke(() -> HAInterestTestCase.verifyDispatcherIsAlive()); // verify that interest is registered on this recovered EP - server2.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + server2.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); // now start one more server ; this should be now secondary - server1.invoke(HAInterestTestCase.class, "startServer"); + server1.invoke(() -> HAInterestTestCase.startServer()); verifyDeadAndLiveServers(1, 2); // verify that is it secondary , dispatcher should not be runnig - server1.invoke(HAInterestTestCase.class, "verifyDispatcherIsNotAlive"); + server1.invoke(() -> HAInterestTestCase.verifyDispatcherIsNotAlive()); // verify that interest is registered on this recovered EP as well - server1.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + server1.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); // now start one more server ; this should be now secondary - server3.invoke(HAInterestTestCase.class, "startServer"); + server3.invoke(() -> HAInterestTestCase.startServer()); verifyDeadAndLiveServers(0, 3); // verify that is it secondary , dispatcher should not be runnig - server3.invoke(HAInterestTestCase.class, "verifyDispatcherIsNotAlive"); + server3.invoke(() -> HAInterestTestCase.verifyDispatcherIsNotAlive()); // verify that interest is registered on this recovered EP as well - server3.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + server3.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java index 647069f45fa2..02c3e71d3fc6 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java @@ -39,9 +39,9 @@ public HAInterestPart2DUnitTest(String name) { public void testPrimaryFailureInUNregisterInterest() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); registerK1AndK2(); @@ -51,11 +51,11 @@ public void testPrimaryFailureInUNregisterInterest() throws Exception { verifyDeadAndLiveServers(1, 2); VM newPrimary = getPrimaryVM(oldPrimary); - newPrimary.invoke(HAInterestTestCase.class, "verifyDispatcherIsAlive"); + newPrimary.invoke(() -> HAInterestTestCase.verifyDispatcherIsAlive()); // primary - newPrimary.invoke(HAInterestTestCase.class, "verifyInterestUNRegistration"); + newPrimary.invoke(() -> HAInterestTestCase.verifyInterestUNRegistration()); // secondary - getBackupVM().invoke(HAInterestTestCase.class, "verifyInterestUNRegistration"); + getBackupVM().invoke(() -> HAInterestTestCase.verifyInterestUNRegistration()); } /** @@ -65,18 +65,18 @@ public void testPrimaryFailureInUNregisterInterest() throws Exception { public void testSecondaryFailureInUNRegisterInterest() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); registerK1AndK2(); VM stoppedBackup = stopSecondaryAndUNregisterK1(); verifyDeadAndLiveServers(1, 2); // still primary - getPrimaryVM().invoke(HAInterestTestCase.class, "verifyDispatcherIsAlive"); + getPrimaryVM().invoke(() -> HAInterestTestCase.verifyDispatcherIsAlive()); // primary - getPrimaryVM().invoke(HAInterestTestCase.class, "verifyInterestUNRegistration"); + getPrimaryVM().invoke(() -> HAInterestTestCase.verifyInterestUNRegistration()); // secondary - getBackupVM(stoppedBackup).invoke(HAInterestTestCase.class, "verifyInterestUNRegistration"); + getBackupVM(stoppedBackup).invoke(() -> HAInterestTestCase.verifyInterestUNRegistration()); } /** @@ -87,11 +87,11 @@ public void testSecondaryFailureInUNRegisterInterest() throws Exception { public void testDSMDetectsServerLiveJustBeforeInterestRegistration() throws Exception { createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); VM backup = getBackupVM(); - backup.invoke(HAInterestTestCase.class, "stopServer"); + backup.invoke(() -> HAInterestTestCase.stopServer()); verifyDeadAndLiveServers(1, 2); setClientServerObserverForBeforeRegistration(backup); try { @@ -100,9 +100,9 @@ public void testDSMDetectsServerLiveJustBeforeInterestRegistration() throws Exce } finally { unSetClientServerObserverForRegistrationCallback(); } - server1.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); - server2.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); - server3.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + server1.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); + server2.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); + server3.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); } /** @@ -114,12 +114,12 @@ public void testDSMDetectsServerLiveJustAfterInterestRegistration() throws Excep createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); createEntriesK1andK2(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); VM backup = getBackupVM(); - backup.invoke(HAInterestTestCase.class, "stopServer"); + backup.invoke(() -> HAInterestTestCase.stopServer()); verifyDeadAndLiveServers(1, 2); setClientServerObserverForAfterRegistration(backup); @@ -130,9 +130,9 @@ public void testDSMDetectsServerLiveJustAfterInterestRegistration() throws Excep unSetClientServerObserverForRegistrationCallback(); } - server1.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); - server2.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); - server3.invoke(HAInterestTestCase.class, "verifyInterestRegistration"); + server1.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); + server2.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); + server3.invoke(() -> HAInterestTestCase.verifyInterestRegistration()); } /** @@ -145,16 +145,16 @@ public void testDSMDetectsServerLiveJustAfterInterestRegistration() throws Excep public void testRefreshEntriesFromPrimaryWhenDSMDetectsServerLive() throws Exception { IgnoredException.addIgnoredException(ServerConnectivityException.class.getName()); - PORT1 = ((Integer) server1.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + PORT1 = ((Integer) server1.invoke(() -> HAInterestTestCase.createServerCache())).intValue(); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); createClientPoolCacheConnectionToSingleServer(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); registerK1AndK2(); verifyRefreshedEntriesFromServer(); - server1.invoke(HAInterestTestCase.class, "stopServer"); + server1.invoke(() -> HAInterestTestCase.stopServer()); verifyDeadAndLiveServers(1, 0); - server1.invoke(HAInterestTestCase.class, "putK1andK2"); - server1.invoke(HAInterestTestCase.class, "startServer"); + server1.invoke(() -> HAInterestTestCase.putK1andK2()); + server1.invoke(() -> HAInterestTestCase.startServer()); verifyDeadAndLiveServers(0, 1); final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME); assertNotNull(r1); @@ -213,29 +213,29 @@ public String description() { * refreshes registered entries from the server, because it is secondary */ public void testGIIFromSecondaryWhenDSMDetectsServerLive() throws Exception { - server1.invoke(HAInterestTestCase.class, "closeCache"); - server2.invoke(HAInterestTestCase.class, "closeCache"); - server3.invoke(HAInterestTestCase.class, "closeCache"); + server1.invoke(() -> HAInterestTestCase.closeCache()); + server2.invoke(() -> HAInterestTestCase.closeCache()); + server3.invoke(() -> HAInterestTestCase.closeCache()); - PORT1 = ((Integer) server1.invoke(HAInterestTestCase.class, "createServerCacheWithLocalRegion")).intValue(); - PORT2 = ((Integer) server2.invoke(HAInterestTestCase.class, "createServerCacheWithLocalRegion")).intValue(); - PORT3 = ((Integer) server3.invoke(HAInterestTestCase.class, "createServerCacheWithLocalRegion")).intValue(); + PORT1 = ((Integer) server1.invoke(() -> HAInterestTestCase.createServerCacheWithLocalRegion())).intValue(); + PORT2 = ((Integer) server2.invoke(() -> HAInterestTestCase.createServerCacheWithLocalRegion())).intValue(); + PORT3 = ((Integer) server3.invoke(() -> HAInterestTestCase.createServerCacheWithLocalRegion())).intValue(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - server3.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + server3.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); createClientPoolCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); VM backup1 = getBackupVM(); VM backup2 = getBackupVM(backup1); - backup1.invoke(HAInterestTestCase.class, "stopServer"); - backup2.invoke(HAInterestTestCase.class, "stopServer"); + backup1.invoke(() -> HAInterestTestCase.stopServer()); + backup2.invoke(() -> HAInterestTestCase.stopServer()); verifyDeadAndLiveServers(2, 1); registerK1AndK2(); verifyRefreshedEntriesFromServer(); - backup1.invoke(HAInterestTestCase.class, "putK1andK2"); - backup1.invoke(HAInterestTestCase.class, "startServer"); + backup1.invoke(() -> HAInterestTestCase.putK1andK2()); + backup1.invoke(() -> HAInterestTestCase.startServer()); verifyDeadAndLiveServers(1, 2); verifyRefreshedEntriesFromServer(); } @@ -248,19 +248,19 @@ public void testGIIFromSecondaryWhenDSMDetectsServerLive() throws Exception { * @throws Exception */ public void testBug35945() throws Exception { - PORT1 = ((Integer) server1.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + PORT1 = ((Integer) server1.invoke(() -> HAInterestTestCase.createServerCache())).intValue(); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); createClientPoolCacheConnectionToSingleServer(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); registerK1AndK2(); verifyRefreshedEntriesFromServer(); - server1.invoke(HAInterestTestCase.class, "stopServer"); + server1.invoke(() -> HAInterestTestCase.stopServer()); verifyDeadAndLiveServers(1, 0); // put on stopped server - server1.invoke(HAInterestTestCase.class, "putK1andK2"); + server1.invoke(() -> HAInterestTestCase.putK1andK2()); // spawn a thread to put on server , which will acquire a lock on entry setClientServerObserverForBeforeInterestRecovery(); - server1.invoke(HAInterestTestCase.class, "startServer"); + server1.invoke(() -> HAInterestTestCase.startServer()); verifyDeadAndLiveServers(0, 1); waitForBeforeInterestRecoveryCallBack(); // verify updated value of k1 as a refreshEntriesFromServer @@ -316,23 +316,23 @@ public String description() { public void testInterestRecoveryFailure() throws Exception { IgnoredException.addIgnoredException("Server unreachable"); - PORT1 = ((Integer) server1.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); - server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); - PORT2 = ((Integer) server2.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); - server2.invoke(HAInterestTestCase.class, "createEntriesK1andK2"); + PORT1 = ((Integer) server1.invoke(() -> HAInterestTestCase.createServerCache())).intValue(); + server1.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); + PORT2 = ((Integer) server2.invoke(() -> HAInterestTestCase.createServerCache())).intValue(); + server2.invoke(() -> HAInterestTestCase.createEntriesK1andK2()); createClientPoolCacheWithSmallRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); registerK1AndK2(); verifyRefreshedEntriesFromServer(); VM backup = getBackupVM(); VM primary = getPrimaryVM(); - backup.invoke(HAInterestTestCase.class, "stopServer"); - primary.invoke(HAInterestTestCase.class, "stopServer"); + backup.invoke(() -> HAInterestTestCase.stopServer()); + primary.invoke(() -> HAInterestTestCase.stopServer()); verifyDeadAndLiveServers(2, 0); - primary.invoke(HAInterestTestCase.class, "putK1andK2"); + primary.invoke(() -> HAInterestTestCase.putK1andK2()); setClientServerObserverForBeforeInterestRecoveryFailure(); - primary.invoke(HAInterestTestCase.class, "startServer"); + primary.invoke(() -> HAInterestTestCase.startServer()); waitForBeforeInterestRecoveryCallBack(); if (exceptionOccured) { fail("The DSM could not ensure that server 1 is started & serevr 2 is stopped"); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java index d5b6252ee64d..85f37071fa28 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java @@ -108,9 +108,9 @@ public void setUp() throws Exception { server3 = host.getVM(2); CacheServerTestUtil.disableShufflingOfEndpoints(); // start servers first - PORT1 = ((Integer) server1.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); - PORT2 = ((Integer) server2.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); - PORT3 = ((Integer) server3.invoke(HAInterestTestCase.class, "createServerCache")).intValue(); + PORT1 = ((Integer) server1.invoke(() -> HAInterestTestCase.createServerCache())).intValue(); + PORT2 = ((Integer) server2.invoke(() -> HAInterestTestCase.createServerCache())).intValue(); + PORT3 = ((Integer) server3.invoke(() -> HAInterestTestCase.createServerCache())).intValue(); exceptionOccured = false; IgnoredException.addIgnoredException("java.net.ConnectException: Connection refused: connect"); } @@ -121,9 +121,9 @@ protected final void preTearDown() throws Exception { closeCache(); // then close the servers - server1.invoke(HAInterestTestCase.class, "closeCache"); - server2.invoke(HAInterestTestCase.class, "closeCache"); - server3.invoke(HAInterestTestCase.class, "closeCache"); + server1.invoke(() -> HAInterestTestCase.closeCache()); + server2.invoke(() -> HAInterestTestCase.closeCache()); + server3.invoke(() -> HAInterestTestCase.closeCache()); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } @@ -307,8 +307,8 @@ public void beforeInterestRecovery() { synchronized (HAInterestTestCase.class) { Thread t = new Thread() { public void run() { - getBackupVM().invoke(HAInterestTestCase.class, "startServer"); - getPrimaryVM().invoke(HAInterestTestCase.class, "stopServer"); + getBackupVM().invoke(() -> HAInterestTestCase.startServer()); + getPrimaryVM().invoke(() -> HAInterestTestCase.stopServer()); } }; t.start(); @@ -361,7 +361,7 @@ public static void setClientServerObserverForBeforeRegistration(final VM vm) { ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() { public void beforeInterestRegistration() { synchronized (HAInterestTestCase.class) { - vm.invoke(HAInterestTestCase.class, "startServer"); + vm.invoke(() -> HAInterestTestCase.startServer()); HAInterestTestCase.isBeforeRegistrationCallbackCalled = true; HAInterestTestCase.class.notify(); PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG = false; @@ -384,7 +384,7 @@ public static void setClientServerObserverForAfterRegistration(final VM vm) { ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() { public void afterInterestRegistration() { synchronized (HAInterestTestCase.class) { - vm.invoke(HAInterestTestCase.class, "startServer"); + vm.invoke(() -> HAInterestTestCase.startServer()); HAInterestTestCase.isAfterRegistrationCallbackCalled = true; HAInterestTestCase.class.notify(); PoolImpl.AFTER_REGISTER_CALLBACK_FLAG = false; @@ -597,7 +597,7 @@ public String description() { Wait.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); // close primaryEP - getPrimaryVM().invoke(HAInterestTestCase.class, "stopServer"); + getPrimaryVM().invoke(() -> HAInterestTestCase.stopServer()); List list = new ArrayList(); list.add(k1); list.add(k2); @@ -627,7 +627,7 @@ public String description() { Wait.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); // close primaryEP - getPrimaryVM().invoke(HAInterestTestCase.class, "stopServer"); + getPrimaryVM().invoke(() -> HAInterestTestCase.stopServer()); List list = new ArrayList(); list.add(k1); srp.unregisterInterest(list, InterestType.KEY, false, false); @@ -652,9 +652,9 @@ public String description() { // close primaryEP VM backup = getBackupVM(); - getPrimaryVM().invoke(HAInterestTestCase.class, "stopServer"); + getPrimaryVM().invoke(() -> HAInterestTestCase.stopServer()); // close secondary - backup.invoke(HAInterestTestCase.class, "stopServer"); + backup.invoke(() -> HAInterestTestCase.stopServer()); List list = new ArrayList(); list.add(k1); list.add(k2); @@ -689,7 +689,7 @@ public String description() { // close secondary EP VM result = getBackupVM(); - result.invoke(HAInterestTestCase.class, "stopServer"); + result.invoke(() -> HAInterestTestCase.stopServer()); List list = new ArrayList(); list.add(k1); list.add(k2); @@ -725,7 +725,7 @@ public String description() { // close secondary EP VM result = getBackupVM(); - result.invoke(HAInterestTestCase.class, "stopServer"); + result.invoke(() -> HAInterestTestCase.stopServer()); List list = new ArrayList(); list.add(k1); srp.unregisterInterest(list, InterestType.KEY, false, false); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java index 01c595c08de7..7395a84d719b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java @@ -90,9 +90,9 @@ public void setUp() throws Exception IgnoredException.addIgnoredException("SocketException"); // start servers first - PORT1 = ((Integer) server1.invoke(HAStartupAndFailoverDUnitTest.class, "createServerCache")); - PORT2 = ((Integer) server2.invoke(HAStartupAndFailoverDUnitTest.class, "createServerCache")); - PORT3 = ((Integer) server3.invoke(HAStartupAndFailoverDUnitTest.class, "createServerCache")); + PORT1 = ((Integer) server1.invoke(() -> HAStartupAndFailoverDUnitTest.createServerCache())); + PORT2 = ((Integer) server2.invoke(() -> HAStartupAndFailoverDUnitTest.createServerCache())); + PORT3 = ((Integer) server3.invoke(() -> HAStartupAndFailoverDUnitTest.createServerCache())); CacheServerTestUtil.disableShufflingOfEndpoints(); } @@ -105,40 +105,40 @@ public void testPrimaryFailover() throws Exception createClientCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); // primary - server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); // secondaries - server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); setClientServerObserver(); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); waitForPrimaryIdentification(); //primary - server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); unSetClientServerObserver(); //secondary - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); setClientServerObserver(); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); //primary waitForPrimaryIdentification(); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); unSetClientServerObserver(); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); // All servers are dead at this point , no primary in the system. verifyDeadAndLiveServers(3,0); // now start one of the servers - server3.invoke(HAStartupAndFailoverDUnitTest.class, "startServer"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.startServer()); // make sure that the server3 which was started recenty was marked live. verifyDeadAndLiveServers(2,1); //verify that is it primary , and dispatche is running - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); } @@ -155,19 +155,19 @@ public void testExceptionWhileMakingPrimary()throws Exception // failed primary due to incorect host name of the server // new primary - server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); //secondary - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); setClientServerObserver(); //stop new primary - server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); waitForPrimaryIdentification(); //newly selectd primary - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); unSetClientServerObserver(); } @@ -182,22 +182,22 @@ public void testTwoPrimaryFailedOneAfterTheAnother() throws Exception createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); // primary - server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); // secondaries - server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); setClientServerObserver(); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); //stop ProbablePrimary - server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); // processException(); waitForPrimaryIdentification(); //new primary - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); unSetClientServerObserver(); } @@ -209,9 +209,9 @@ public void testPrimaryShouldBeNullAndEPListShouldBeEmptyWhenAllServersAreDead() { createClientCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); verifyPrimaryShouldNotBeNullAndEPListShouldNotBeEmpty(); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); verifyDeadAndLiveServers(3,0); verifyPrimaryShouldBeNullAndEPListShouldBeEmpty(); } @@ -222,15 +222,15 @@ public void testPrimaryShouldBeNullAndEPListShouldBeEmptyWhenAllServersAreDead() public void testCacheClientUpdatersInitiatesFailoverOnPrimaryFailure() throws Exception { createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); setClientServerObserver(); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); waitForPrimaryIdentification(); unSetClientServerObserver(); verifyDeadAndLiveServers(1,2); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); } /** @@ -240,13 +240,13 @@ public void testCacheClientUpdatersInitiatesFailoverOnPrimaryFailure() throws Ex public void testCacheClientUpdaterInitiatesFailoverOnSecondaryFailure() throws Exception { createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); verifyDeadAndLiveServers(1,2); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); } @@ -259,13 +259,13 @@ public void testCacheClientUpdaterInitiatesFailoverOnBothPrimaryAndSecondaryFail { createClientCacheWithLargeRetryInterval(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); verifyDeadAndLiveServers(2,1); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); } @@ -277,13 +277,13 @@ public void testCacheClientUpdaterInitiatesFailoverOnBothPrimaryAndSecondaryFail { createClientCache(this.getName(), NetworkUtils.getServerHostName(server1.getHost())); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive"); - server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsNotAlive()); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); verifyDeadAndLiveServers(2,1); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive"); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.verifyDispatcherIsAlive()); } /** @@ -296,7 +296,7 @@ public void testInitiateFailoverByCacheOperationThreads_Secondary() throws Excep // so that only cache operation can detect a server failure and should initiate failover createClientCacheWithLargeRetryIntervalAndWithoutCallbackConnection(this.getName() , NetworkUtils.getServerHostName(server1.getHost())); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer"); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.stopServer()); put(); verifyDeadAndLiveServers(1,2); } @@ -723,9 +723,9 @@ protected final void preTearDown() throws Exception { closeCache(); // then close the servers - server1.invoke(HAStartupAndFailoverDUnitTest.class, "closeCache"); - server2.invoke(HAStartupAndFailoverDUnitTest.class, "closeCache"); - server3.invoke(HAStartupAndFailoverDUnitTest.class, "closeCache"); + server1.invoke(() -> HAStartupAndFailoverDUnitTest.closeCache()); + server2.invoke(() -> HAStartupAndFailoverDUnitTest.closeCache()); + server3.invoke(() -> HAStartupAndFailoverDUnitTest.closeCache()); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java index c6f71e2c04c4..65e78d3f0fc5 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java @@ -154,11 +154,11 @@ public static Integer createServerCache(Integer maxThreads) throws Exception { protected final void preTearDown() throws Exception { // close the clients first closeCache(); - client1.invoke(InstantiatorPropagationDUnitTest.class, "closeCache"); - client2.invoke(InstantiatorPropagationDUnitTest.class, "closeCache"); + client1.invoke(() -> InstantiatorPropagationDUnitTest.closeCache()); + client2.invoke(() -> InstantiatorPropagationDUnitTest.closeCache()); - server1.invoke(InstantiatorPropagationDUnitTest.class, "closeCache"); - server1.invoke(InstantiatorPropagationDUnitTest.class, "closeCache"); + server1.invoke(() -> InstantiatorPropagationDUnitTest.closeCache()); + server1.invoke(() -> InstantiatorPropagationDUnitTest.closeCache()); } public static void closeCache() { @@ -471,24 +471,19 @@ public void testServerUpFirstClientLater() throws Exception { Wait.pause(3000); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject1"); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject2"); + server1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject1()); + server1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject2()); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(2) }); + server1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(2) )); client1 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT1) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT1) )); // // wait for client2 to come online Wait.pause(3000); // - client1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(2) }); + client1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(2) )); // // // Put some entries from the client client1.invoke(new CacheSerializableRunnable("Put entries from client") { @@ -545,13 +540,11 @@ public void testInstantiatorsWith2ClientsN2Servers() throws Exception { Wait.pause(3000); client1 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT1) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT1) )); client2 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT2) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT2) )); unregisterInstantiatorsInAllVMs(); @@ -559,21 +552,16 @@ public void testInstantiatorsWith2ClientsN2Servers() throws Exception { Wait.pause(2000); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject3"); + client1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject3()); Wait.pause(4000); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(1) }); + client1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(1) )); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(1) }); + server1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(1) )); - server2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(1) }); + server2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(1) )); - client2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(1) }); + client2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(1) )); unregisterInstantiatorsInAllVMs(); } @@ -589,45 +577,36 @@ public void testInstantiatorsWithServerKill() throws Exception { PORT2 = initServerCache(server2); client1 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT1) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT1) )); client2 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT2) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT2) )); unregisterInstantiatorsInAllVMs(); // wait for client2 to come online Wait.pause(2000); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject4"); + client1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject4()); Wait.pause(4000); - server1.invoke(InstantiatorPropagationDUnitTest.class, "stopServer"); + server1.invoke(() -> InstantiatorPropagationDUnitTest.stopServer()); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject5"); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject6"); + server1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject5()); + server1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject6()); - server2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithAllPuts) }); + server2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithAllPuts) )); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithAllPuts) }); + server1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithAllPuts) )); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithOnePut) }); + client1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithOnePut) )); - client2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithAllPuts) }); + client2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithAllPuts) )); unregisterInstantiatorsInAllVMs(); } @@ -644,38 +623,30 @@ public void testInstantiators() throws Exception { PORT2 = initServerCache(server2); client1 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT1) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT1) )); client2 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT2) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT2) )); unregisterInstantiatorsInAllVMs(); // wait for client2 to come online Wait.pause(2000); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject10"); + client1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject10()); Wait.pause(4000); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject11"); + server1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject11()); Wait.pause(4000); - server2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(2) }); + server2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(2) )); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(2) }); + server1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(2) )); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(2) }); + client1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(2) )); - client2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(2) }); + client2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(2) )); unregisterInstantiatorsInAllVMs(); } @@ -688,57 +659,46 @@ public void _testInstantiatorsWithServerKillAndReInvoked() throws Exception { PORT1 = initServerCache(server1); PORT2 = initServerCache(server2); client1 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT1) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT1) )); client2 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT2) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT2) )); unregisterInstantiatorsInAllVMs(); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject7"); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithOnePut) }); + client1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject7()); + client1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithOnePut) )); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithOnePut) }); + server1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithOnePut) )); - server2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithOnePut) }); + server2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithOnePut) )); - client2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithOnePut) }); + client2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithOnePut) )); - server1.invoke(InstantiatorPropagationDUnitTest.class, "stopServer"); + server1.invoke(() -> InstantiatorPropagationDUnitTest.stopServer()); try { - client1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject8"); + client1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject8()); } catch (Exception expected) {// we are putting in a client whose server is // dead } - server1.invoke(InstantiatorPropagationDUnitTest.class, "startServer"); + server1.invoke(() -> InstantiatorPropagationDUnitTest.startServer()); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithAllPuts) }); + client1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithAllPuts) )); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithAllPuts) }); + server1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithAllPuts) )); - server2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer( - instanceCountWithAllPuts) }); + server2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer( + instanceCountWithAllPuts) )); unregisterInstantiatorsInAllVMs(); } @@ -756,34 +716,27 @@ public void testInstantiatorCount() throws Exception { PORT2 = initServerCache(server2); client1 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT1) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT1) )); client2 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), - new Integer(PORT1) }); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), + new Integer(PORT1) )); createClientCache(NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2)); unregisterInstantiatorsInAllVMs(); // wait for client2 to come online Wait.pause(2000); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "registerTestObject12"); + client1.invoke(() -> InstantiatorPropagationDUnitTest.registerTestObject12()); Wait.pause(4000); - client1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(1) }); + client1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(1) )); - server1.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(1) }); + server1.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(1) )); - server2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(1) }); + server2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(1) )); - client2.invoke(InstantiatorPropagationDUnitTest.class, - "verifyInstantiators", new Object[] { new Integer(1) }); + client2.invoke(() -> InstantiatorPropagationDUnitTest.verifyInstantiators( new Integer(1) )); verifyInstantiators(1); @@ -820,19 +773,16 @@ public void _testInstantiatorsEventIdVerificationClientsAndServers() unregisterInstantiatorsInAllVMs(); - client2.invoke(InstantiatorPropagationDUnitTest.class, - "createClientCache_EventId", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) }); + client2.invoke(() -> InstantiatorPropagationDUnitTest.createClientCache_EventId( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) )); setClientServerObserver1(); - client2.invoke(InstantiatorPropagationDUnitTest.class, - "setClientServerObserver2"); + client2.invoke(() -> InstantiatorPropagationDUnitTest.setClientServerObserver2()); registerTestObject19(); Wait.pause(10000); - Boolean pass = (Boolean)client2.invoke( - InstantiatorPropagationDUnitTest.class, "verifyResult"); + Boolean pass = (Boolean)client2.invoke(() -> InstantiatorPropagationDUnitTest.verifyResult()); assertTrue("EventId found Different", pass.booleanValue()); PoolImpl.IS_INSTANTIATOR_CALLBACK = false; @@ -853,24 +803,23 @@ public void testLazyRegistrationOfInstantiators() new Integer(PORT1)); client2 - .invoke(InstantiatorPropagationDUnitTest.class, "createClientCache", - new Object[] {NetworkUtils.getServerHostName(server2.getHost()), - new Integer(PORT2)}); + .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache(NetworkUtils.getServerHostName(server2.getHost()), + new Integer(PORT2))); Wait.pause(3000); unregisterInstantiatorsInAllVMs(); assertTestObject20NotLoaded(); - server1.invoke(InstantiatorPropagationDUnitTest.class, "assertTestObject20NotLoaded"); - server2.invoke(InstantiatorPropagationDUnitTest.class, "assertTestObject20NotLoaded"); - client2.invoke(InstantiatorPropagationDUnitTest.class, "assertTestObject20NotLoaded"); + server1.invoke(() -> InstantiatorPropagationDUnitTest.assertTestObject20NotLoaded()); + server2.invoke(() -> InstantiatorPropagationDUnitTest.assertTestObject20NotLoaded()); + client2.invoke(() -> InstantiatorPropagationDUnitTest.assertTestObject20NotLoaded()); registerTestObject20(); Wait.pause(5000); assertTestObject20Loaded(); - server1.invoke(InstantiatorPropagationDUnitTest.class, "assertTestObject20Loaded"); - //server2.invoke(InstantiatorPropagationDUnitTest.class, "assertTestObject20Loaded"); // classes are not initialized after loading in p2p path - client2.invoke(InstantiatorPropagationDUnitTest.class, "assertTestObject20NotLoaded"); + server1.invoke(() -> InstantiatorPropagationDUnitTest.assertTestObject20Loaded()); + //server2.invoke(() -> InstantiatorPropagationDUnitTest.assertTestObject20Loaded()); // classes are not initialized after loading in p2p path + client2.invoke(() -> InstantiatorPropagationDUnitTest.assertTestObject20NotLoaded()); } finally { unregisterInstantiatorsInAllVMs(); disconnectAllFromDS(); @@ -976,8 +925,7 @@ public void beforeSendingToServer(EventID eventID) { eventId = eventID; System.out.println("client2= "+client2 + " eventid= "+eventID); - client2.invoke(InstantiatorPropagationDUnitTest.class, - "setEventId", new Object[] { eventId }); + client2.invoke(() -> InstantiatorPropagationDUnitTest.setEventId( eventId )); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java index 06f599f693ca..d43b067be465 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java @@ -143,7 +143,7 @@ public void setUp() throws Exception { vm1 = host.getVM(1); vm2 = host.getVM(2); // start servers first - PORT1 = ((Integer) vm0.invoke(InterestListDUnitTest.class, "createServerCache")).intValue(); + PORT1 = ((Integer) vm0.invoke(() -> InterestListDUnitTest.createServerCache())).intValue(); } /** @@ -166,41 +166,33 @@ public void setUp() throws Exception { public void testInterestListRegistration() { - vm1.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); - vm2.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); + vm1.invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1))); + vm2.invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1))); - vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); - vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); + vm1.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); + vm2.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); - vm1.invoke(InterestListDUnitTest.class, "registerKey", - new Object[] { key1 }); - vm2.invoke(InterestListDUnitTest.class, "registerKey", - new Object[] { key2 }); + vm1.invoke(() -> InterestListDUnitTest.registerKey( key1 )); + vm2.invoke(() -> InterestListDUnitTest.registerKey( key2 )); - vm1.invoke(InterestListDUnitTest.class, "put", new Object[] { "vm1" }); + vm1.invoke(() -> InterestListDUnitTest.put( "vm1" )); Wait.pause(10000); - vm2.invoke(InterestListDUnitTest.class, "validateEntriesK1andK2", - new Object[] { "vm2" }); - vm2.invoke(InterestListDUnitTest.class, "put", new Object[] { "vm2" }); + vm2.invoke(() -> InterestListDUnitTest.validateEntriesK1andK2( "vm2" )); + vm2.invoke(() -> InterestListDUnitTest.put( "vm2" )); Wait.pause(10000); - vm1.invoke(InterestListDUnitTest.class, "validateEntriesK1andK2", - new Object[] { "vm1" }); + vm1.invoke(() -> InterestListDUnitTest.validateEntriesK1andK2( "vm1" )); - vm1.invoke(InterestListDUnitTest.class, "unregisterKey", - new Object[] { key1 }); - vm2.invoke(InterestListDUnitTest.class, "unregisterKey", - new Object[] { key2 }); + vm1.invoke(() -> InterestListDUnitTest.unregisterKey( key1 )); + vm2.invoke(() -> InterestListDUnitTest.unregisterKey( key2 )); - vm1.invoke(InterestListDUnitTest.class, "putAgain", new Object[] { "vm1" }); + vm1.invoke(() -> InterestListDUnitTest.putAgain( "vm1" )); Wait.pause(10000); - vm2.invoke(InterestListDUnitTest.class, "validateEntriesAgain", - new Object[] { "vm2" }); - vm2.invoke(InterestListDUnitTest.class, "putAgain", new Object[] { "vm2" }); + vm2.invoke(() -> InterestListDUnitTest.validateEntriesAgain( "vm2" )); + vm2.invoke(() -> InterestListDUnitTest.putAgain( "vm2" )); Wait.pause(10000); - vm1.invoke(InterestListDUnitTest.class, "validateEntriesAgain", - new Object[] { "vm1" }); + vm1.invoke(() -> InterestListDUnitTest.validateEntriesAgain( "vm1" )); } /** @@ -231,53 +223,39 @@ public void testValueRefresh() { // Initialization - vm1.invoke(InterestListDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1)}); - vm2.invoke(InterestListDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1)}); + vm1.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1))); + vm2.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1))); - vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); - vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); + vm1.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); + vm2.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); // STEP 1 - vm2.invoke(InterestListDUnitTest.class, "putSingleEntry", - new Object[] { key2, "vm2" }); + vm2.invoke(() -> InterestListDUnitTest.putSingleEntry( key2, "vm2" )); Wait.pause(2000); - vm1.invoke(InterestListDUnitTest.class, "validateSingleEntry", - new Object[] {key2, key2_originalValue}); + vm1.invoke(() -> InterestListDUnitTest.validateSingleEntry(key2, key2_originalValue)); // STEP 2 // Force key2 to synchronize with server cache - vm1.invoke(InterestListDUnitTest.class, "registerKey", - new Object[] { key2 }); + vm1.invoke(() -> InterestListDUnitTest.registerKey( key2 )); // Verify that new value is present - vm1.invoke(InterestListDUnitTest.class, "validateSingleEntry", - new Object[] {key2, "vm2"}); // value now magically changed + vm1.invoke(() -> InterestListDUnitTest.validateSingleEntry(key2, "vm2")); // value now magically changed // but the other key should not have changed - vm1.invoke(InterestListDUnitTest.class, "validateSingleEntry", - new Object[] {key1, key1_originalValue}); // still unchanged + vm1.invoke(() -> InterestListDUnitTest.validateSingleEntry(key1, key1_originalValue)); // still unchanged // STEP 3 - vm1.invoke(InterestListDUnitTest.class, "putSingleEntry", - new Object[] { key1, "vm1" }); + vm1.invoke(() -> InterestListDUnitTest.putSingleEntry( key1, "vm1" )); Wait.pause(2000); - vm2.invoke(InterestListDUnitTest.class, "validateSingleEntry", - new Object[] {key1, key1_originalValue}); // still unchanged - vm2.invoke(InterestListDUnitTest.class, "registerKey", - new Object[] { key1 }); + vm2.invoke(() -> InterestListDUnitTest.validateSingleEntry(key1, key1_originalValue)); // still unchanged + vm2.invoke(() -> InterestListDUnitTest.registerKey( key1 )); // Verify that new value is present - vm2.invoke(InterestListDUnitTest.class, "validateSingleEntry", - new Object[] {key1, "vm1"}); // value now magically changed + vm2.invoke(() -> InterestListDUnitTest.validateSingleEntry(key1, "vm1")); // value now magically changed // STEP 4 // unregister on one key - vm2.invoke(InterestListDUnitTest.class, "unregisterKey", - new Object[] { key1 }); - vm1.invoke(InterestListDUnitTest.class, "putSingleEntry", - new Object[] { key1, key1_originalValue }); + vm2.invoke(() -> InterestListDUnitTest.unregisterKey( key1 )); + vm1.invoke(() -> InterestListDUnitTest.putSingleEntry( key1, key1_originalValue )); Wait.pause(2000); - vm2.invoke(InterestListDUnitTest.class, "validateSingleEntry", - new Object[] {key1, "vm1"}); // update lost + vm2.invoke(() -> InterestListDUnitTest.validateSingleEntry(key1, "vm1")); // update lost } /** @@ -289,19 +267,19 @@ public void testValueRefresh() public void testInterestListRegistration_ALL_KEYS() { - vm1.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); - vm2.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); + vm1.invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1))); + vm2.invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1))); - vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); - vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); + vm1.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); + vm2.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); - vm2.invoke(InterestListDUnitTest.class, "registerALL_KEYS"); + vm2.invoke(() -> InterestListDUnitTest.registerALL_KEYS()); - vm1.invoke(InterestListDUnitTest.class, "put_ALL_KEYS"); + vm1.invoke(() -> InterestListDUnitTest.put_ALL_KEYS()); Wait.pause(10000); - vm2.invoke(InterestListDUnitTest.class, "validate_ALL_KEYS"); + vm2.invoke(() -> InterestListDUnitTest.validate_ALL_KEYS()); } /** @@ -316,23 +294,21 @@ public void testInterestListRegistration_ALL_KEYS() public void testInitializationOfRegionFromInterestList() { // directly put on server - vm0.invoke(InterestListDUnitTest.class, "multiple_put"); + vm0.invoke(() -> InterestListDUnitTest.multiple_put()); Wait.pause(1000); // create clients to connect to that server - vm1.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); - vm2.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1)}); + vm1.invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1))); + vm2.invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1))); // register interest - vm1.invoke(InterestListDUnitTest.class, "registerKeys"); - vm2.invoke(InterestListDUnitTest.class, "registerKeysAgain"); + vm1.invoke(() -> InterestListDUnitTest.registerKeys()); + vm2.invoke(() -> InterestListDUnitTest.registerKeysAgain()); Wait.pause(10000); // verify the values for registered keys - vm1.invoke(InterestListDUnitTest.class, - "validateRegionEntriesFromInterestListInVm1"); - vm2.invoke(InterestListDUnitTest.class, - "validateRegionEntriesFromInterestListInVm2"); + vm1.invoke(() -> InterestListDUnitTest.validateRegionEntriesFromInterestListInVm1()); + vm2.invoke(() -> InterestListDUnitTest.validateRegionEntriesFromInterestListInVm2()); } @@ -357,52 +333,44 @@ public void testInterestListRegistrationOnServer() { DistributedMember c1 = (DistributedMember)vm1 - .invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), PORT1}); + .invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), PORT1)); DistributedMember c2 = (DistributedMember)vm2 - .invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), PORT1}); + .invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), PORT1)); - vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); - vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); + vm1.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); + vm2.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); - vm0.invoke(InterestListDUnitTest.class, "registerKeyForClient", - new Object[] { c1, key1 }); - vm0.invoke(InterestListDUnitTest.class, "registerKeyForClient", - new Object[] { c2, key2 }); + vm0.invoke(() -> InterestListDUnitTest.registerKeyForClient( c1, key1 )); + vm0.invoke(() -> InterestListDUnitTest.registerKeyForClient( c2, key2 )); - vm0.invoke(InterestListDUnitTest.class, "flushQueues"); + vm0.invoke(() -> InterestListDUnitTest.flushQueues()); - vm1.invoke(InterestListDUnitTest.class, "put", new Object[] { "vm1" }); + vm1.invoke(() -> InterestListDUnitTest.put( "vm1" )); - vm0.invoke(InterestListDUnitTest.class, "flushQueues"); + vm0.invoke(() -> InterestListDUnitTest.flushQueues()); - vm2.invoke(InterestListDUnitTest.class, "validateEntriesK1andK2", - new Object[] { "vm2" }); - vm2.invoke(InterestListDUnitTest.class, "put", new Object[] { "vm2" }); + vm2.invoke(() -> InterestListDUnitTest.validateEntriesK1andK2( "vm2" )); + vm2.invoke(() -> InterestListDUnitTest.put( "vm2" )); - vm0.invoke(InterestListDUnitTest.class, "flushQueues"); + vm0.invoke(() -> InterestListDUnitTest.flushQueues()); - vm1.invoke(InterestListDUnitTest.class, "validateEntriesK1andK2", - new Object[] { "vm1" }); + vm1.invoke(() -> InterestListDUnitTest.validateEntriesK1andK2( "vm1" )); - vm0.invoke(InterestListDUnitTest.class, "unregisterKeyForClient", - new Object[] { c1, key1 }); - vm0.invoke(InterestListDUnitTest.class, "unregisterKeyForClient", - new Object[] { c2, key2 }); + vm0.invoke(() -> InterestListDUnitTest.unregisterKeyForClient( c1, key1 )); + vm0.invoke(() -> InterestListDUnitTest.unregisterKeyForClient( c2, key2 )); - vm1.invoke(InterestListDUnitTest.class, "putAgain", new Object[] { "vm1" }); + vm1.invoke(() -> InterestListDUnitTest.putAgain( "vm1" )); - vm0.invoke(InterestListDUnitTest.class, "flushQueues"); + vm0.invoke(() -> InterestListDUnitTest.flushQueues()); - vm2.invoke(InterestListDUnitTest.class, "validateEntriesAgain", - new Object[] { "vm2" }); - vm2.invoke(InterestListDUnitTest.class, "putAgain", new Object[] { "vm2" }); + vm2.invoke(() -> InterestListDUnitTest.validateEntriesAgain( "vm2" )); + vm2.invoke(() -> InterestListDUnitTest.putAgain( "vm2" )); - vm0.invoke(InterestListDUnitTest.class, "flushQueues"); + vm0.invoke(() -> InterestListDUnitTest.flushQueues()); - vm1.invoke(InterestListDUnitTest.class, "validateEntriesAgain", - new Object[] { "vm1" }); + vm1.invoke(() -> InterestListDUnitTest.validateEntriesAgain( "vm1" )); } /** @@ -423,69 +391,57 @@ public void testInterestRegistrationListeners() { } addRegisterInterestListener(); - vm0.invoke(InterestListDUnitTest.class, "addRegisterInterestListener"); + vm0.invoke(() -> InterestListDUnitTest.addRegisterInterestListener()); // servers are set up, now do the clients DistributedMember c1 = (DistributedMember)vm1 - .invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), PORT1, port2}); + .invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), PORT1, port2)); DistributedMember c2 = (DistributedMember)vm2 - .invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), PORT1, port2}); + .invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), PORT1, port2)); - vm1.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); - vm2.invoke(InterestListDUnitTest.class, "createEntriesK1andK2"); + vm1.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); + vm2.invoke(() -> InterestListDUnitTest.createEntriesK1andK2()); // interest registration from clients should cause listeners to be invoked // in both servers LogWriterUtils.getLogWriter().info("test phase 1"); - vm1.invoke(InterestListDUnitTest.class, "registerKey", - new Object[] { key1 }); - vm2.invoke(InterestListDUnitTest.class, "registerKey", - new Object[] { key2 }); + vm1.invoke(() -> InterestListDUnitTest.registerKey( key1 )); + vm2.invoke(() -> InterestListDUnitTest.registerKey( key2 )); Integer zero = new Integer(0); Integer two = new Integer(2); interestListener.verifyCountsAndClear(2, 0); - vm0.invoke(InterestListDUnitTest.class, "verifyCountsAndClear", - new Object[]{ two, zero }); + vm0.invoke(() -> InterestListDUnitTest.verifyCountsAndClear( two, zero )); // unregistration from clients should invoke listeners on both servers LogWriterUtils.getLogWriter().info("test phase 2"); - vm1.invoke(InterestListDUnitTest.class, "unregisterKey", - new Object[] { key1 }); - vm2.invoke(InterestListDUnitTest.class, "unregisterKey", - new Object[] { key2 }); + vm1.invoke(() -> InterestListDUnitTest.unregisterKey( key1 )); + vm2.invoke(() -> InterestListDUnitTest.unregisterKey( key2 )); interestListener.verifyCountsAndClear(0, 2); - vm0.invoke(InterestListDUnitTest.class, "verifyCountsAndClear", - new Object[]{ zero, two }); + vm0.invoke(() -> InterestListDUnitTest.verifyCountsAndClear( zero, two )); // now the primary server for eache client will register and unregister LogWriterUtils.getLogWriter().info("test phase 3"); registerKeyForClient(c1, key1); - vm0.invoke(InterestListDUnitTest.class, "registerKeyForClient", - new Object[] { c1, key1 }); + vm0.invoke(() -> InterestListDUnitTest.registerKeyForClient( c1, key1 )); registerKeyForClient(c2, key2); - vm0.invoke(InterestListDUnitTest.class, "registerKeyForClient", - new Object[] { c2, key2 }); + vm0.invoke(() -> InterestListDUnitTest.registerKeyForClient( c2, key2 )); interestListener.verifyCountsAndClear(2, 0); - vm0.invoke(InterestListDUnitTest.class, "verifyCountsAndClear", - new Object[]{ two, zero }); + vm0.invoke(() -> InterestListDUnitTest.verifyCountsAndClear( two, zero )); LogWriterUtils.getLogWriter().info("test phase 4"); unregisterKeyForClient(c1, key1); - vm0.invoke(InterestListDUnitTest.class, "unregisterKeyForClient", - new Object[] { c1, key1 }); + vm0.invoke(() -> InterestListDUnitTest.unregisterKeyForClient( c1, key1 )); unregisterKeyForClient(c2, key2); - vm0.invoke(InterestListDUnitTest.class, "unregisterKeyForClient", - new Object[] { c2, key2 }); + vm0.invoke(() -> InterestListDUnitTest.unregisterKeyForClient( c2, key2 )); interestListener.verifyCountsAndClear(0, 2); - vm0.invoke(InterestListDUnitTest.class, "verifyCountsAndClear", - new Object[]{ zero, two }); + vm0.invoke(() -> InterestListDUnitTest.verifyCountsAndClear( zero, two )); } /** @@ -495,21 +451,17 @@ public void testInterestRegistrationListeners() { public void testNoAvailableServer() { // Register interest in key1. - vm1.invoke(InterestListDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1) }); - vm1.invoke(InterestListDUnitTest.class, "registerKey", - new Object[] { key1 }); + vm1.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1) )); + vm1.invoke(() -> InterestListDUnitTest.registerKey( key1 )); // Stop the server. - vm0.invoke(InterestListDUnitTest.class, "closeCache"); + vm0.invoke(() -> InterestListDUnitTest.closeCache()); // Try to unregister interest in key1 -- should not throw an exception. - vm1.invoke(InterestListDUnitTest.class, "unregisterKeyEx", - new Object[] { key1 }); + vm1.invoke(() -> InterestListDUnitTest.unregisterKeyEx( key1 )); // Now try registration of interest in key2 -- should throw an exception. - vm1.invoke(InterestListDUnitTest.class, "registerKeyEx", - new Object[] { key2 }); + vm1.invoke(() -> InterestListDUnitTest.registerKeyEx( key2 )); } public void testRegisterInterestOnReplicatedRegionWithCacheLoader() { @@ -522,39 +474,39 @@ public void testRegisterInterestOnPartitionedRegionWithCacheLoader() { private void runRegisterInterestWithCacheLoaderTest(boolean addReplicatedRegion) { // Stop the server (since it was already started with a replicated region) - vm0.invoke(InterestListDUnitTest.class, "closeCache"); + vm0.invoke(() -> InterestListDUnitTest.closeCache()); // Start two servers with the appropriate region - int port1 = ((Integer) vm0.invoke(InterestListDUnitTest.class, "createServerCache", new Object[] { addReplicatedRegion })).intValue(); + int port1 = ((Integer) vm0.invoke(() -> InterestListDUnitTest.createServerCache( addReplicatedRegion ))).intValue(); VM server2VM = Host.getHost(0).getVM(3); - int port2 = ((Integer) server2VM.invoke(InterestListDUnitTest.class, "createServerCache", new Object[] { addReplicatedRegion })).intValue(); + int port2 = ((Integer) server2VM.invoke(() -> InterestListDUnitTest.createServerCache( addReplicatedRegion ))).intValue(); // Add a cache loader to the region in both cache servers - vm0.invoke(InterestListDUnitTest.class, "addCacheLoader"); - server2VM.invoke(InterestListDUnitTest.class, "addCacheLoader"); + vm0.invoke(() -> InterestListDUnitTest.addCacheLoader()); + server2VM.invoke(() -> InterestListDUnitTest.addCacheLoader()); // Create client cache - vm1.invoke(InterestListDUnitTest.class, "createClientCache",new Object[] { - NetworkUtils.getServerHostName(vm0.getHost()), port1, port2}); + vm1.invoke(() -> InterestListDUnitTest.createClientCache( + NetworkUtils.getServerHostName(vm0.getHost()), port1, port2)); // Register interest in all keys - vm1.invoke(InterestListDUnitTest.class, "registerALL_KEYS"); + vm1.invoke(() -> InterestListDUnitTest.registerALL_KEYS()); // Add CacheListener int numEvents = 100; - vm1.invoke(InterestListDUnitTest.class, "addCacheListener", new Object[] {numEvents}); + vm1.invoke(() -> InterestListDUnitTest.addCacheListener(numEvents)); // Do gets on the client - vm1.invoke(InterestListDUnitTest.class, "doGets", new Object[] {numEvents}); + vm1.invoke(() -> InterestListDUnitTest.doGets(numEvents)); // Wait for cache listener create events - vm1.invoke(InterestListDUnitTest.class, "waitForCacheListenerCreates"); + vm1.invoke(() -> InterestListDUnitTest.waitForCacheListenerCreates()); // Confirm there are no cache listener update events - vm1.invoke(InterestListDUnitTest.class, "confirmNoCacheListenerUpdates"); + vm1.invoke(() -> InterestListDUnitTest.confirmNoCacheListenerUpdates()); // Confirm there are no cache listener invalidate events - vm1.invoke(InterestListDUnitTest.class, "confirmNoCacheListenerInvalidates"); + vm1.invoke(() -> InterestListDUnitTest.confirmNoCacheListenerInvalidates()); } private void createCache(Properties props) throws Exception @@ -1080,10 +1032,10 @@ public static void validateEntriesAgain(String vm) @Override protected final void preTearDown() throws Exception { // close the clients first - vm1.invoke(InterestListDUnitTest.class, "closeCache"); - vm2.invoke(InterestListDUnitTest.class, "closeCache"); + vm1.invoke(() -> InterestListDUnitTest.closeCache()); + vm2.invoke(() -> InterestListDUnitTest.closeCache()); // then close the servers - vm0.invoke(InterestListDUnitTest.class, "closeCache"); + vm0.invoke(() -> InterestListDUnitTest.closeCache()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java index b8db84416c60..5f166887562c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java @@ -110,8 +110,8 @@ public void setUp() throws Exception { // then create client Wait.pause(5000); // [bruce] avoid ConnectException - client1.invoke(impl.getClass(), "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)}); + client1.invoke(() -> impl.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2))); } @@ -133,14 +133,14 @@ private void createCache(Properties props) throws Exception */ public void testDirectPutOnServer() { - client1.invoke(impl.getClass(), "createEntriesK1andK2"); - server1.invoke(impl.getClass(), "createEntriesK1andK2"); - server2.invoke(impl.getClass(), "createEntriesK1andK2"); + client1.invoke(() -> impl.createEntriesK1andK2()); + server1.invoke(() -> impl.createEntriesK1andK2()); + server2.invoke(() -> impl.createEntriesK1andK2()); - client1.invoke(impl.getClass(), "registerKey1"); + client1.invoke(() -> impl.registerKey1()); //directly put on server - server1.invoke(impl.getClass(), "put"); - client1.invoke(impl.getClass(), "verifyPut"); + server1.invoke(() -> impl.put()); + client1.invoke(() -> impl.verifyPut()); } /** * put on non interest list ep and verify updates @@ -148,30 +148,30 @@ public void testDirectPutOnServer() */ public void testInterestListEndpoint() { - client1.invoke(impl.getClass(), "createEntriesK1andK2"); - server2.invoke(impl.getClass(), "createEntriesK1andK2"); // server - server1.invoke(impl.getClass(), "createEntriesK1andK2"); // server + client1.invoke(() -> impl.createEntriesK1andK2()); + server2.invoke(() -> impl.createEntriesK1andK2()); // server + server1.invoke(() -> impl.createEntriesK1andK2()); // server - client1.invoke(impl.getClass(), "registerKey1"); + client1.invoke(() -> impl.registerKey1()); - server1.invoke(impl.getClass(), "verifyIfNotInterestListEndpointAndThenPut"); - server2.invoke(impl.getClass(), "verifyIfNotInterestListEndpointAndThenPut"); - client1.invoke(impl.getClass(), "verifyPut"); + server1.invoke(() -> impl.verifyIfNotInterestListEndpointAndThenPut()); + server2.invoke(() -> impl.verifyIfNotInterestListEndpointAndThenPut()); + client1.invoke(() -> impl.verifyPut()); } public void testInterestListEndpointAfterFailover() throws Exception { final long maxWaitTime = 20000; - client1.invoke(impl.getClass(), "createEntriesK1andK2"); - server2.invoke(impl.getClass(), "createEntriesK1andK2"); - server1.invoke(impl.getClass(), "createEntriesK1andK2"); + client1.invoke(() -> impl.createEntriesK1andK2()); + server2.invoke(() -> impl.createEntriesK1andK2()); + server1.invoke(() -> impl.createEntriesK1andK2()); - client1.invoke(impl.getClass(), "registerKey1"); + client1.invoke(() -> impl.registerKey1()); boolean firstIsPrimary = isVm0Primary(); VM primary = firstIsPrimary? server1 : server2; - primary.invoke(impl.getClass(), "stopILEndpointServer"); + primary.invoke(() -> impl.stopILEndpointServer()); Wait.pause(5000); //Since the loadbalancing policy is roundrobin & there are two servers so @@ -210,13 +210,13 @@ public String description() { }); //put on stopped server - primary.invoke(impl.getClass(), "put"); - client1.invoke(impl.getClass(), "verifyPut"); + primary.invoke(() -> impl.put()); + client1.invoke(() -> impl.verifyPut()); } public static boolean isVm0Primary() throws Exception { - int port = ((Integer)client1.invoke(impl.getClass(), "getPrimaryPort")).intValue(); + int port = ((Integer)client1.invoke(() -> impl.getPrimaryPort())).intValue(); return port == PORT1; } @@ -232,9 +232,9 @@ public static int getPrimaryPort() throws Exception { public void testUpdaterThreadIsAliveForFailedEndPoint(){ - client1.invoke(impl.getClass(), "acquirePoolConnection"); - client1.invoke(impl.getClass(), "processException"); - client1.invoke(impl.getClass(), "verifyUpdaterThreadIsAlive"); + client1.invoke(() -> impl.acquirePoolConnection()); + client1.invoke(() -> impl.processException()); + client1.invoke(() -> impl.verifyUpdaterThreadIsAlive()); } public static void acquirePoolConnection() @@ -493,9 +493,9 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { // Close client cache first, then server caches - client1.invoke(impl.getClass(), "closeCache"); - server2.invoke(impl.getClass(), "closeCache"); - server1.invoke(impl.getClass(), "closeCache"); + client1.invoke(() -> impl.closeCache()); + server2.invoke(() -> impl.closeCache()); + server1.invoke(() -> impl.closeCache()); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java index d5e32bdb717c..34073c244f47 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java @@ -86,22 +86,18 @@ public void setUp() throws Exception { public void createServersAndClients(int redundancyLevel) { final Host host = Host.getHost(0); // start servers first - PORT1 = ((Integer)vm0.invoke(CacheServerTestUtil.class, - "createCacheServer", - new Object[] {REGION_NAME, new Boolean(true)})) + PORT1 = ((Integer)vm0.invoke(() -> CacheServerTestUtil.createCacheServer(REGION_NAME, new Boolean(true)))) .intValue(); - PORT2 = ((Integer)vm3.invoke(CacheServerTestUtil.class, - "createCacheServer", - new Object[] {REGION_NAME, new Boolean(true)})) + PORT2 = ((Integer)vm3.invoke(() -> CacheServerTestUtil.createCacheServer(REGION_NAME, new Boolean(true)))) .intValue(); - vm1.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints"); - vm2.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints"); - vm1.invoke(CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkUtils.getServerHostName(host),redundancyLevel), REGION_NAME }); - vm2.invoke(CacheServerTestUtil.class, "createCacheClient", new Object[] { - getClientPool(NetworkUtils.getServerHostName(host),0), REGION_NAME }); + vm1.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints()); + vm2.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints()); + vm1.invoke(() -> CacheServerTestUtil.createCacheClient( + getClientPool(NetworkUtils.getServerHostName(host),redundancyLevel), REGION_NAME )); + vm2.invoke(() -> CacheServerTestUtil.createCacheClient( + getClientPool(NetworkUtils.getServerHostName(host),0), REGION_NAME )); } /** @@ -132,24 +128,24 @@ public void testInterestListRecoveryNonHA() public void doTestInterestListRecovery(int redundancyLevel) { createServersAndClients(redundancyLevel); - vm1.invoke(InterestListFailoverDUnitTest.class, "createEntries"); - vm2.invoke(InterestListFailoverDUnitTest.class, "createEntries"); - vm0.invoke(InterestListFailoverDUnitTest.class, "createEntries"); - Integer primaryPort = (Integer)vm1.invoke(InterestListFailoverDUnitTest.class, "registerInterestList"); + vm1.invoke(() -> InterestListFailoverDUnitTest.createEntries()); + vm2.invoke(() -> InterestListFailoverDUnitTest.createEntries()); + vm0.invoke(() -> InterestListFailoverDUnitTest.createEntries()); + Integer primaryPort = (Integer)vm1.invoke(() -> InterestListFailoverDUnitTest.registerInterestList()); VM primaryVM; if (primaryPort.intValue() == PORT1) { primaryVM = vm0; } else { primaryVM = vm3; } - vm2.invoke(InterestListFailoverDUnitTest.class, "putA"); + vm2.invoke(() -> InterestListFailoverDUnitTest.putA()); // pause(10000); - vm1.invoke(InterestListFailoverDUnitTest.class, "validateEntriesA"); - primaryVM.invoke(InterestListFailoverDUnitTest.class, "stopServer"); + vm1.invoke(() -> InterestListFailoverDUnitTest.validateEntriesA()); + primaryVM.invoke(() -> InterestListFailoverDUnitTest.stopServer()); //pause(10000); - vm2.invoke(InterestListFailoverDUnitTest.class, "putB"); + vm2.invoke(() -> InterestListFailoverDUnitTest.putB()); //(10000); - vm1.invoke(InterestListFailoverDUnitTest.class, "validateEntriesB"); + vm1.invoke(() -> InterestListFailoverDUnitTest.validateEntriesB()); } public static void createEntries() @@ -309,11 +305,11 @@ protected final void preTearDown() throws Exception { public void closeAll() { // close the clients first - vm1.invoke(CacheServerTestUtil.class, "closeCache"); - vm2.invoke(CacheServerTestUtil.class, "closeCache"); + vm1.invoke(() -> CacheServerTestUtil.closeCache()); + vm2.invoke(() -> CacheServerTestUtil.closeCache()); // then close the servers - vm0.invoke(CacheServerTestUtil.class, "closeCache"); - vm3.invoke(CacheServerTestUtil.class, "closeCache"); + vm0.invoke(() -> CacheServerTestUtil.closeCache()); + vm3.invoke(() -> CacheServerTestUtil.closeCache()); CacheServerTestUtil.closeCache(); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java index 19e7e16ee6f1..8beb5a027a63 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java @@ -97,8 +97,8 @@ public void setUp() throws Exception { server1 = host.getVM(0); server2 = host.getVM(1); //start servers first - PORT1 = ((Integer)server1.invoke(InterestListRecoveryDUnitTest.class, "createServerCache" )).intValue(); - PORT2 = ((Integer)server2.invoke(InterestListRecoveryDUnitTest.class, "createServerCache" )).intValue(); + PORT1 = ((Integer)server1.invoke(() -> InterestListRecoveryDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)server2.invoke(() -> InterestListRecoveryDUnitTest.createServerCache())).intValue(); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("server1 port is " + String.valueOf(PORT1)); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("server2 port is " + String.valueOf(PORT2)); @@ -110,7 +110,7 @@ public void setUp() throws Exception { public void XtestKeyInterestRecoveryWhileServerFailover() throws Exception { createEntries(); - server1.invoke(InterestListRecoveryDUnitTest.class, "createEntries"); + server1.invoke(() -> InterestListRecoveryDUnitTest.createEntries()); registerK1toK5(); setServerUnavailable("localhost"+PORT1); Wait.pause(20000); @@ -119,7 +119,7 @@ public void XtestKeyInterestRecoveryWhileServerFailover() throws Exception Wait.pause(20000); setServerUnavailable("localhost"+PORT2); Wait.pause(20000); - server1.invoke(InterestListRecoveryDUnitTest.class, "verifyUnregisterK1toK3"); + server1.invoke(() -> InterestListRecoveryDUnitTest.verifyUnregisterK1toK3()); } @@ -129,8 +129,8 @@ public void testKeyInterestRecoveryWhileProcessException() throws Exception { LogWriter logger = system.getLogWriter(); createEntries(); - server2.invoke(InterestListRecoveryDUnitTest.class, "createEntries"); - server1.invoke(InterestListRecoveryDUnitTest.class, "createEntries"); + server2.invoke(() -> InterestListRecoveryDUnitTest.createEntries()); + server1.invoke(() -> InterestListRecoveryDUnitTest.createEntries()); registerK1toK5(); logger.fine("After registerK1toK5"); @@ -147,7 +147,7 @@ public void testKeyInterestRecoveryWhileProcessException() throws Exception { logger.fine("serverFirstRegistered is server2 and serverSecondRegistered is server1"); } verifyDeadAndLiveServers(0,2); - serverFirstRegistered.invoke(InterestListRecoveryDUnitTest.class, "verifyRegionToProxyMapForFullRegistration"); + serverFirstRegistered.invoke(() -> InterestListRecoveryDUnitTest.verifyRegionToProxyMapForFullRegistration()); logger.fine("After verifyRegionToProxyMapForFullRegistration on serverFirstRegistered"); logger.info("" + SocketException.class.getName() + ""); @@ -155,17 +155,17 @@ public void testKeyInterestRecoveryWhileProcessException() throws Exception { + EOFException.class.getName() + ""); killCurrentEndpoint(); logger.fine("After killCurrentEndpoint1"); - serverSecondRegistered.invoke(InterestListRecoveryDUnitTest.class, "verifyRegionToProxyMapForFullRegistrationRetry"); + serverSecondRegistered.invoke(() -> InterestListRecoveryDUnitTest.verifyRegionToProxyMapForFullRegistrationRetry()); logger.fine("After verifyRegionToProxyMapForFullRegistration on serverSecondRegistered"); unregisterK1toK3(); - serverSecondRegistered.invoke(InterestListRecoveryDUnitTest.class, "verifyRegisterK4toK5Retry"); + serverSecondRegistered.invoke(() -> InterestListRecoveryDUnitTest.verifyRegisterK4toK5Retry()); logger.fine("After verifyRegisterK4toK5Retry on serverSecondRegistered"); } private boolean isInterestListRegisteredToServer1() { /* try { - server1.invoke(InterestListRecoveryDUnitTest.class, "verifyRegionToProxyMapForFullRegistration"); + server1.invoke(() -> InterestListRecoveryDUnitTest.verifyRegionToProxyMapForFullRegistration()); } catch (Throwable t) { // Means its registered on server2. return false; @@ -484,10 +484,10 @@ public static Set getKeysOfInterestMap(CacheClientProxy proxy, String regionName @Override protected final void preTearDown() throws Exception { // close the clients first - server2.invoke(InterestListRecoveryDUnitTest.class, "closeCache"); + server2.invoke(() -> InterestListRecoveryDUnitTest.closeCache()); closeCache(); // then close the servers - server1.invoke(InterestListRecoveryDUnitTest.class, "closeCache"); + server1.invoke(() -> InterestListRecoveryDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java index f122fe65a2f1..66b33fa3d997 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java @@ -258,10 +258,10 @@ public void testDurableClientExit_ClientExpressedInterest() throws Exception { VM clientVM_2 = host.getVM(2); VM clientVM_3 = host.getVM(3); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "setUpServerVMTask"); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "createServerTask"); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.setUpServerVMTask()); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.createServerTask()); - Object array[] = (Object[])serverVM.invoke(InterestRegrListenerDUnitTest.class, "getCacheServerEndPointTask"); + Object array[] = (Object[])serverVM.invoke(() -> InterestRegrListenerDUnitTest.getCacheServerEndPointTask()); String hostName = (String)array[0]; int port = (Integer) array[1]; Object params[] = new Object[4]; @@ -283,22 +283,22 @@ public void testDurableClientExit_ClientExpressedInterest() throws Exception { params = new Object[1]; params[0] = true; - serverVM.invoke(InterestRegrListenerDUnitTest.class, "doRegisterListenerTask"); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.doRegisterListenerTask()); clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionRegisterInterestTask", params); clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionRegisterInterestTask", params); clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionRegisterInterestTask", params); - clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionPutTask"); - clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionPutTask"); - clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionPutTask"); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "doServerRegionPutTask"); + clientVM_1.invoke(() -> InterestRegrListenerDUnitTest.doClientRegionPutTask()); + clientVM_2.invoke(() -> InterestRegrListenerDUnitTest.doClientRegionPutTask()); + clientVM_3.invoke(() -> InterestRegrListenerDUnitTest.doClientRegionPutTask()); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.doServerRegionPutTask()); - clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{true}); - clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{true}); - clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{true}); + clientVM_1.invoke(() -> InterestRegrListenerDUnitTest.closeClientCacheTask(true)); + clientVM_2.invoke(() -> InterestRegrListenerDUnitTest.closeClientCacheTask(true)); + clientVM_3.invoke(() -> InterestRegrListenerDUnitTest.closeClientCacheTask(true)); Thread.sleep(2); - Map listnerMap = (Map) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); + Map listnerMap = (Map) serverVM.invoke(() -> InterestRegrListenerDUnitTest.getListenerMapTask()); LogWriterUtils.getLogWriter().info("Listener Map " + listnerMap); int registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); int unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); @@ -306,13 +306,13 @@ public void testDurableClientExit_ClientExpressedInterest() throws Exception { assertEquals(0, unregisterCount); LogWriterUtils.getLogWriter().info("Sleeping till durable client queue are expired and unregister event is called on to listener"); Thread.sleep((DURABLE_CLIENT_TIMEOUT+5)*1000); - listnerMap = (Map) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); + listnerMap = (Map) serverVM.invoke(() -> InterestRegrListenerDUnitTest.getListenerMapTask()); LogWriterUtils.getLogWriter().info("Listener Map after sleeping " + listnerMap); registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); assertEquals(3, registerCount); assertEquals(3, unregisterCount); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "closeCacheTask"); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.closeCacheTask()); } @@ -323,10 +323,10 @@ public void testDurableClientExit_ServerExpressedInterest() throws Exception { VM clientVM_2 = host.getVM(2); VM clientVM_3 = host.getVM(3); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "setUpServerVMTask"); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "createServerTask"); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.setUpServerVMTask()); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.createServerTask()); - Object array[] = (Object[])serverVM.invoke(InterestRegrListenerDUnitTest.class, "getCacheServerEndPointTask"); + Object array[] = (Object[])serverVM.invoke(() -> InterestRegrListenerDUnitTest.getCacheServerEndPointTask()); String hostName = (String)array[0]; int port = (Integer) array[1]; Object params[] = new Object[4]; @@ -348,19 +348,19 @@ public void testDurableClientExit_ServerExpressedInterest() throws Exception { params = new Object[1]; params[0] = true; - serverVM.invoke(InterestRegrListenerDUnitTest.class, "doRegisterListenerTask"); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.doRegisterListenerTask()); serverVM.invoke(InterestRegrListenerDUnitTest.class, "doExpressInterestOnServerTask", params); - clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionPutTask"); - clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionPutTask"); - clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionPutTask"); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "doServerRegionPutTask"); + clientVM_1.invoke(() -> InterestRegrListenerDUnitTest.doClientRegionPutTask()); + clientVM_2.invoke(() -> InterestRegrListenerDUnitTest.doClientRegionPutTask()); + clientVM_3.invoke(() -> InterestRegrListenerDUnitTest.doClientRegionPutTask()); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.doServerRegionPutTask()); - clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{true}); - clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{true}); - clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{true}); + clientVM_1.invoke(() -> InterestRegrListenerDUnitTest.closeClientCacheTask(true)); + clientVM_2.invoke(() -> InterestRegrListenerDUnitTest.closeClientCacheTask(true)); + clientVM_3.invoke(() -> InterestRegrListenerDUnitTest.closeClientCacheTask(true)); Thread.sleep(2); - Map listnerMap = (Map) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); + Map listnerMap = (Map) serverVM.invoke(() -> InterestRegrListenerDUnitTest.getListenerMapTask()); LogWriterUtils.getLogWriter().info("Listener Map " + listnerMap); int registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); int unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); @@ -368,13 +368,13 @@ public void testDurableClientExit_ServerExpressedInterest() throws Exception { assertEquals(0, unregisterCount); LogWriterUtils.getLogWriter().info("Sleeping till durable client queue are expired and unregister event is called on to listener"); Thread.sleep((DURABLE_CLIENT_TIMEOUT+5)*1000); - listnerMap = (Map) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); + listnerMap = (Map) serverVM.invoke(() -> InterestRegrListenerDUnitTest.getListenerMapTask()); LogWriterUtils.getLogWriter().info("Listener Map after sleeping " + listnerMap); registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); assertEquals(3, registerCount); assertEquals(3, unregisterCount); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "closeCacheTask"); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.closeCacheTask()); } @@ -387,10 +387,10 @@ public void testDurableClientExit_ServerExpressedInterest_NonDurableInterest() t final VM clientVM_2 = host.getVM(2); final VM clientVM_3 = host.getVM(3); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "setUpServerVMTask"); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "createServerTask"); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.setUpServerVMTask()); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.createServerTask()); - Object array[] = (Object[])serverVM.invoke(InterestRegrListenerDUnitTest.class, "getCacheServerEndPointTask"); + Object array[] = (Object[])serverVM.invoke(() -> InterestRegrListenerDUnitTest.getCacheServerEndPointTask()); String hostName = (String)array[0]; int port = (Integer) array[1]; Object params[] = new Object[4]; @@ -413,17 +413,17 @@ public void testDurableClientExit_ServerExpressedInterest_NonDurableInterest() t params = new Object[1]; params[0] = false; //non-durable interest - serverVM.invoke(InterestRegrListenerDUnitTest.class, "doRegisterListenerTask"); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.doRegisterListenerTask()); serverVM.invoke(InterestRegrListenerDUnitTest.class, "doExpressInterestOnServerTask", params); - clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionPutTask"); - clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionPutTask"); - clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "doClientRegionPutTask"); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "doServerRegionPutTask"); + clientVM_1.invoke(() -> InterestRegrListenerDUnitTest.doClientRegionPutTask()); + clientVM_2.invoke(() -> InterestRegrListenerDUnitTest.doClientRegionPutTask()); + clientVM_3.invoke(() -> InterestRegrListenerDUnitTest.doClientRegionPutTask()); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.doServerRegionPutTask()); - clientVM_1.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{false}); - clientVM_2.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{false}); - clientVM_3.invoke(InterestRegrListenerDUnitTest.class, "closeClientCacheTask", new Object[]{false}); + clientVM_1.invoke(() -> InterestRegrListenerDUnitTest.closeClientCacheTask(false)); + clientVM_2.invoke(() -> InterestRegrListenerDUnitTest.closeClientCacheTask(false)); + clientVM_3.invoke(() -> InterestRegrListenerDUnitTest.closeClientCacheTask(false)); Thread.sleep(2); @@ -433,7 +433,7 @@ public void testDurableClientExit_ServerExpressedInterest_NonDurableInterest() t @Override public boolean done() { - Map listnerMap = (Map) serverVM.invoke(InterestRegrListenerDUnitTest.class, "getListenerMapTask"); + Map listnerMap = (Map) serverVM.invoke(() -> InterestRegrListenerDUnitTest.getListenerMapTask()); LogWriterUtils.getLogWriter().info("Listener Map " + listnerMap); registerCount = getMapValueForKey(listnerMap,REGISTER_INTEREST); unregisterCount = getMapValueForKey(listnerMap,UNREGISTER_INTEREST); @@ -454,7 +454,7 @@ public String description() { LogWriterUtils.getLogWriter().info("Sleeping till durable client queue are expired and unregister event is called on to listener"); Thread.sleep((DURABLE_CLIENT_TIMEOUT+5)*1000); - serverVM.invoke(InterestRegrListenerDUnitTest.class, "closeCacheTask"); + serverVM.invoke(() -> InterestRegrListenerDUnitTest.closeCacheTask()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java index 597da3d62888..c45648363242 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java @@ -86,8 +86,8 @@ public void setUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); - PORT = ((Integer)vm0.invoke(InterestResultPolicyDUnitTest.class, "createServerCache" )).intValue(); - vm0.invoke(InterestResultPolicyDUnitTest.class, "populateServerCache"); + PORT = ((Integer)vm0.invoke(() -> InterestResultPolicyDUnitTest.createServerCache())).intValue(); + vm0.invoke(() -> InterestResultPolicyDUnitTest.populateServerCache()); } /** @@ -99,9 +99,9 @@ protected final void preTearDown() throws Exception { this.expectedEx = IgnoredException.addIgnoredException(ServerConnectivityException.class .getName()); // close server - vm0.invoke(InterestResultPolicyDUnitTest.class, "closeCache"); + vm0.invoke(() -> InterestResultPolicyDUnitTest.closeCache()); // close client - vm1.invoke(InterestResultPolicyDUnitTest.class, "closeCache"); + vm1.invoke(() -> InterestResultPolicyDUnitTest.closeCache()); } @Override @@ -126,8 +126,8 @@ public void testPolicyNone() Object[] objArr = new Object[2]; objArr[0] = InterestResultPolicy.NONE; objArr[1] = new Integer(PREPOPULATED_ENTRIES); - vm1.invoke(InterestResultPolicyDUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)}); + vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache( + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT))); vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr); vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr); logger.fine("testPolicyNone END"); @@ -148,8 +148,8 @@ public void testPolicyKeys() Object[] objArr = new Object[2]; objArr[0] = InterestResultPolicy.KEYS; objArr[1] = new Integer(PREPOPULATED_ENTRIES); - vm1.invoke(InterestResultPolicyDUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)});; + vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache( + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));; vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr); vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr); logger.fine("testPolicyKeys END"); @@ -170,8 +170,8 @@ public void testPolicyKeysValues() Object[] objArr = new Object[2]; objArr[0] = InterestResultPolicy.KEYS_VALUES; objArr[1] = new Integer(PREPOPULATED_ENTRIES); - vm1.invoke(InterestResultPolicyDUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)}); + vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache( + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT))); vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr); vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr); logger.fine("testPolicyKeyValues END"); @@ -195,12 +195,11 @@ public void testBug35358() objArr[0] = InterestResultPolicy.KEYS; /* registering for 5 extra keys */ objArr[1] = new Integer(PREPOPULATED_ENTRIES + 5); - vm1.invoke(InterestResultPolicyDUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)}); + vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache( + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT))); vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr); vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr); - Integer cnt = (Integer)vm0.invoke(InterestResultPolicyDUnitTest.class, - "getEntryCount"); + Integer cnt = (Integer)vm0.invoke(() -> InterestResultPolicyDUnitTest.getEntryCount()); assertEquals(cnt.intValue(), PREPOPULATED_ENTRIES); logger.fine("testBug35358 END"); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java index 97bef89f6df4..1a952c8c3862 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java @@ -101,8 +101,8 @@ public void setUp() throws Exception { */ @Override protected final void preTearDown() throws Exception { - vm0.invoke(NewRegionAttributesDUnitTest.class, "closeCache"); - vm1.invoke(NewRegionAttributesDUnitTest.class, "closeCache"); + vm0.invoke(() -> NewRegionAttributesDUnitTest.closeCache()); + vm1.invoke(() -> NewRegionAttributesDUnitTest.closeCache()); } /** @@ -186,18 +186,16 @@ public static void closeCache() */ public void testEntryOperationsWithNewAttributesEnabled() { - vm0.invoke(NewRegionAttributesDUnitTest.class, "checkAttributes"); - vm1.invoke(NewRegionAttributesDUnitTest.class, "checkAttributes"); - vm0.invoke(NewRegionAttributesDUnitTest.class, "doPuts"); - Integer cnt1 = (Integer)vm1.invoke(NewRegionAttributesDUnitTest.class, - "getEntryCount"); + vm0.invoke(() -> NewRegionAttributesDUnitTest.checkAttributes()); + vm1.invoke(() -> NewRegionAttributesDUnitTest.checkAttributes()); + vm0.invoke(() -> NewRegionAttributesDUnitTest.doPuts()); + Integer cnt1 = (Integer)vm1.invoke(() -> NewRegionAttributesDUnitTest.getEntryCount()); assertEquals(TOTAL_PUTS, cnt1.intValue()); - vm0.invoke(NewRegionAttributesDUnitTest.class, "doPuts"); - vm0.invoke(NewRegionAttributesDUnitTest.class, "doInvalidates"); - vm0.invoke(NewRegionAttributesDUnitTest.class, "doDestroy"); + vm0.invoke(() -> NewRegionAttributesDUnitTest.doPuts()); + vm0.invoke(() -> NewRegionAttributesDUnitTest.doInvalidates()); + vm0.invoke(() -> NewRegionAttributesDUnitTest.doDestroy()); - Integer cnt2 = (Integer)vm1.invoke(NewRegionAttributesDUnitTest.class, - "getEntryCount"); + Integer cnt2 = (Integer)vm1.invoke(() -> NewRegionAttributesDUnitTest.getEntryCount()); assertEquals(0, cnt2.intValue()); } @@ -208,9 +206,9 @@ public void testEntryOperationsWithNewAttributesEnabled() */ public void testRegisterInterestUseCases() { - vm1.invoke(NewRegionAttributesDUnitTest.class, "registerInterest"); - vm1.invoke(NewRegionAttributesDUnitTest.class, "unregisterInterest"); - vm1.invoke(NewRegionAttributesDUnitTest.class, "getInterestForRegion"); + vm1.invoke(() -> NewRegionAttributesDUnitTest.registerInterest()); + vm1.invoke(() -> NewRegionAttributesDUnitTest.unregisterInterest()); + vm1.invoke(() -> NewRegionAttributesDUnitTest.getInterestForRegion()); } /** diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java index 704a82ae0cbc..004dacbfee49 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java @@ -62,7 +62,7 @@ public void testRedundancyNotSpecifiedNonPrimaryServerFail() try { createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 0); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); //pause(5000); verifyLiveAndRedundantServers(3, 0); verifyOrderOfEndpoints(); @@ -111,7 +111,7 @@ public void beforeFailoverByCacheClientUpdater(Endpoint epFailed) createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 0, 3000, 100); assertTrue(pool.getPrimaryName().equals(SERVER1)); verifyOrderOfEndpoints(); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); verifyLiveAndRedundantServers(3, 0); verifyOrderOfEndpoints(); @@ -156,7 +156,7 @@ public void testRedundancySpecifiedNonFailoverEPFails() assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); //pause(5000); verifyDeadServers(1); verifyRedundantServersContain(SERVER2); @@ -196,7 +196,7 @@ public void _testRedundancySpecifiedNonFailoverEPFailsDetectionByCCU() assertTrue(pool.getRedundantNames().contains(SERVER4)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); verifyDeadServers(1); verifyRedundantServersContain(SERVER4); @@ -233,7 +233,7 @@ public void _testRedundancySpecifiedNonFailoverEPFailsDetectionByRegisterInteres assertTrue(pool.getRedundantNames().contains(SERVER4)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); createEntriesK1andK2(); registerK1AndK2(); @@ -273,7 +273,7 @@ public void _testRedundancySpecifiedNonFailoverEPFailsDetectionByUnregisterInter assertTrue(pool.getRedundantNames().contains(SERVER4)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); unregisterInterest(); verifyDeadServers(1); @@ -311,7 +311,7 @@ public void testRedundancySpecifiedNonFailoverEPFailsDetectionByPut() assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); doPuts(); verifyDeadServers(1); @@ -350,7 +350,7 @@ public void testRedundancySpecifiedNonPrimaryEPFails() assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); //pause(5000); verifyDeadServers(1); verifyRedundantServersContain(SERVER3); @@ -359,8 +359,7 @@ public void testRedundancySpecifiedNonPrimaryEPFails() // assertTrue(pool.getRedundantNames() // .contains(SERVER1)); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, - "verifyInterestRegistration"); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); //assertEquals(3, pool.getConnectedServerCount()); //assertEquals(1, proxy.getDeadServers().size()); } @@ -391,7 +390,7 @@ public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByCCU() assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); verifyDeadServers(1); verifyRedundantServersContain(SERVER3); @@ -400,8 +399,7 @@ public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByCCU() // assertTrue(pool.getRedundantNames() // .contains(SERVER1)); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, - "verifyInterestRegistration"); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); // assertEquals(3, pool.getConnectedServerCount()); //assertEquals(1, proxy.getDeadServers().size()); } @@ -430,7 +428,7 @@ public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByRegisterInterest( assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); createEntriesK1andK2(); registerK1AndK2(); @@ -441,8 +439,7 @@ public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByRegisterInterest( // assertTrue(pool.getRedundantNames() // .contains(SERVER1)); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, - "verifyInterestRegistration"); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); // assertEquals(3, pool.getConnectedServerCount()); //assertEquals(1, proxy.getDeadServers().size()); } @@ -471,7 +468,7 @@ public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByUnregisterInteres assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); unregisterInterest(); verifyDeadServers(1); @@ -511,7 +508,7 @@ public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByPut() assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); doPuts(); System.out.println("server1="+SERVER1); @@ -525,8 +522,7 @@ public void testRedundancySpecifiedNonPrimaryEPFailsDetectionByPut() // assertTrue(pool.getRedundantNames() // .contains(SERVER1)); verifyOrderOfEndpoints(); - server2.invoke(RedundancyLevelTestBase.class, - "verifyInterestRegistration"); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); // assertEquals(3, pool.getConnectedServerCount()); //assertEquals(1, proxy.getDeadServers().size()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java index 6f31d3bccd50..4692699b5a4f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java @@ -69,7 +69,7 @@ public void testRedundancySpecifiedPrimaryEPFails() //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); //pause(5000); verifyDeadServers(1); verifyRedundantServersContain(SERVER3); @@ -110,7 +110,7 @@ public void testRedundancySpecifiedPrimaryEPFailsDetectionByCCU() assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); verifyDeadServers(1); verifyRedundantServersContain(SERVER3); @@ -149,7 +149,7 @@ public void testRedundancySpecifiedPrimaryEPFailsDetectionByRegisterInterest() assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); createEntriesK1andK2(); registerK1AndK2(); @@ -190,7 +190,7 @@ public void testRedundancySpecifiedPrimaryEPFailsDetectionByUnregisterInterest() assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); unregisterInterest(); verifyDeadServers(1); @@ -230,7 +230,7 @@ public void testRedundancySpecifiedPrimaryEPFailsDetectionByPut() assertTrue(pool.getRedundantNames().contains(SERVER2)); //assertEquals(0, proxy.getDeadServers().size()); verifyOrderOfEndpoints(); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); // pause(5000); doPuts(); verifyDeadServers(1); @@ -268,19 +268,17 @@ public void testRedundancySpecifiedPrimarySecondaryEPFails() assertFalse(pool.getRedundantNames().contains(SERVER3)); assertFalse(pool.getRedundantNames().contains(SERVER4)); verifyOrderOfEndpoints(); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); //pause(5000); verifyLiveAndRedundantServers(2, 1); verifyOrderOfEndpoints(); //assertEquals(2, pool.getRedundantNames().size()); //Not Sure //assertTrue(pool.getPrimaryName().equals(SERVER2)); - server2.invoke(RedundancyLevelTestBase.class, - "verifyInterestRegistration"); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); //assertTrue(pool.getRedundantNames().contains(SERVER3)); - server3.invoke(RedundancyLevelTestBase.class, - "verifyInterestRegistration"); + server3.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); } catch (Exception ex) { Assert.fail( @@ -310,8 +308,8 @@ public void testRedundancySpecifiedEPFails() assertFalse(pool.getRedundantNames().contains(SERVER4)); // kill non primary EPs verifyOrderOfEndpoints(); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); verifyDeadServers(2); //assertEquals(2, pool.getConnectedServerCount()); //assertEquals(2, proxy.getDeadServers().size()); @@ -320,7 +318,7 @@ public void testRedundancySpecifiedEPFails() verifyOrderOfEndpoints(); //assertEquals(2, pool.getRedundantNames().size()); // bring up one server. - server1.invoke(RedundancyLevelTestBase.class, "startServer"); + server1.invoke(() -> RedundancyLevelTestBase.startServer()); //pause(10000); verifyLiveAndRedundantServers(3, 2); verifyOrderOfEndpoints(); @@ -329,17 +327,16 @@ public void testRedundancySpecifiedEPFails() assertTrue(pool.getPrimaryName().equals(SERVER1)); verifyRedundantServersContain(SERVER2); verifyRedundantServersContain(SERVER4); - server1.invoke(RedundancyLevelTestBase.class, - "verifyInterestRegistration"); + server1.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); // bring up another server should get added to live server map only and // not to the active server as redundancy level is satisfied. - server2.invoke(RedundancyLevelTestBase.class, "startServer"); + server2.invoke(() -> RedundancyLevelTestBase.startServer()); //pause(10000); Wait.pause(1000); verifyOrderOfEndpoints(); //assertEquals(3, pool.getRedundantNames().size()); //assertEquals(4, pool.getConnectedServerCount()); - server2.invoke(RedundancyLevelTestBase.class, "verifyNoCCP"); + server2.invoke(() -> RedundancyLevelTestBase.verifyNoCCP()); } catch (Exception ex) { Assert.fail( @@ -357,8 +354,8 @@ public void testRedundancyLevelSpecifiedButNotSatisfied() { try { // stop two secondaries - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); // make sure that the client connects to only two servers and // redundancyLevel // unsatisfied with one @@ -374,7 +371,7 @@ public void testRedundancyLevelSpecifiedButNotSatisfied() assertFalse(pool.getRedundantNames().contains(SERVER3)); assertFalse(pool.getRedundantNames().contains(SERVER2)); // start server - server2.invoke(RedundancyLevelTestBase.class, "startServer"); + server2.invoke(() -> RedundancyLevelTestBase.startServer()); //pause(10000); verifyLiveAndRedundantServers(3, 2); verifyOrderOfEndpoints(); @@ -384,10 +381,9 @@ public void testRedundancyLevelSpecifiedButNotSatisfied() assertTrue(pool.getRedundantNames().contains(SERVER3)); assertTrue(pool.getPrimaryName().equals(SERVER1)); assertFalse(pool.getRedundantNames().contains(SERVER2)); - server2.invoke(RedundancyLevelTestBase.class, - "verifyInterestRegistration"); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); // verify that redundancy level is satisfied - server1.invoke(RedundancyLevelTestBase.class, "startServer"); + server1.invoke(() -> RedundancyLevelTestBase.startServer()); //pause(10000); Wait.pause(1000); verifyOrderOfEndpoints(); @@ -397,7 +393,7 @@ public void testRedundancyLevelSpecifiedButNotSatisfied() assertTrue(pool.getRedundantNames().contains(SERVER3)); assertTrue(pool.getPrimaryName().equals(SERVER1)); assertFalse(pool.getRedundantNames().contains(SERVER2)); - server1.invoke(RedundancyLevelTestBase.class, "verifyNoCCP"); + server1.invoke(() -> RedundancyLevelTestBase.verifyNoCCP()); } catch (Exception ex) { @@ -416,7 +412,7 @@ public void testRedundancyLevelSpecifiedAndSatisfied() { try { // TODO: Yogesh - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 2); // let the client connect to servers //pause(10000); @@ -429,7 +425,7 @@ public void testRedundancyLevelSpecifiedAndSatisfied() assertTrue(pool.getPrimaryName().equals(SERVER1)); assertFalse(pool.getRedundantNames().contains(SERVER2)); // start server - server1.invoke(RedundancyLevelTestBase.class, "startServer"); + server1.invoke(() -> RedundancyLevelTestBase.startServer()); Wait.pause(1000); verifyOrderOfEndpoints(); //assertEquals(3, pool.getRedundantNames().size()); @@ -438,7 +434,7 @@ public void testRedundancyLevelSpecifiedAndSatisfied() assertTrue(pool.getRedundantNames().contains(SERVER4)); assertTrue(pool.getPrimaryName().equals(SERVER1)); assertFalse(pool.getRedundantNames().contains(SERVER2)); - server1.invoke(RedundancyLevelTestBase.class, "verifyNoCCP"); + server1.invoke(() -> RedundancyLevelTestBase.verifyNoCCP()); } catch (Exception ex) { @@ -456,7 +452,7 @@ public void testRedundancyLevelNotSpecified() { try { // TODO: Yogesh - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, -1/* not specified */); // let the client connect to servers //pause(10000); @@ -470,7 +466,7 @@ public void testRedundancyLevelNotSpecified() assertTrue(pool.getPrimaryName().equals(SERVER1)); assertTrue(pool.getRedundantNames().contains(SERVER4)); // start server - server2.invoke(RedundancyLevelTestBase.class, "startServer"); + server2.invoke(() -> RedundancyLevelTestBase.startServer()); //pause(10000); verifyLiveAndRedundantServers(4, 3); verifyOrderOfEndpoints(); @@ -482,8 +478,7 @@ public void testRedundancyLevelNotSpecified() assertTrue(pool.getRedundantNames().contains(SERVER3)); assertTrue(pool.getRedundantNames().contains(SERVER4)); assertTrue(pool.getPrimaryName().equals(SERVER1)); - server2.invoke(RedundancyLevelTestBase.class, - "verifyInterestRegistration"); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); } catch (Exception ex) { Assert.fail("test failed due to exception in test noRedundancyLevelServerFail ", @@ -524,10 +519,10 @@ public void testRedundancySpecifiedMoreThanEPs() try { createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1, PORT2, PORT3, PORT4, 5); assertEquals(3, pool.getRedundantNames().size()); - server0.invoke(RedundancyLevelTestBase.class, "verifyCCP"); - server1.invoke(RedundancyLevelTestBase.class, "verifyCCP"); - server2.invoke(RedundancyLevelTestBase.class, "verifyCCP"); - server3.invoke(RedundancyLevelTestBase.class, "verifyCCP"); + server0.invoke(() -> RedundancyLevelTestBase.verifyCCP()); + server1.invoke(() -> RedundancyLevelTestBase.verifyCCP()); + server2.invoke(() -> RedundancyLevelTestBase.verifyCCP()); + server3.invoke(() -> RedundancyLevelTestBase.verifyCCP()); } catch (Exception ex) { ex.printStackTrace(); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java index ac5d8b78b228..20329d436db1 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java @@ -56,14 +56,14 @@ public void testRegisterInterestAndMakePrimaryWithFullRedundancy() createEntriesK1andK2(); registerK1AndK2(); assertEquals(3, pool.getRedundantNames().size()); - server0.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server1.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsNotAlive"); - server2.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsNotAlive"); - server3.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsNotAlive"); - server0.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); - server1.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); - server2.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); - server3.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); + server0.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server1.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsNotAlive()); + server2.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsNotAlive()); + server3.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsNotAlive()); + server0.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); + server1.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); + server3.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG = true; PoolImpl.BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = true; PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = true; @@ -84,11 +84,11 @@ public void beforePrimaryIdentificationFromBackup() makePrimaryCalled = true; } }); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); doPuts(); - server1.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server2.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsNotAlive"); - server3.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsNotAlive"); + server1.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server2.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsNotAlive()); + server3.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsNotAlive()); verifyLiveAndRedundantServers(3, 2); if(registerInterestCalled){ fail("register interest should not have been called since we failed to a redundant server !"); @@ -98,10 +98,10 @@ public void beforePrimaryIdentificationFromBackup() } assertEquals(2, pool.getRedundantNames().size()); makePrimaryCalled = false; - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); doPuts(); - server2.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server3.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsNotAlive"); + server2.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server3.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsNotAlive()); verifyLiveAndRedundantServers(2, 1); if(registerInterestCalled){ fail("register interest should not have been called since we failed to a redundant server !"); @@ -111,9 +111,9 @@ public void beforePrimaryIdentificationFromBackup() } assertEquals(1, pool.getRedundantNames().size()); makePrimaryCalled = false; - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); doPuts(); - server3.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); + server3.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); verifyLiveAndRedundantServers(1, 0); if(registerInterestCalled){ fail("register interest should not have been called since we failed to a redundant server !"); @@ -122,11 +122,11 @@ public void beforePrimaryIdentificationFromBackup() fail("make primary should have been called since primary did fail and a new primary was to be chosen "); } assertEquals(0, pool.getRedundantNames().size()); - server3.invoke(RedundancyLevelTestBase.class, "stopServer"); - server0.invoke(RedundancyLevelTestBase.class, "startServer"); + server3.invoke(() -> RedundancyLevelTestBase.stopServer()); + server0.invoke(() -> RedundancyLevelTestBase.startServer()); doPuts(); - server0.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server0.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); + server0.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server0.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); verifyLiveAndRedundantServers(1, 0); if(!registerInterestCalled){ fail("register interest should have been called since a recovered server came up!"); @@ -160,31 +160,31 @@ public void testRegisterInterestAndMakePrimaryWithZeroRedundancy() createEntriesK1andK2(); registerK1AndK2(); assertEquals(0, pool.getRedundantNames().size()); - server0.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server0.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server0.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); doPuts(); - server1.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server1.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); + server1.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server1.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); verifyLiveAndRedundantServers(3, 0); assertEquals(0, pool.getRedundantNames().size()); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); doPuts(); - server2.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server2.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); + server2.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); verifyLiveAndRedundantServers(2, 0); assertEquals(0, pool.getRedundantNames().size()); - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); doPuts(); - server3.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server3.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); + server3.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server3.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); verifyLiveAndRedundantServers(1, 0); assertEquals(0, pool.getRedundantNames().size()); - server3.invoke(RedundancyLevelTestBase.class, "stopServer"); - server0.invoke(RedundancyLevelTestBase.class, "startServer"); + server3.invoke(() -> RedundancyLevelTestBase.stopServer()); + server0.invoke(() -> RedundancyLevelTestBase.startServer()); doPuts(); - server0.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server0.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); + server0.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server0.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); verifyLiveAndRedundantServers(1, 0); assertEquals(0, pool.getRedundantNames().size()); } @@ -212,28 +212,28 @@ public void testRegisterInterestAndMakePrimaryWithRedundancyOne() createEntriesK1andK2(); registerK1AndK2(); assertEquals(1, pool.getRedundantNames().size()); - server0.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server0.invoke(RedundancyLevelTestBase.class, "stopServer"); + server0.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server0.invoke(() -> RedundancyLevelTestBase.stopServer()); doPuts(); - server1.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server2.invoke(RedundancyLevelTestBase.class, "verifyCCP"); - server2.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); + server1.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server2.invoke(() -> RedundancyLevelTestBase.verifyCCP()); + server2.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); verifyLiveAndRedundantServers(3, 1); assertEquals(1, pool.getRedundantNames().size()); - server1.invoke(RedundancyLevelTestBase.class, "stopServer"); + server1.invoke(() -> RedundancyLevelTestBase.stopServer()); doPuts(); - server2.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server2.invoke(RedundancyLevelTestBase.class, "stopServer"); + server2.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server2.invoke(() -> RedundancyLevelTestBase.stopServer()); doPuts(); - server3.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server3.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); + server3.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server3.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); verifyLiveAndRedundantServers(1, 0); assertEquals(0, pool.getRedundantNames().size()); - server3.invoke(RedundancyLevelTestBase.class, "stopServer"); - server0.invoke(RedundancyLevelTestBase.class, "startServer"); + server3.invoke(() -> RedundancyLevelTestBase.stopServer()); + server0.invoke(() -> RedundancyLevelTestBase.startServer()); doPuts(); - server0.invoke(RedundancyLevelTestBase.class, "verifyDispatcherIsAlive"); - server0.invoke(RedundancyLevelTestBase.class, "verifyInterestRegistration"); + server0.invoke(() -> RedundancyLevelTestBase.verifyDispatcherIsAlive()); + server0.invoke(() -> RedundancyLevelTestBase.verifyInterestRegistration()); verifyLiveAndRedundantServers(1, 0); assertEquals(0, pool.getRedundantNames().size()); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java index 03ed215629ea..eaba8d966939 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java @@ -115,14 +115,10 @@ public void setUp() throws Exception IgnoredException.addIgnoredException("java.net.SocketException||java.net.ConnectException"); // start servers first - PORT1 = ((Integer)server0.invoke(RedundancyLevelTestBase.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)server1.invoke(RedundancyLevelTestBase.class, - "createServerCache")).intValue(); - PORT3 = ((Integer)server2.invoke(RedundancyLevelTestBase.class, - "createServerCache")).intValue(); - PORT4 = ((Integer)server3.invoke(RedundancyLevelTestBase.class, - "createServerCache")).intValue(); + PORT1 = ((Integer)server0.invoke(() -> RedundancyLevelTestBase.createServerCache())).intValue(); + PORT2 = ((Integer)server1.invoke(() -> RedundancyLevelTestBase.createServerCache())).intValue(); + PORT3 = ((Integer)server2.invoke(() -> RedundancyLevelTestBase.createServerCache())).intValue(); + PORT4 = ((Integer)server3.invoke(() -> RedundancyLevelTestBase.createServerCache())).intValue(); String hostName = NetworkUtils.getServerHostName(Host.getHost(0)); SERVER1 = hostName + PORT1; @@ -636,10 +632,10 @@ protected final void preTearDown() throws Exception { closeCache(); // then close the servers - server0.invoke(RedundancyLevelTestBase.class, "closeCache"); - server1.invoke(RedundancyLevelTestBase.class, "closeCache"); - server2.invoke(RedundancyLevelTestBase.class, "closeCache"); - server3.invoke(RedundancyLevelTestBase.class, "closeCache"); + server0.invoke(() -> RedundancyLevelTestBase.closeCache()); + server1.invoke(() -> RedundancyLevelTestBase.closeCache()); + server2.invoke(() -> RedundancyLevelTestBase.closeCache()); + server3.invoke(() -> RedundancyLevelTestBase.closeCache()); } finally { CacheServerTestUtil.enableShufflingOfEndpoints(); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java index a6ee5bac3f57..7d729a3e7262 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java @@ -77,9 +77,9 @@ public void setUp() throws Exception //Client 1 VM client1 = host.getVM(1); - PORT1 = ((Integer)server1.invoke(RegionCloseDUnitTest.class, "createServerCache" )).intValue(); - client1.invoke(RegionCloseDUnitTest.class, "createClientCache", new Object[] { - NetworkUtils.getServerHostName(host), new Integer(PORT1)}); + PORT1 = ((Integer)server1.invoke(() -> RegionCloseDUnitTest.createServerCache())).intValue(); + client1.invoke(() -> RegionCloseDUnitTest.createClientCache( + NetworkUtils.getServerHostName(host), new Integer(PORT1))); } @@ -96,10 +96,10 @@ private void createCache(Properties props) throws Exception public void testCloseRegionOnClient() { - server1.invoke(RegionCloseDUnitTest.class, "VerifyClientProxyOnServerBeforeClose"); - client1.invoke(RegionCloseDUnitTest.class, "closeRegion"); + server1.invoke(() -> RegionCloseDUnitTest.VerifyClientProxyOnServerBeforeClose()); + client1.invoke(() -> RegionCloseDUnitTest.closeRegion()); // pause(10000); - server1.invoke(RegionCloseDUnitTest.class, "VerifyClientProxyOnServerAfterClose"); + server1.invoke(() -> RegionCloseDUnitTest.VerifyClientProxyOnServerAfterClose()); } public static void createClientCache(String host, Integer port1) throws Exception @@ -239,8 +239,8 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { //close client - client1.invoke(RegionCloseDUnitTest.class, "closeCache"); + client1.invoke(() -> RegionCloseDUnitTest.closeCache()); //close server - server1.invoke(RegionCloseDUnitTest.class, "closeCache"); + server1.invoke(() -> RegionCloseDUnitTest.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java index fd50d6e02522..097da6ae9685 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java @@ -107,10 +107,10 @@ public void setUp() throws Exception */ @Override protected final void preTearDown() throws Exception { - client1.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, "closeCache"); - client2.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, "closeCache"); - server1.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, "closeCache"); - server2.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, "closeCache"); + client1.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.closeCache()); + client2.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.closeCache()); + server1.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.closeCache()); + server2.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.closeCache()); } @@ -197,20 +197,16 @@ public void run2() throws CacheException private void createClientServerConfigurationForClearTest() throws Exception { //create server and region - PORT1 = ((Integer)server1.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, - "createServer", new Object[] { new Boolean(true) })).intValue(); + PORT1 = ((Integer)server1.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.createServer( new Boolean(true) ))).intValue(); //only create server, no region - PORT2 = ((Integer)server2.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, - "createServer", new Object[] { new Boolean(false) })).intValue(); + PORT2 = ((Integer)server2.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.createServer( new Boolean(false) ))).intValue(); //client1 connected to server1 - client1.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, "createClient", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); + client1.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.createClient( NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) )); //client2 connected to server2 - client2.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, "createClient", - new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) }); + client2.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.createClient( NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) )); } public static Integer createServer(Boolean createRegion) throws Exception diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java index 203a7428ef9a..fde871a6a0a6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java @@ -91,13 +91,13 @@ public void setUp() throws Exception { LogWriterUtils.getLogWriter().info("implementation class is " + impl.getClass()); - PORT1 = ((Integer)server1.invoke(impl.getClass(), "createServerCache" )).intValue(); - PORT2 = ((Integer)server2.invoke(impl.getClass(), "createServerCache" )).intValue(); + PORT1 = ((Integer)server1.invoke(() -> impl.createServerCache())).intValue(); + PORT2 = ((Integer)server2.invoke(() -> impl.createServerCache())).intValue(); - client1.invoke(impl.getClass(), "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)}); - client2.invoke(impl.getClass(), "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)}); + client1.invoke(() -> impl.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2))); + client2.invoke(() -> impl.createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2))); } @@ -122,8 +122,8 @@ private void createCache(Properties props) throws Exception public void testRegisterCreatesInvalidEntry() { // First create entries on both servers via the two client - client1.invoke(impl.getClass(), "createEntriesK1"); - client2.invoke(impl.getClass(), "registerKeysK1"); + client1.invoke(() -> impl.createEntriesK1()); + client2.invoke(() -> impl.registerKeysK1()); } @@ -239,10 +239,10 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { //close client - client1.invoke(impl.getClass(), "closeCache"); - client2.invoke(impl.getClass(), "closeCache"); + client1.invoke(() -> impl.closeCache()); + client2.invoke(() -> impl.closeCache()); //close server - server1.invoke(impl.getClass(), "closeCache"); - server2.invoke(impl.getClass(), "closeCache"); + server1.invoke(() -> impl.closeCache()); + server2.invoke(() -> impl.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java index ece92d7f283a..f02fef5835ee 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java @@ -100,11 +100,11 @@ public ReliableMessagingDUnitTest(String name) { public void testPeriodicAckSendByClient() throws Exception { createEntries(); - server1.invoke(ReliableMessagingDUnitTest.class, "putOnServer"); + server1.invoke(() -> ReliableMessagingDUnitTest.putOnServer()); waitForServerUpdate(); setCreationTimeTidAndSeq(); waitForClientAck(); - server1.invoke(ReliableMessagingDUnitTest.class, "checkTidAndSeq"); + server1.invoke(() -> ReliableMessagingDUnitTest.checkTidAndSeq()); } /* @@ -116,14 +116,14 @@ public void testPeriodicAckSendByClientPrimaryFailover() throws Exception { IgnoredException.addIgnoredException("java.net.ConnectException"); createEntries(); setClientServerObserverForBeforeSendingClientAck(); - server1.invoke(ReliableMessagingDUnitTest.class, "putOnServer"); + server1.invoke(() -> ReliableMessagingDUnitTest.putOnServer()); LogWriterUtils.getLogWriter().info("Entering waitForServerUpdate"); waitForServerUpdate(); LogWriterUtils.getLogWriter().info("Entering waitForCallback"); waitForCallback(); LogWriterUtils.getLogWriter().info("Entering waitForClientAck"); waitForClientAck(); - server2.invoke(ReliableMessagingDUnitTest.class, "checkTidAndSeq"); + server2.invoke(() -> ReliableMessagingDUnitTest.checkTidAndSeq()); } /** @@ -301,9 +301,9 @@ public void beforeSendingClientAck() { LogWriterUtils.getLogWriter().info("beforeSendingClientAck invoked"); setCreationTimeTidAndSeq(); - server1.invoke(ReliableMessagingDUnitTest.class, "stopServer"); + server1.invoke(() -> ReliableMessagingDUnitTest.stopServer()); checkServerCount(1,1); - server2.invoke(ReliableMessagingDUnitTest.class, "checkEmptyDispatchedMsgs"); + server2.invoke(() -> ReliableMessagingDUnitTest.checkEmptyDispatchedMsgs()); PoolImpl.BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG = false; LogWriterUtils.getLogWriter().info("end of beforeSendingClientAck"); } @@ -334,10 +334,8 @@ public void setUp() throws Exception server1 = host.getVM(0); server2 = host.getVM(1); - PORT1 = ((Integer)server1.invoke(ReliableMessagingDUnitTest.class, - "createServerCache")).intValue(); - PORT2 = ((Integer)server2.invoke(ReliableMessagingDUnitTest.class, - "createServerCache")).intValue(); + PORT1 = ((Integer)server1.invoke(() -> ReliableMessagingDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)server2.invoke(() -> ReliableMessagingDUnitTest.createServerCache())).intValue(); CacheServerTestUtil.disableShufflingOfEndpoints(); createClientCache(PORT1, PORT2); @@ -418,8 +416,8 @@ public static void createClientCache(int port1, int port2) throws Exception protected final void preTearDown() throws Exception { creationTime = 0; closeCache(); - server1.invoke(ReliableMessagingDUnitTest.class, "closeCache"); - server2.invoke(ReliableMessagingDUnitTest.class, "closeCache"); + server1.invoke(() -> ReliableMessagingDUnitTest.closeCache()); + server2.invoke(() -> ReliableMessagingDUnitTest.closeCache()); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java index dedd91520283..405648343778 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java @@ -77,17 +77,17 @@ public void setUp() throws Exception { client1 = host.getVM(1); client2 = host.getVM(2); - int port = (Integer)server0.invoke(UnregisterInterestDUnitTest.class, "createCacheAndStartServer"); - client1.invoke(UnregisterInterestDUnitTest.class, "createClientCache", new Object[]{client1.getHost(), port}); - client2.invoke(UnregisterInterestDUnitTest.class, "createClientCache", new Object[]{client2.getHost(), port}); + int port = (Integer)server0.invoke(() -> UnregisterInterestDUnitTest.createCacheAndStartServer()); + client1.invoke(() -> UnregisterInterestDUnitTest.createClientCache(client1.getHost(), port)); + client2.invoke(() -> UnregisterInterestDUnitTest.createClientCache(client2.getHost(), port)); } @Override protected final void preTearDown() throws Exception { closeCache(); - server0.invoke(UnregisterInterestDUnitTest.class, "closeCache"); - client1.invoke(UnregisterInterestDUnitTest.class, "closeCache"); - client2.invoke(UnregisterInterestDUnitTest.class, "closeCache"); + server0.invoke(() -> UnregisterInterestDUnitTest.closeCache()); + client1.invoke(() -> UnregisterInterestDUnitTest.closeCache()); + client2.invoke(() -> UnregisterInterestDUnitTest.closeCache()); } public static void closeCache() { @@ -107,13 +107,13 @@ public static void closeCache() { * @throws Exception */ public void testUnregisterInterestAllKeys() throws Exception { - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {all_keys, 0, 0}); - client1.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {all_keys, receiveValuesConstant, null}); - client2.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {all_keys, !receiveValuesConstant, null}); - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {all_keys, 1, 1}); - client1.invoke(UnregisterInterestDUnitTest.class, "closeCache"); - client2.invoke(UnregisterInterestDUnitTest.class, "closeCache"); - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {all_keys, 0, 0}); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(all_keys, 0, 0)); + client1.invoke(() -> UnregisterInterestDUnitTest.registerInterest(all_keys, receiveValuesConstant, null)); + client2.invoke(() -> UnregisterInterestDUnitTest.registerInterest(all_keys, !receiveValuesConstant, null)); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(all_keys, 1, 1)); + client1.invoke(() -> UnregisterInterestDUnitTest.closeCache()); + client2.invoke(() -> UnregisterInterestDUnitTest.closeCache()); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(all_keys, 0, 0)); } /** @@ -126,13 +126,13 @@ public void testUnregisterInterestAllKeys() throws Exception { * @throws Exception */ public void testUnregisterInterestKeys() throws Exception { - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {list, 0, 0}); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(list, 0, 0)); client1.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {list, receiveValuesConstant, new String[]{"key_1", "key_2", "key_3", "key_4", "key_5"}}); client2.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {list, !receiveValuesConstant, new String[]{"key_1", "key_2", "key_3", "key_4", "key_5"}}); - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {list, 1, 1}); - client1.invoke(UnregisterInterestDUnitTest.class, "closeCache"); - client2.invoke(UnregisterInterestDUnitTest.class, "closeCache"); - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {list, 0, 0}); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(list, 1, 1)); + client1.invoke(() -> UnregisterInterestDUnitTest.closeCache()); + client2.invoke(() -> UnregisterInterestDUnitTest.closeCache()); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(list, 0, 0)); } /** @@ -146,13 +146,13 @@ public void testUnregisterInterestKeys() throws Exception { * @throws Exception */ public void testUnregisterInterestPatterns() throws Exception { - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {regex, 0, 0}); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(regex, 0, 0)); client1.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {regex, receiveValuesConstant, new String[] {"[a-z]*[0-9]"}}); client2.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {regex, !receiveValuesConstant, new String[] {"[a-z]*[0-9]"}}); - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {regex, 1, 1}); - client1.invoke(UnregisterInterestDUnitTest.class, "closeCache"); - client2.invoke(UnregisterInterestDUnitTest.class, "closeCache"); - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {regex, 0, 0}); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(regex, 1, 1)); + client1.invoke(() -> UnregisterInterestDUnitTest.closeCache()); + client2.invoke(() -> UnregisterInterestDUnitTest.closeCache()); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(regex, 0, 0)); } /** @@ -167,14 +167,14 @@ public void testUnregisterInterestPatterns() throws Exception { * @throws Exception */ public void testUnregisterInterestKeysInvForOneClientDoesNotAffectOtherClient() throws Exception { - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {list, 0, 0}); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(list, 0, 0)); client1.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {list, !receiveValuesConstant, new String[] {"key_1", "key_2", "key_3", "key_4", "key_5"}}); client2.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {list, !receiveValuesConstant, new String[] {"key_1", "key_2", "key_3", "key_4", "key_5"}}); - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {list, 0, 2}); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(list, 0, 2)); client1.invoke(UnregisterInterestDUnitTest.class, "unregisterInterest", new Object[] {new String[] {"key_1", "key_2", "key_3"}}); server0.invoke(UnregisterInterestDUnitTest.class, "updateKeys", new Object[] {new String[] {"key_1", "key_2", "key_3", "key_4", "key_5"}}); - client1.invoke(UnregisterInterestDUnitTest.class, "timedWaitForInvalidates", new Object[] {2}); - client2.invoke(UnregisterInterestDUnitTest.class, "timedWaitForInvalidates", new Object[] {5}); + client1.invoke(() -> UnregisterInterestDUnitTest.timedWaitForInvalidates(2)); + client2.invoke(() -> UnregisterInterestDUnitTest.timedWaitForInvalidates(5)); } /** @@ -190,14 +190,14 @@ public void testUnregisterInterestKeysInvForOneClientDoesNotAffectOtherClient() * @throws Exception */ public void testUnregisterInterestRegexInvForOneClientDoesNotAffectOtherClient() throws Exception { - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {regex, 0, 0}); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(regex, 0, 0)); client1.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {regex, !receiveValuesConstant, new String[] {"[a-z]*[0-9]"}}); client2.invoke(UnregisterInterestDUnitTest.class, "registerInterest", new Object[] {regex, !receiveValuesConstant, new String[] {"[a-z]*[0-9]"}}); - server0.invoke(UnregisterInterestDUnitTest.class, "checkRIArtifacts", new Object[] {regex, 0, 2}); + server0.invoke(() -> UnregisterInterestDUnitTest.checkRIArtifacts(regex, 0, 2)); client1.invoke(UnregisterInterestDUnitTest.class, "unregisterInterestRegex", new Object[] {new String[] {"[a-z]*[0-9]"}}); server0.invoke(UnregisterInterestDUnitTest.class, "updateKeys", new Object[] {new String[] {"key1", "key2", "key3", "key4", "key5"}}); - client1.invoke(UnregisterInterestDUnitTest.class, "timedWaitForInvalidates", new Object[] {0}); - client2.invoke(UnregisterInterestDUnitTest.class, "timedWaitForInvalidates", new Object[] {5}); + client1.invoke(() -> UnregisterInterestDUnitTest.timedWaitForInvalidates(0)); + client2.invoke(() -> UnregisterInterestDUnitTest.timedWaitForInvalidates(5)); } public void _testUnregisterInterestFilters() throws Exception { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java index 0c60c46ce43a..bdbb83877df0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java @@ -124,13 +124,13 @@ public void setUp() throws Exception { host.getVM(i).invoke(getClass(), "createImpl", null); } - PORT1 = ((Integer)server1.invoke(getClass(), "createServerCache" )).intValue(); - PORT2 = ((Integer)server2.invoke(getClass(), "createServerCache" )).intValue(); + PORT1 = ((Integer)server1.invoke(() -> createServerCache())).intValue(); + PORT2 = ((Integer)server2.invoke(() -> createServerCache())).intValue(); - client1.invoke(getClass(), "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)}); - client2.invoke(getClass(), "createClientCache", new Object[] { - NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)}); + client1.invoke(() -> createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2))); + client2.invoke(() -> createClientCache( + NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2))); IgnoredException.addIgnoredException("java.net.SocketException"); IgnoredException.addIgnoredException("Unexpected IOException"); @@ -165,14 +165,13 @@ public void DISABLED_testVerifyUpdatesNotReceivedBySender() final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue(); //First create entries on both servers via the two client - client1.invoke(impl.getClass(), "createEntriesK1andK2"); - client2.invoke(impl.getClass(), "createEntriesK1andK2"); - client1.invoke(impl.getClass(), "registerKeysK1andK2"); - client2.invoke(impl.getClass(), "registerKeysK1andK2"); + client1.invoke(() -> impl.createEntriesK1andK2()); + client2.invoke(() -> impl.createEntriesK1andK2()); + client1.invoke(() -> impl.registerKeysK1andK2()); + client2.invoke(() -> impl.registerKeysK1andK2()); //Induce fail over of InteretsList Endpoint to Server 2 by killing server1 - server1.invoke(UpdatePropagationDUnitTest.class, "killServer", - new Object[] {new Integer(PORT1)}); + server1.invoke(() -> UpdatePropagationDUnitTest.killServer(new Integer(PORT1))); //Wait for 10 seconds to allow fail over. This would mean that Interest // has failed over to Server2. client1.invoke(new CacheSerializableRunnable("Wait for server on port1 to be dead") { @@ -226,7 +225,7 @@ public String description() { }); //Start Server1 again so that both clients1 & Client 2 will establish connection to server1 too. - server1.invoke(UpdatePropagationDUnitTest.class, "startServer", new Object[] {new Integer(PORT1)}); + server1.invoke(() -> UpdatePropagationDUnitTest.startServer(new Integer(PORT1))); client1.invoke(new CacheSerializableRunnable("Wait for server on port1 to be dead") { public void run2() throws CacheException @@ -255,15 +254,13 @@ public String description() { //Do a put on Server1 via Connection object from client1. // Client1 should not receive updated value while client2 should receive - client1.invoke(impl.getClass(), - "acquireConnectionsAndPutonK1andK2", - new Object[] { NetworkUtils.getServerHostName(client1.getHost())}); + client1.invoke(() -> impl.acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost()))); //pause(5000); //Check if both the puts ( on key1 & key2 ) have reached the servers - server1.invoke(impl.getClass(), "verifyUpdates"); - server2.invoke(impl.getClass(), "verifyUpdates"); + server1.invoke(() -> impl.verifyUpdates()); + server2.invoke(() -> impl.verifyUpdates()); // verify no updates for update originator - client1.invoke(impl.getClass(), "verifyNoUpdates"); + client1.invoke(() -> impl.verifyNoUpdates()); } @@ -277,12 +274,12 @@ public void testVerifyUpdatesReceivedByOtherClients() { final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue(); // First create entries on both servers via the two client - client1.invoke(impl.getClass(), "createEntriesK1andK2"); - client2.invoke(impl.getClass(), "createEntriesK1andK2"); - client1.invoke(impl.getClass(), "registerKeysK1andK2"); - client2.invoke(impl.getClass(), "registerKeysK1andK2"); + client1.invoke(() -> impl.createEntriesK1andK2()); + client2.invoke(() -> impl.createEntriesK1andK2()); + client1.invoke(() -> impl.registerKeysK1andK2()); + client2.invoke(() -> impl.registerKeysK1andK2()); //Induce fail over of InteretsList Endpoint to Server 2 by killing server1 - server1.invoke(UpdatePropagationDUnitTest.class, "killServer", new Object[] {new Integer(PORT1)}); + server1.invoke(() -> UpdatePropagationDUnitTest.killServer(new Integer(PORT1))); //Wait for 10 seconds to allow fail over. This would mean that Interstist has failed // over to Server2. client1.invoke(new CacheSerializableRunnable("Wait for server on port1 to be dead") { @@ -335,7 +332,7 @@ public String description() { }); //Start Server1 again so that both clients1 & Client 2 will establish connection to server1 too. - server1.invoke(UpdatePropagationDUnitTest.class, "startServer", new Object[] {new Integer(PORT1)}); + server1.invoke(() -> UpdatePropagationDUnitTest.startServer(new Integer(PORT1))); client1.invoke(new CacheSerializableRunnable("Wait for servers to be alive") { public void run2() throws CacheException @@ -381,15 +378,13 @@ public String description() { //Do a put on Server1 via Connection object from client1. // Client1 should not receive updated value while client2 should receive - client1.invoke(impl.getClass(), - "acquireConnectionsAndPutonK1andK2", - new Object[] { NetworkUtils.getServerHostName(client1.getHost())}); + client1.invoke(() -> impl.acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost()))); Wait.pause(5000); //Check if both the puts ( on key1 & key2 ) have reached the servers - server1.invoke(impl.getClass(), "verifyUpdates"); - server2.invoke(impl.getClass(), "verifyUpdates"); + server1.invoke(() -> impl.verifyUpdates()); + server2.invoke(() -> impl.verifyUpdates()); // verify updates to other client - client2.invoke(impl.getClass(), "verifyUpdates"); + client2.invoke(() -> impl.verifyUpdates()); } public static void acquireConnectionsAndPutonK1andK2(String host) @@ -591,11 +586,11 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { //close client - client1.invoke(getClass(), "closeCache"); - client2.invoke(getClass(), "closeCache"); + client1.invoke(() -> closeCache()); + client2.invoke(() -> closeCache()); //close server - server1.invoke(getClass(), "closeCache"); - server2.invoke(getClass(), "closeCache"); + server1.invoke(() -> closeCache()); + server2.invoke(() -> closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java index 83df12448fcf..4934a9d5e602 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java @@ -74,17 +74,15 @@ public void setUp() throws Exception vm0 = host.getVM(0); createServerCache(); vm0 - .invoke(VerifyEventIDGenerationInP2PDUnitTest.class, - "createServerCache"); + .invoke(() -> VerifyEventIDGenerationInP2PDUnitTest.createServerCache()); receiver = false; } public void _testEventIDGeneration() throws Exception { createEntry(); - vm0.invoke(VerifyEventIDGenerationInP2PDUnitTest.class, "get"); - Boolean pass = (Boolean)vm0.invoke( - VerifyEventIDGenerationInP2PDUnitTest.class, "verifyResult"); + vm0.invoke(() -> VerifyEventIDGenerationInP2PDUnitTest.get()); + Boolean pass = (Boolean)vm0.invoke(() -> VerifyEventIDGenerationInP2PDUnitTest.verifyResult()); assertFalse(pass.booleanValue()); } @@ -120,8 +118,7 @@ public static void createServerCache() throws Exception public void afterCreate(EntryEvent event) { if (!receiver) { - vm0.invoke(EventIDVerificationInP2PDUnitTest.class, "setEventIDData", - new Object[] { ((EntryEventImpl)event).getEventId() }); + vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() )); } else { testEventIDResult = ((EntryEventImpl)event).getEventId().equals( @@ -175,7 +172,7 @@ public static Boolean verifyResult() @Override protected final void preTearDown() throws Exception { closeCache(); - vm0.invoke(VerifyEventIDGenerationInP2PDUnitTest.class, "closeCache"); + vm0.invoke(() -> VerifyEventIDGenerationInP2PDUnitTest.closeCache()); } public static void closeCache() diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java index c2a0016e281f..eb5637c3eb3b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java @@ -83,11 +83,10 @@ public void setUp() throws Exception { vm2 = host.getVM(2); - PORT1 = ((Integer)vm0.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "createServerCache" )).intValue(); - PORT2 = ((Integer)vm1.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "createServerCache" )).intValue(); + PORT1 = ((Integer)vm0.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createServerCache())).intValue(); + PORT2 = ((Integer)vm1.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createServerCache())).intValue(); - vm2.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "createClientCache", - new Object[] { NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1),new Integer(PORT2)}); + vm2.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createClientCache( NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1),new Integer(PORT2))); } @@ -106,15 +105,15 @@ private Cache createCache(Properties props) throws Exception public void testVerifyUpdatesFromNonInterestEndPoint() { - vm2.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "createEntries"); - vm1.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "createEntries"); - vm0.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "createEntries"); + vm2.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createEntries()); + vm1.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createEntries()); + vm0.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createEntries()); - vm2.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "registerKey"); + vm2.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.registerKey()); - vm2.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "acquireConnectionsAndPut", new Object[] { new Integer(PORT2)}); + vm2.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.acquireConnectionsAndPut( new Integer(PORT2))); Wait.pause(30000); - vm2.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "verifyPut"); + vm2.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.verifyPut()); } @@ -249,9 +248,9 @@ public static void closeCache() @Override protected final void preTearDown() throws Exception { //close client - vm2.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "closeCache"); + vm2.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.closeCache()); //close server - vm0.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "closeCache"); - vm1.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "closeCache"); + vm0.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.closeCache()); + vm1.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java index ff918b8836be..811300d94010 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java @@ -1574,14 +1574,14 @@ public synchronized Set getRemoved() { @Override protected final void postTearDown() throws Exception { cleanupVM(); - vm0.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); - vm1.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); - vm2.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); - vm3.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); - vm4.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); - vm5.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); - vm6.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); - vm7.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); + vm0.invoke(() -> AsyncEventQueueTestBase.cleanupVM()); + vm1.invoke(() -> AsyncEventQueueTestBase.cleanupVM()); + vm2.invoke(() -> AsyncEventQueueTestBase.cleanupVM()); + vm3.invoke(() -> AsyncEventQueueTestBase.cleanupVM()); + vm4.invoke(() -> AsyncEventQueueTestBase.cleanupVM()); + vm5.invoke(() -> AsyncEventQueueTestBase.cleanupVM()); + vm6.invoke(() -> AsyncEventQueueTestBase.cleanupVM()); + vm7.invoke(() -> AsyncEventQueueTestBase.cleanupVM()); } public static void cleanupVM() throws IOException { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java index 02ed4ef7f0d3..25f0ff3839d1 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java @@ -71,66 +71,53 @@ public void testCreateAsyncEventQueueWithNullListener() { } public void testSerialAsyncEventQueueAttributes() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 150, true, true, "testDS", true }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 150, true, true, "testDS", true )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventQueueAttributes", - new Object[] { "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true }); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventQueueAttributes( "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true )); } public void testSerialAsyncEventQueueSize() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm6 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm7 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(1000);// pause at least for the batchTimeInterval - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventQueueSize", new Object[] { "ln" }); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventQueueSize", new Object[] { "ln" }); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventQueueSize( "ln" )); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventQueueSize( "ln" )); assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm4size); assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm5size); } @@ -140,44 +127,35 @@ public void testSerialAsyncEventQueueSize() { * NullPointerException with AsyncEventQueue#size() when number of dispatchers is more than 1 */ public void testConcurrentSerialAsyncEventQueueSize() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 150, true, false, null, false, 2, OrderPolicy.KEY }); - vm5.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 150, true, false, null, false, 2, OrderPolicy.KEY }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 150, true, false, null, false, 2, OrderPolicy.KEY )); + vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 150, true, false, null, false, 2, OrderPolicy.KEY )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(1000);// pause at least for the batchTimeInterval - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventQueueSize", new Object[] { "ln" }); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventQueueSize", new Object[] { "ln" }); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventQueueSize( "ln" )); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventQueueSize( "ln" )); assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm4size); assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm5size); } @@ -190,43 +168,34 @@ public void testConcurrentSerialAsyncEventQueueSize() { */ public void testReplicatedSerialAsyncEventQueue() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary } /** @@ -234,43 +203,34 @@ public void testReplicatedSerialAsyncEventQueue() { * with correct operation detail (added for defect #50237). */ public void testReplicatedSerialAsyncEventQueueWithCacheLoader() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithCacheLoaderAndAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithCacheLoaderAndAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithCacheLoaderAndAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithCacheLoaderAndAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doGets", new Object[] { getTestMethodName() + "_RR", - 10 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventForOperationDetail", - new Object[] { "ln", 10, true, false });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventForOperationDetail", - new Object[] { "ln", 0, true, false });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventForOperationDetail", - new Object[] { "ln", 0, true, false });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventForOperationDetail", - new Object[] { "ln", 0, true, false });// secondary + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithCacheLoaderAndAsyncEventQueue( getTestMethodName() + "_RR", "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithCacheLoaderAndAsyncEventQueue( getTestMethodName() + "_RR", "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithCacheLoaderAndAsyncEventQueue( getTestMethodName() + "_RR", "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithCacheLoaderAndAsyncEventQueue( getTestMethodName() + "_RR", "ln" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doGets( getTestMethodName() + "_RR", + 10 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventForOperationDetail( "ln", 10, true, false ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventForOperationDetail( "ln", 0, true, false ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventForOperationDetail( "ln", 0, true, false ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventForOperationDetail( "ln", 0, true, false ));// secondary } /** @@ -286,66 +246,49 @@ public void testReplicatedSerialAsyncEventQueueWithCacheLoader() { */ public void testReplicatedSerialAsyncEventQueue_ExceptionScenario() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithCustomListener", new Object[] { "ln", - false, 100, 100, false, false, null, false, 1 }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithCustomListener", new Object[] { "ln", - false, 100, 100, false, false, null, false, 1 }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithCustomListener", new Object[] { "ln", - false, 100, 100, false, false, null, false, 1 }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithCustomListener", new Object[] { "ln", - false, 100, 100, false, false, null, false, 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithCustomListener( "ln", + false, 100, 100, false, false, null, false, 1 )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithCustomListener( "ln", + false, 100, 100, false, false, null, false, 1 )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithCustomListener( "ln", + false, 100, 100, false, false, null, false, 1 )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithCustomListener( "ln", + false, 100, 100, false, false, null, false, 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm6 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm7 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(2000);// pause at least for the batchTimeInterval - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 100 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 100 )); - vm4.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "validateCustomAsyncEventListener", - new Object[] { "ln", 100 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateCustomAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateCustomAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateCustomAsyncEventListener", - new Object[] { "ln", 0 });// secondary + vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.validateCustomAsyncEventListener( "ln", 100 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateCustomAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateCustomAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateCustomAsyncEventListener( "ln", 0 ));// secondary } /** @@ -355,44 +298,35 @@ public void testReplicatedSerialAsyncEventQueue_ExceptionScenario() { * channel persistence enabled: false AsyncEventQueue conflation enabled: true */ public void testReplicatedSerialAsyncEventQueueWithConflationEnabled() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm6 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm7 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(1000);// pause at least for the batchTimeInterval final Map keyValues = new HashMap(); @@ -401,12 +335,12 @@ public void testReplicatedSerialAsyncEventQueueWithConflationEnabled() { keyValues.put(i, i); } - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_RR", keyValues }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_RR", keyValues )); Wait.pause(1000); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() }); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( + "ln", keyValues.size() )); for (int i = 0; i < 500; i++) { updateKeyValues.put(i, i + "_updated"); @@ -414,37 +348,29 @@ public void testReplicatedSerialAsyncEventQueueWithConflationEnabled() { // Put the update events and check the queue size. // There should be no conflation with the previous create events. - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_RR", updateKeyValues }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_RR", updateKeyValues )); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() + updateKeyValues.size() }); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( + "ln", keyValues.size() + updateKeyValues.size() )); // Put the update events again and check the queue size. // There should be conflation with the previous update events. - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_RR", updateKeyValues }); - - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() + updateKeyValues.size() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_RR", updateKeyValues )); + + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( + "ln", keyValues.size() + updateKeyValues.size() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary } @@ -460,44 +386,32 @@ public void testReplicatedSerialAsyncEventQueueWithConflationEnabled() { @Ignore("Disabled until I can sort out the hydra dependencies - see bug 52214") public void DISABLED_testReplicatedSerialAsyncEventQueueWithoutLocator() { int mPort = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - vm4.invoke(AsyncEventQueueTestBase.class, "createCacheWithoutLocator", - new Object[] { mPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCacheWithoutLocator", - new Object[] { mPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCacheWithoutLocator", - new Object[] { mPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCacheWithoutLocator", - new Object[] { mPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary + vm4.invoke(() -> AsyncEventQueueTestBase.createCacheWithoutLocator( mPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCacheWithoutLocator( mPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCacheWithoutLocator( mPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCacheWithoutLocator( mPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary } /** @@ -510,42 +424,33 @@ public void DISABLED_testReplicatedSerialAsyncEventQueueWithoutLocator() { */ public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary } /** @@ -559,41 +464,34 @@ public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() { @Ignore("Disabled for 52351") public void DISABLED_testReplicatedSerialAsyncEventQueueWithPeristenceEnabled_Restart() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); - String firstDStore = (String)vm4.invoke(AsyncEventQueueTestBase.class, - "createAsyncEventQueueWithDiskStore", new Object[] { "ln", false, 100, - 100, true, null }); + String firstDStore = (String)vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, + 100, true, null )); - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); // pause async channel and then do the puts vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); // ------------------ KILL VM4 AND REBUILD // ------------------------------------------ - vm4.invoke(AsyncEventQueueTestBase.class, "killSender", new Object[] {}); + vm4.invoke(() -> AsyncEventQueueTestBase.killSender()); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithDiskStore", - new Object[] { "ln", false, 100, 100, true, firstDStore }); - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, firstDStore )); + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); // ----------------------------------------------------------------------------------- - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender } /** @@ -606,44 +504,31 @@ public void DISABLED_testReplicatedSerialAsyncEventQueueWithPeristenceEnabled_Re */ @Ignore("Disabled for 52351") public void DISABLED_testReplicatedSerialAsyncEventQueueWithPeristenceEnabled_Restart2() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithDiskStore", - new Object[] { "ln", false, 100, 100, true, null }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithDiskStore", - new Object[] { "ln", false, 100, 100, true, null }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithDiskStore", - new Object[] { "ln", false, 100, 100, true, null }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm4.invoke(AsyncEventQueueTestBase.class, "addCacheListenerAndCloseCache", - new Object[] { getTestMethodName() + "_RR" }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - vm5.invoke(AsyncEventQueueTestBase.class, "doPuts", - new Object[] { getTestMethodName() + "_RR", 2000 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, null )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, null )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, null )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm4.invoke(() -> AsyncEventQueueTestBase.addCacheListenerAndCloseCache( getTestMethodName() + "_RR" )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + vm5.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", 2000 )); // ----------------------------------------------------------------------------------- - vm5.invoke(AsyncEventQueueTestBase.class, "waitForSenderToBecomePrimary", - new Object[] { AsyncEventQueueImpl - .getSenderIdFromAsyncEventQueueId("ln") }); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForSenderToBecomePrimary( AsyncEventQueueImpl + .getSenderIdFromAsyncEventQueueId("ln") )); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); LogWriterUtils.getLogWriter().info("vm4 size is: " + vm4size); LogWriterUtils.getLogWriter().info("vm5 size is: " + vm5size); @@ -662,42 +547,33 @@ public void DISABLED_testReplicatedSerialAsyncEventQueueWithPeristenceEnabled_Re * Order policy: key based ordering */ public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY }); - vm5.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY }); - vm6.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY }); - vm7.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 0 });// secondary + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY )); + vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY )); + vm6.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY )); + vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary } /** @@ -709,47 +585,38 @@ public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion() { * Async queue persistence enabled: false */ public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion_2() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD }); - vm5.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD }); - vm6.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD }); - vm7.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - vm4.invokeAsync(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 500 }); - vm4.invokeAsync(AsyncEventQueueTestBase.class, "doNextPuts", new Object[] { getTestMethodName() + "_RR", - 500, 1000 }); - vm4.invokeAsync(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000, 1500 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD )); + vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD )); + vm6.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD )); + vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + vm4.invokeAsync(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 500 )); + vm4.invokeAsync(() -> AsyncEventQueueTestBase.doNextPuts( getTestMethodName() + "_RR", + 500, 1000 )); + vm4.invokeAsync(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000, 1500 )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 0 });// secondary + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary } /** @@ -757,42 +624,33 @@ public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion_2() { * Added for defect #50514. */ public void testConcurrentSerialAsyncEventQueueWithoutOrderPolicy() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, null }); - vm5.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, null }); - vm6.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, null }); - vm7.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false, 3, null }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] {"ln", 0 });// secondary + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, null )); + vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, null )); + vm6.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, null )); + vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false, 3, null )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary } /** @@ -802,44 +660,35 @@ public void testConcurrentSerialAsyncEventQueueWithoutOrderPolicy() { * channel persistence enabled: false */ public void testPartitionedSerialAsyncEventQueue() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 500 }); - vm5.invoke(AsyncEventQueueTestBase.class, "doPutsFrom", new Object[] { - getTestMethodName() + "_PR", 500, 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 500 )); + vm5.invoke(() -> AsyncEventQueueTestBase.doPutsFrom( + getTestMethodName() + "_PR", 500, 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary } /** @@ -849,44 +698,35 @@ public void testPartitionedSerialAsyncEventQueue() { * channel persistence enabled: false AsyncEventQueue conflation enabled: true */ public void testPartitionedSerialAsyncEventQueueWithConflationEnabled() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm6 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm7 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(2000); @@ -896,11 +736,11 @@ public void testPartitionedSerialAsyncEventQueueWithConflationEnabled() { keyValues.put(i, i); } - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_PR", keyValues }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_PR", keyValues )); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() }); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( + "ln", keyValues.size() )); for (int i = 0; i < 500; i++) { updateKeyValues.put(i, i + "_updated"); @@ -908,37 +748,29 @@ public void testPartitionedSerialAsyncEventQueueWithConflationEnabled() { // Put the update events and check the queue size. // There should be no conflation with the previous create events. - vm5.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_PR", updateKeyValues }); + vm5.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_PR", updateKeyValues )); - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() + updateKeyValues.size() }); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( + "ln", keyValues.size() + updateKeyValues.size() )); // Put the update events again and check the queue size. // There should be conflation with the previous update events. - vm5.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_PR", updateKeyValues }); - - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() + updateKeyValues.size() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary + vm5.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_PR", updateKeyValues )); + + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( + "ln", keyValues.size() + updateKeyValues.size() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary } /** @@ -950,44 +782,35 @@ public void testPartitionedSerialAsyncEventQueueWithConflationEnabled() { * No VM is restarted. */ public void testPartitionedSerialAsyncEventQueueWithPeristenceEnabled() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, true, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, true, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, true, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, true, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 500 }); - vm5.invoke(AsyncEventQueueTestBase.class, "doPutsFrom", new Object[] { - getTestMethodName() + "_PR", 500, 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, true, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, true, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, true, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, true, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 500 )); + vm5.invoke(() -> AsyncEventQueueTestBase.doPutsFrom( + getTestMethodName() + "_PR", 500, 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary } /** @@ -999,66 +822,57 @@ public void testPartitionedSerialAsyncEventQueueWithPeristenceEnabled() { * There is only one vm in the site and that vm is restarted */ public void testPartitionedSerialAsyncEventQueueWithPeristenceEnabled_Restart() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); - String firstDStore = (String)vm4.invoke(AsyncEventQueueTestBase.class, - "createAsyncEventQueueWithDiskStore", new Object[] { "ln", false, 100, - 100, true, null }); + String firstDStore = (String)vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, + 100, true, null )); - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); // pause async channel and then do the puts vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueueAndWaitForDispatcherToPause", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueueAndWaitForDispatcherToPause( "ln" )); - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 1000 )); // ------------------ KILL VM4 AND REBUILD // ------------------------------------------ - vm4.invoke(AsyncEventQueueTestBase.class, "killSender", new Object[] {}); + vm4.invoke(() -> AsyncEventQueueTestBase.killSender()); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithDiskStore", - new Object[] { "ln", false, 100, 100, true, firstDStore }); - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, firstDStore )); + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); // ----------------------------------------------------------------------------------- - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender } public void testParallelAsyncEventQueueWithReplicatedRegion() { try { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { - "ln", true, 100, 100, true, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { - "ln", true, 100, 100, true, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { - "ln", true, 100, 100, true, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { - "ln", true, 100, 100, true, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, - "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( + "ln", true, 100, 100, true, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( + "ln", true, 100, 100, true, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( + "ln", true, 100, 100, true, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( + "ln", true, 100, 100, true, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR", "ln", isOffHeap() )); fail("Expected GatewaySenderConfigException where parallel async event queue can not be used with replicated region"); } catch (Exception e) { @@ -1070,52 +884,39 @@ public void testParallelAsyncEventQueueWithReplicatedRegion() { } public void testParallelAsyncEventQueue() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 256 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 256 )); - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm6size = (Integer)vm6.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm7size = (Integer)vm7.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm6size = (Integer)vm6.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm7size = (Integer)vm7.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); assertEquals(vm4size + vm5size + vm6size + vm7size, 256); } @@ -1125,92 +926,72 @@ public void testParallelAsyncEventQueue() { * (added for defect #50237). */ public void testParallelAsyncEventQueueWithCacheLoader() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithCacheLoaderAndAsyncQueue", - new Object[] { getTestMethodName() + "_PR", "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithCacheLoaderAndAsyncQueue", - new Object[] { getTestMethodName() + "_PR", "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithCacheLoaderAndAsyncQueue", - new Object[] { getTestMethodName() + "_PR", "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithCacheLoaderAndAsyncQueue", - new Object[] { getTestMethodName() + "_PR", "ln" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPutAll", new Object[] { getTestMethodName() + "_PR", - 100, 10 }); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventForOperationDetail", - new Object[] { "ln", 250, false, true }); - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventForOperationDetail", - new Object[] { "ln", 250, false, true }); - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventForOperationDetail", - new Object[] { "ln", 250, false, true }); - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventForOperationDetail", - new Object[] { "ln", 250, false, true }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithCacheLoaderAndAsyncQueue( getTestMethodName() + "_PR", "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithCacheLoaderAndAsyncQueue( getTestMethodName() + "_PR", "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithCacheLoaderAndAsyncQueue( getTestMethodName() + "_PR", "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithCacheLoaderAndAsyncQueue( getTestMethodName() + "_PR", "ln" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPutAll( getTestMethodName() + "_PR", + 100, 10 )); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventForOperationDetail( "ln", 250, false, true )); + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventForOperationDetail( "ln", 250, false, true )); + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventForOperationDetail( "ln", 250, false, true )); + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventForOperationDetail( "ln", 250, false, true )); } public void testParallelAsyncEventQueueSize() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm6 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm7 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(1000);// pause at least for the batchTimeInterval - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 1000 )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventQueueSize", new Object[] { "ln" }); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventQueueSize", new Object[] { "ln" }); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventQueueSize( "ln" )); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventQueueSize( "ln" )); assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm4size); assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm5size); @@ -1221,97 +1002,77 @@ public void testParallelAsyncEventQueueSize() { * NullPointerException with AsyncEventQueue#size() when number of dispatchers is more than 1 */ public void testConcurrentParallelAsyncEventQueueSize() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false, 2, OrderPolicy.KEY }); - vm5.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false, 2, OrderPolicy.KEY }); - vm6.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false, 2, OrderPolicy.KEY }); - vm7.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false, 2, OrderPolicy.KEY }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false, 2, OrderPolicy.KEY )); + vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false, 2, OrderPolicy.KEY )); + vm6.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false, 2, OrderPolicy.KEY )); + vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false, 2, OrderPolicy.KEY )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm6 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm7 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(1000);// pause at least for the batchTimeInterval - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 1000 )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventQueueSize", new Object[] { "ln" }); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventQueueSize", new Object[] { "ln" }); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventQueueSize( "ln" )); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventQueueSize( "ln" )); assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm4size); assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm5size); } public void testParallelAsyncEventQueueWithConflationEnabled() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, true, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, true, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, true, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, true, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, true, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, true, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, true, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, true, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm6 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm7 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(2000);// pause for the batchTimeInterval to ensure that all the // senders are paused @@ -1322,55 +1083,43 @@ public void testParallelAsyncEventQueueWithConflationEnabled() { keyValues.put(i, i); } - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_PR", keyValues }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_PR", keyValues )); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() }); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( + "ln", keyValues.size() )); for (int i = 0; i < 500; i++) { updateKeyValues.put(i, i + "_updated"); } - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_PR", updateKeyValues }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_PR", updateKeyValues )); - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() + updateKeyValues.size() }); // no conflation of creates - - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_PR", updateKeyValues }); - - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() + updateKeyValues.size() }); // conflation of updates - - vm4.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncEventQueueSize( + "ln", keyValues.size() + updateKeyValues.size() )); // no conflation of creates + + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_PR", updateKeyValues )); + + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncEventQueueSize( + "ln", keyValues.size() + updateKeyValues.size() )); // conflation of updates + + vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm6size = (Integer)vm6.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm7size = (Integer)vm7.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm6size = (Integer)vm6.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm7size = (Integer)vm7.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); assertEquals(vm4size + vm5size + vm6size + vm7size, keyValues.size()); } @@ -1379,44 +1128,35 @@ public void testParallelAsyncEventQueueWithConflationEnabled() { * Added to reproduce defect #47213 */ public void testParallelAsyncEventQueueWithConflationEnabled_bug47213() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, true, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, true, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, true, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, true, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPRWithRedundantCopyWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPRWithRedundantCopyWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPRWithRedundantCopyWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPRWithRedundantCopyWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, true, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, true, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, true, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, true, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm6 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm7 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(2000);// pause for the batchTimeInterval to ensure that all the // senders are paused @@ -1427,167 +1167,127 @@ public void testParallelAsyncEventQueueWithConflationEnabled_bug47213() { keyValues.put(i, i); } - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_PR", keyValues }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_PR", keyValues )); Wait.pause(2000); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() }); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( + "ln", keyValues.size() )); for (int i = 0; i < 500; i++) { updateKeyValues.put(i, i + "_updated"); } - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_PR", updateKeyValues }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_PR", updateKeyValues )); - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { - getTestMethodName() + "_PR", updateKeyValues }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( + getTestMethodName() + "_PR", updateKeyValues )); // pause to ensure that events have been conflated. Wait.pause(2000); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { - "ln", keyValues.size() + updateKeyValues.size() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( + "ln", keyValues.size() + updateKeyValues.size() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm6size = (Integer)vm6.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm7size = (Integer)vm7.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm6size = (Integer)vm6.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm7size = (Integer)vm7.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); assertEquals(vm4size + vm5size + vm6size + vm7size, keyValues.size()); } public void testParallelAsyncEventQueueWithOneAccessor() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm3.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm3.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - - vm3.invoke(AsyncEventQueueTestBase.class, - "createPartitionedRegionAccessorWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_PR", "ln" }); - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - - vm3.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 256 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm3.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm3.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + + vm3.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionAccessorWithAsyncEventQueue( + getTestMethodName() + "_PR", "ln" )); + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + + vm3.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 256 )); - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - vm3.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 }); + vm3.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm6size = (Integer)vm6.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm7size = (Integer)vm7.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm6size = (Integer)vm6.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm7size = (Integer)vm7.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); assertEquals(vm4size + vm5size + vm6size + vm7size, 256); } public void testParallelAsyncEventQueueWithPersistence() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, true, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, true, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, true, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, true, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 256 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, true, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, true, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, true, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, true, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 256 )); - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm6size = (Integer)vm6.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm7size = (Integer)vm7.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm6size = (Integer)vm6.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm7size = (Integer)vm7.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); assertEquals(vm4size + vm5size + vm6size + vm7size, 256); } @@ -1601,52 +1301,39 @@ public void testParallelAsyncEventQueueWithPersistence() { */ public void DISABLED_DUETO_BUG51491_testReplicatedParallelAsyncEventQueue() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); - int vm6size = (Integer)vm6.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); - int vm7size = (Integer)vm7.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); + int vm6size = (Integer)vm6.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); + int vm7size = (Integer)vm7.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); assertEquals(vm4size + vm5size + vm6size + vm7size, 1000); } @@ -1657,63 +1344,50 @@ public void DISABLED_DUETO_BUG51491_testReplicatedParallelAsyncEventQueue() { */ @Ignore("Disabled for 52349") public void DISABLED_testParallelAsyncEventQueueHA_Scenario1() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); LogWriterUtils.getLogWriter().info("Created the cache"); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithListener2", - new Object[] { "ln", true, 100, 5, false, null }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithListener2", - new Object[] { "ln", true, 100, 5, false, null }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null )); LogWriterUtils.getLogWriter().info("Created the AsyncEventQueue"); - vm4.invoke(AsyncEventQueueTestBase.class, - "createPRWithRedundantCopyWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, - "createPRWithRedundantCopyWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_PR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( + getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( + getTestMethodName() + "_PR", "ln", isOffHeap() )); LogWriterUtils.getLogWriter().info("Created PR with AsyncEventQueue"); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(1000);// pause for the batchTimeInterval to make sure the AsyncQueue // is paused LogWriterUtils.getLogWriter().info("Paused the AsyncEventQueue"); - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", - new Object[] { getTestMethodName() + "_PR", 80 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", 80 )); LogWriterUtils.getLogWriter().info("Done puts"); - Set primaryBucketsVm5 = (Set)vm5.invoke( - AsyncEventQueueTestBase.class, "getAllPrimaryBucketsOnTheNode", - new Object[] { getTestMethodName() + "_PR" }); + Set primaryBucketsVm5 = (Set)vm5.invoke(() -> AsyncEventQueueTestBase.getAllPrimaryBucketsOnTheNode( getTestMethodName() + "_PR" )); LogWriterUtils.getLogWriter().info("Primary buckets on vm5: " + primaryBucketsVm5); // ---------------------------- Kill vm5 -------------------------- - vm5.invoke(AsyncEventQueueTestBase.class, "killSender", new Object[] {}); + vm5.invoke(() -> AsyncEventQueueTestBase.killSender()); Wait.pause(1000);// give some time for rebalancing to happen - vm4.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - vm4.invoke(AsyncEventQueueTestBase.class, - "verifyAsyncEventListenerForPossibleDuplicates", new Object[] { "ln", - primaryBucketsVm5, 5 }); + vm4.invoke(() -> AsyncEventQueueTestBase.verifyAsyncEventListenerForPossibleDuplicates( "ln", + primaryBucketsVm5, 5 )); } /** @@ -1722,81 +1396,63 @@ public void DISABLED_testParallelAsyncEventQueueHA_Scenario1() { * between vm4 & vm6. */ public void testParallelAsyncEventQueueHA_Scenario2() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); LogWriterUtils.getLogWriter().info("Created the cache"); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithListener2", - new Object[] { "ln", true, 100, 5, false, null }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithListener2", - new Object[] { "ln", true, 100, 5, false, null }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null )); LogWriterUtils.getLogWriter().info("Created the AsyncEventQueue"); - vm4.invoke(AsyncEventQueueTestBase.class, - "createPRWithRedundantCopyWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, - "createPRWithRedundantCopyWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_PR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( + getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( + getTestMethodName() + "_PR", "ln", isOffHeap() )); LogWriterUtils.getLogWriter().info("Created PR with AsyncEventQueue"); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(1000);// pause for the batchTimeInterval to make sure the AsyncQueue // is paused LogWriterUtils.getLogWriter().info("Paused the AsyncEventQueue"); - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", - new Object[] { getTestMethodName() + "_PR", 80 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", 80 )); LogWriterUtils.getLogWriter().info("Done puts"); - Set primaryBucketsVm5 = (Set)vm5.invoke( - AsyncEventQueueTestBase.class, "getAllPrimaryBucketsOnTheNode", - new Object[] { getTestMethodName() + "_PR" }); + Set primaryBucketsVm5 = (Set)vm5.invoke(() -> AsyncEventQueueTestBase.getAllPrimaryBucketsOnTheNode( getTestMethodName() + "_PR" )); LogWriterUtils.getLogWriter().info("Primary buckets on vm5: " + primaryBucketsVm5); // ---------------------------- Kill vm5 -------------------------- - vm5.invoke(AsyncEventQueueTestBase.class, "killSender", new Object[] {}); + vm5.invoke(() -> AsyncEventQueueTestBase.killSender()); // ---------------------------------------------------------------- // ---------------------------- start vm6 -------------------------- - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithListener2", - new Object[] { "ln", true, 100, 5, false, null }); - vm6.invoke(AsyncEventQueueTestBase.class, - "createPRWithRedundantCopyWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_PR", "ln", isOffHeap() }); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( + getTestMethodName() + "_PR", "ln", isOffHeap() )); // ------------------------------------------------------------------ Wait.pause(1000);// give some time for rebalancing to happen - Set primaryBucketsVm6 = (Set)vm6.invoke( - AsyncEventQueueTestBase.class, "getAllPrimaryBucketsOnTheNode", - new Object[] { getTestMethodName() + "_PR" }); + Set primaryBucketsVm6 = (Set)vm6.invoke(() -> AsyncEventQueueTestBase.getAllPrimaryBucketsOnTheNode( getTestMethodName() + "_PR" )); - vm4.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - vm6.invoke(AsyncEventQueueTestBase.class, - "verifyAsyncEventListenerForPossibleDuplicates", new Object[] { "ln", - primaryBucketsVm6, 5 }); + vm6.invoke(() -> AsyncEventQueueTestBase.verifyAsyncEventListenerForPossibleDuplicates( "ln", + primaryBucketsVm6, 5 )); } /** @@ -1806,116 +1462,89 @@ public void testParallelAsyncEventQueueHA_Scenario2() { */ @Ignore("Depends on hydra code. See bug ") public void testParallelAsyncEventQueueHA_Scenario3() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); LogWriterUtils.getLogWriter().info("Created the cache"); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithListener2", - new Object[] { "ln", true, 100, 5, false, null }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithListener2", - new Object[] { "ln", true, 100, 5, false, null }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null )); LogWriterUtils.getLogWriter().info("Created the AsyncEventQueue"); - vm4.invoke(AsyncEventQueueTestBase.class, - "createPRWithRedundantCopyWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, - "createPRWithRedundantCopyWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_PR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( + getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( + getTestMethodName() + "_PR", "ln", isOffHeap() )); LogWriterUtils.getLogWriter().info("Created PR with AsyncEventQueue"); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); vm5 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); Wait.pause(1000);// pause for the batchTimeInterval to make sure the AsyncQueue // is paused LogWriterUtils.getLogWriter().info("Paused the AsyncEventQueue"); - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", - new Object[] { getTestMethodName() + "_PR", 80 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", 80 )); LogWriterUtils.getLogWriter().info("Done puts"); // ---------------------------- start vm6 -------------------------- - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueueWithListener2", - new Object[] { "ln", true, 100, 5, false, null }); - vm6.invoke(AsyncEventQueueTestBase.class, - "createPRWithRedundantCopyWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_PR", "ln", isOffHeap() }); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( + getTestMethodName() + "_PR", "ln", isOffHeap() )); // ------------------------------------------------------------------ - vm4.invoke(AsyncEventQueueTestBase.class, "doRebalance", new Object[] {}); + vm4.invoke(() -> AsyncEventQueueTestBase.doRebalance()); - Set primaryBucketsVm6 = (Set)vm6.invoke( - AsyncEventQueueTestBase.class, "getAllPrimaryBucketsOnTheNode", - new Object[] { getTestMethodName() + "_PR" }); + Set primaryBucketsVm6 = (Set)vm6.invoke(() -> AsyncEventQueueTestBase.getAllPrimaryBucketsOnTheNode( getTestMethodName() + "_PR" )); LogWriterUtils.getLogWriter().info("Primary buckets on vm6: " + primaryBucketsVm6); - vm4.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", - new Object[] { "ln" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - - vm6.invoke(AsyncEventQueueTestBase.class, - "verifyAsyncEventListenerForPossibleDuplicates", new Object[] { "ln", - primaryBucketsVm6, 5 }); + vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + + vm6.invoke(() -> AsyncEventQueueTestBase.verifyAsyncEventListenerForPossibleDuplicates( "ln", + primaryBucketsVm6, 5 )); } /** * Added for defect #50364 Can't colocate region that has AEQ with a region that does not have that same AEQ */ public void testParallelAsyncEventQueueAttachedToChildRegionButNotToParentRegion() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); // create cache on node - vm3.invoke(AsyncEventQueueTestBase.class, "createCache", - new Object[] { lnPort }); + vm3.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); // create AsyncEventQueue on node - vm3.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", - new Object[] { "ln", true, 100, 10, false, false, null, true }); + vm3.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", true, 100, 10, false, false, null, true )); // create leader (parent) PR on node - vm3.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegion", - new Object[] { getTestMethodName() + "PARENT_PR", null, 0, 100 }); - String parentRegionFullPath = (String)vm3.invoke( - AsyncEventQueueTestBase.class, "getRegionFullPath", - new Object[] { getTestMethodName() + "PARENT_PR" }); + vm3.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegion( getTestMethodName() + "PARENT_PR", null, 0, 100 )); + String parentRegionFullPath = (String)vm3.invoke(() -> AsyncEventQueueTestBase.getRegionFullPath( getTestMethodName() + "PARENT_PR" )); // create colocated (child) PR on node - vm3.invoke(AsyncEventQueueTestBase.class, - "createColocatedPartitionedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "CHILD_PR", "ln", 100, parentRegionFullPath }); + vm3.invoke(() -> AsyncEventQueueTestBase.createColocatedPartitionedRegionWithAsyncEventQueue( + getTestMethodName() + "CHILD_PR", "ln", 100, parentRegionFullPath )); // do puts in colocated (child) PR on node - vm3.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { - getTestMethodName() + "CHILD_PR", 1000 }); + vm3.invoke(() -> AsyncEventQueueTestBase.doPuts( + getTestMethodName() + "CHILD_PR", 1000 )); // wait for AsyncEventQueue to get empty on node - vm3.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm3.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); // verify the events in listener - int vm3size = (Integer)vm3.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); + int vm3size = (Integer)vm3.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); assertEquals(vm3size, 1000); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java index 55f91126183a..71a32274921f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java @@ -39,47 +39,39 @@ public void setUp() throws Exception { * Normal replication scenario */ public void testReplicatedSerialPropagation() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 });// primary sender + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender Wait.pause(2000);//give some time for system to become stable - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats", new Object[] { - "ln", 0, 1000, 1000, 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueBatchStats", - new Object[] { "ln", 10 }); - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats", new Object[] { - "ln", 0, 1000, 0, 0 }); - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueBatchStats", - new Object[] { "ln", 0 }); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats( + "ln", 0, 1000, 1000, 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats( "ln", 10 )); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats( + "ln", 0, 1000, 0, 0 )); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats( "ln", 0 )); } /** @@ -88,95 +80,83 @@ public void testReplicatedSerialPropagation() { public void testAsyncStatsTwoListeners() throws Exception { Integer lnPort = createFirstLocatorWithDSId(1); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] {lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] {lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] {lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] {lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache(lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache(lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache(lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache(lnPort )); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln1", - false, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln1", - false, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln1", - false, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln1", - false, 100, 100, false, false, null, false }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln1", + false, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln1", + false, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln1", + false, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln1", + false, 100, 100, false, false, null, false )); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln2", - false, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln2", - false, 100, 100, false, false, null, false }); - vm6.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln2", - false, 100, 100, false, false, null, false }); - vm7.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln2", - false, 100, 100, false, false, null, false }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln2", + false, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln2", + false, 100, 100, false, false, null, false )); + vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln2", + false, 100, 100, false, false, null, false )); + vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln2", + false, 100, 100, false, false, null, false )); - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() )); - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln1", 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln2", 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln1", 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln2", 1000 )); Wait.pause(2000);//give some time for system to become stable - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats", new Object[] { - "ln1", 0, 1000, 1000, 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueBatchStats", - new Object[] { "ln1", 10 }); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats", new Object[] { - "ln2", 0, 1000, 1000, 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueBatchStats", - new Object[] { "ln2", 10 }); - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats", new Object[] { - "ln1", 0, 1000, 0, 0 }); - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueBatchStats", - new Object[] { "ln1", 0 }); - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats", new Object[] { - "ln2", 0, 1000, 0, 0 }); - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueBatchStats", - new Object[] { "ln2", 0 }); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats( + "ln1", 0, 1000, 1000, 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats( "ln1", 10 )); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats( + "ln2", 0, 1000, 1000, 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats( "ln2", 10 )); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats( + "ln1", 0, 1000, 0, 0 )); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats( "ln1", 0 )); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats( + "ln2", 0, 1000, 0, 0 )); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats( "ln2", 0 )); } /** * HA scenario: kill one vm when puts are in progress on the other vm. */ public void testReplicatedSerialPropagationHA() throws Exception { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] {lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] {lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] {lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] {lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache(lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache(lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache(lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache(lnPort )); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR", "ln", isOffHeap() )); - AsyncInvocation inv1 = vm5.invokeAsync(AsyncEventQueueTestBase.class, "doPuts", - new Object[] { getTestMethodName() + "_RR", 10000 }); + AsyncInvocation inv1 = vm5.invokeAsync(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", 10000 )); Wait.pause(2000); - AsyncInvocation inv2 = vm4.invokeAsync(AsyncEventQueueTestBase.class, "killAsyncEventQueue", new Object[] { "ln" }); + AsyncInvocation inv2 = vm4.invokeAsync(() -> AsyncEventQueueTestBase.killAsyncEventQueue( "ln" )); Boolean isKilled = Boolean.FALSE; try { isKilled = (Boolean)inv2.getResult(); @@ -186,98 +166,90 @@ public void testReplicatedSerialPropagationHA() throws Exception { } AsyncInvocation inv3 = null; if(!isKilled){ - inv3 = vm5.invokeAsync(AsyncEventQueueTestBase.class, "killSender", new Object[] { "ln" }); + inv3 = vm5.invokeAsync(() -> AsyncEventQueueTestBase.killSender( "ln" )); inv3.join(); } inv1.join(); inv2.join(); Wait.pause(2000);//give some time for system to become stable - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats_Failover", new Object[] {"ln", 10000}); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats_Failover("ln", 10000)); } /** * Two regions attached to same AsyncEventQueue */ public void testReplicatedSerialPropagationUNPorcessedEvents() throws Exception { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); - vm5.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, false, false, null, false }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); + vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, false, false, null, false )); //create one RR (RR_1) on local site - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR_1", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR_1", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR_1", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR_1", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR_1", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR_1", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR_1", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR_1", "ln", isOffHeap() )); //create another RR (RR_2) on local site - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR_2", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR_2", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR_2", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] { - getTestMethodName() + "_RR_2", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR_2", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR_2", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR_2", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( + getTestMethodName() + "_RR_2", "ln", isOffHeap() )); //start puts in RR_1 in another thread - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1", 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 )); //do puts in RR_2 in main thread - vm4.invoke(AsyncEventQueueTestBase.class, "doPutsFrom", new Object[] { getTestMethodName() + "_RR_2", 1000, 1500 }); + vm4.invoke(() -> AsyncEventQueueTestBase.doPutsFrom( getTestMethodName() + "_RR_2", 1000, 1500 )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1500 }); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1500 )); Wait.pause(2000);//give some time for system to become stable - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats", new Object[] {"ln", - 0, 1500, 1500, 1500}); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueUnprocessedStats", new Object[] {"ln", 0}); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", + 0, 1500, 1500, 1500)); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueUnprocessedStats("ln", 0)); - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats", new Object[] {"ln", - 0, 1500, 0, 0}); - vm5.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueUnprocessedStats", new Object[] {"ln", 1500}); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", + 0, 1500, 0, 0)); + vm5.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueUnprocessedStats("ln", 1500)); } /** * Test with conflation enabled */ public void testSerialPropagationConflation() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - false, 100, 100, true, false, null, false }); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + false, 100, 100, true, false, null, false )); - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); vm4 - .invoke(AsyncEventQueueTestBase.class, "pauseAsyncEventQueue", - new Object[] { "ln" }); + .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" )); //pause at least for the batchTimeInterval to make sure that the AsyncEventQueue is actually paused Wait.pause(2000); @@ -287,8 +259,8 @@ public void testSerialPropagationConflation() { keyValues.put(i, i); } - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR", keyValues }); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { "ln", keyValues.size() }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( getTestMethodName() + "_RR", keyValues )); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( "ln", keyValues.size() )); for(int i=0;i<500;i++) { updateKeyValues.put(i, i+"_updated"); @@ -296,25 +268,22 @@ public void testSerialPropagationConflation() { // Put the update events and check the queue size. // There should be no conflation with the previous create events. - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR", updateKeyValues }); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( getTestMethodName() + "_RR", updateKeyValues )); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( "ln", keyValues.size() + updateKeyValues.size() )); // Put the update events again and check the queue size. // There should be conflation with the previous update events. - vm4.invoke(AsyncEventQueueTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR", updateKeyValues }); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); + vm4.invoke(() -> AsyncEventQueueTestBase.putGivenKeyValue( getTestMethodName() + "_RR", updateKeyValues )); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueSize( "ln", keyValues.size() + updateKeyValues.size() )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 }); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 )); - vm4.invoke(AsyncEventQueueTestBase.class, "resumeAsyncEventQueue", new Object[] { "ln" }); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 1000 }); + vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue( "ln" )); + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 )); Wait.pause(2000);// give some time for system to become stable - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueStats", new Object[] { - "ln", 0, 2000, 2000, 1000 }); - vm4.invoke(AsyncEventQueueTestBase.class, "checkAsyncEventQueueConflatedStats", - new Object[] { "ln", 500 }); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats( + "ln", 0, 2000, 2000, 1000 )); + vm4.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueConflatedStats( "ln", 500 )); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java index 9398628a1c83..41accace7678 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java @@ -39,43 +39,37 @@ public void setUp() throws Exception { } public void testConcurrentSerialAsyncEventQueueAttributes() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 150, true, true, "testDS", true, 5, OrderPolicy.THREAD }); + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 150, true, true, "testDS", true, 5, OrderPolicy.THREAD )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateConcurrentAsyncEventQueueAttributes", - new Object[] { "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true, 5, OrderPolicy.THREAD }); + vm4.invoke(() -> AsyncEventQueueTestBase.validateConcurrentAsyncEventQueueAttributes( "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true, 5, OrderPolicy.THREAD )); } public void testConcurrentParallelAsyncEventQueueAttributesOrderPolicyKey() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 150, true, true, "testDS", true, 5, OrderPolicy.KEY }); + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 150, true, true, "testDS", true, 5, OrderPolicy.KEY )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateConcurrentAsyncEventQueueAttributes", - new Object[] { "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true, 5, OrderPolicy.KEY }); + vm4.invoke(() -> AsyncEventQueueTestBase.validateConcurrentAsyncEventQueueAttributes( "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true, 5, OrderPolicy.KEY )); } public void testConcurrentParallelAsyncEventQueueAttributesOrderPolicyPartition() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 150, true, true, "testDS", true, 5, OrderPolicy.PARTITION }); + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 150, true, true, "testDS", true, 5, OrderPolicy.PARTITION )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateConcurrentAsyncEventQueueAttributes", - new Object[] { "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true, 5, OrderPolicy.PARTITION }); + vm4.invoke(() -> AsyncEventQueueTestBase.validateConcurrentAsyncEventQueueAttributes( "ln", 100, 150, AsyncEventQueueFactoryImpl.DEFAULT_BATCH_TIME_INTERVAL, true, "testDS", true, true, 5, OrderPolicy.PARTITION )); } /** @@ -88,52 +82,39 @@ public void testConcurrentParallelAsyncEventQueueAttributesOrderPolicyPartition( */ public void testReplicatedSerialAsyncEventQueueWithMultipleDispatcherThreadsOrderPolicyKey() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 10, true, false, null, false, 3, OrderPolicy.KEY }); - vm5.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 10, true, false, null, false, 3, OrderPolicy.KEY }); - vm6.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 10, true, false, null, false, 3, OrderPolicy.KEY }); - vm7.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 10, true, false, null, false, 3, OrderPolicy.KEY }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 100 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 10, true, false, null, false, 3, OrderPolicy.KEY )); + vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 10, true, false, null, false, 3, OrderPolicy.KEY )); + vm6.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 10, true, false, null, false, 3, OrderPolicy.KEY )); + vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 10, true, false, null, false, 3, OrderPolicy.KEY )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 100 )); - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 100 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 100 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary } /** @@ -146,38 +127,33 @@ public void testReplicatedSerialAsyncEventQueueWithMultipleDispatcherThreadsOrde */ public void testReplicatedSerialAsyncEventQueueWithMultipleDispatcherThreadsOrderPolicyThread() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 10, true, false, null, false, 3, OrderPolicy.THREAD }); - vm5.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 10, true, false, null, false, 3, OrderPolicy.THREAD }); - vm6.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 10, true, false, null, false, 3, OrderPolicy.THREAD }); - vm7.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - false, 100, 10, true, false, null, false, 3, OrderPolicy.THREAD }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createReplicatedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); - - AsyncInvocation inv1 = vm4.invokeAsync(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", - 50 }); - AsyncInvocation inv2 = vm4.invokeAsync(AsyncEventQueueTestBase.class, "doNextPuts", new Object[] { getTestMethodName() + "_RR", - 50, 100 }); - AsyncInvocation inv3 = vm4.invokeAsync(AsyncEventQueueTestBase.class, "doNextPuts", new Object[] { getTestMethodName() + "_RR", - 100, 150 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 10, true, false, null, false, 3, OrderPolicy.THREAD )); + vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 10, true, false, null, false, 3, OrderPolicy.THREAD )); + vm6.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 10, true, false, null, false, 3, OrderPolicy.THREAD )); + vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + false, 100, 10, true, false, null, false, 3, OrderPolicy.THREAD )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() )); + + AsyncInvocation inv1 = vm4.invokeAsync(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", + 50 )); + AsyncInvocation inv2 = vm4.invokeAsync(() -> AsyncEventQueueTestBase.doNextPuts( getTestMethodName() + "_RR", + 50, 100 )); + AsyncInvocation inv3 = vm4.invokeAsync(() -> AsyncEventQueueTestBase.doNextPuts( getTestMethodName() + "_RR", + 100, 150 )); try { inv1.join(); @@ -189,23 +165,15 @@ public void testReplicatedSerialAsyncEventQueueWithMultipleDispatcherThreadsOrde ie); } - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - - vm4.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 150 });// primary sender - vm5.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm6.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary - vm7.invoke(AsyncEventQueueTestBase.class, "validateAsyncEventListener", - new Object[] { "ln", 0 });// secondary + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + + vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 150 ));// primary sender + vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm6.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary + vm7.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 0 ));// secondary } /** @@ -218,52 +186,39 @@ public void testReplicatedSerialAsyncEventQueueWithMultipleDispatcherThreadsOrde */ // Disabling test for bug #48323 public void testPartitionedParallelAsyncEventQueueWithMultipleDispatcherThreadsOrderPolicyKey() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 10, true, false, null, false, 3, OrderPolicy.KEY }); - vm5.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 10, true, false, null, false, 3, OrderPolicy.KEY }); - vm6.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 10, true, false, null, false, 3, OrderPolicy.KEY }); - vm7.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", new Object[] { "ln", - true, 100, 10, true, false, null, false, 3, OrderPolicy.KEY }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 100 }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 10, true, false, null, false, 3, OrderPolicy.KEY )); + vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 10, true, false, null, false, 3, OrderPolicy.KEY )); + vm6.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 10, true, false, null, false, 3, OrderPolicy.KEY )); + vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", + true, 100, 10, true, false, null, false, 3, OrderPolicy.KEY )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 100 )); - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm6size = (Integer)vm6.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); - int vm7size = (Integer)vm7.invoke(AsyncEventQueueTestBase.class, "getAsyncEventListenerMapSize", - new Object[] { "ln"}); + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm6size = (Integer)vm6.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); + int vm7size = (Integer)vm7.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln")); assertEquals(vm4size + vm5size + vm6size + vm7size, 100); @@ -280,56 +235,39 @@ public void testPartitionedParallelAsyncEventQueueWithMultipleDispatcherThreadsO */ // Disabled test for bug #48323 public void testPartitionedParallelAsyncEventQueueWithMultipleDispatcherThreadsOrderPolicyPartition() { - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm5.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm6.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm7.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", - new Object[] { "ln", true, 100, 10, true, false, null, false, 3, - OrderPolicy.PARTITION }); - vm5.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", - new Object[] { "ln", true, 100, 10, true, false, null, false, 3, - OrderPolicy.PARTITION }); - vm6.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", - new Object[] { "ln", true, 100, 10, true, false, null, false, 3, - OrderPolicy.PARTITION }); - vm7.invoke(AsyncEventQueueTestBase.class, "createConcurrentAsyncEventQueue", - new Object[] { "ln", true, 100, 10, true, false, null, false, 3, - OrderPolicy.PARTITION }); - - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm5.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm6.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - vm7.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR", "ln", isOffHeap() }); - - vm4.invoke(AsyncEventQueueTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", - 100 }); - - vm4.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm5.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm6.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - vm7.invoke(AsyncEventQueueTestBase.class, "waitForAsyncQueueToGetEmpty", - new Object[] { "ln" }); - - int vm4size = (Integer)vm4.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); - int vm5size = (Integer)vm5.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); - int vm6size = (Integer)vm6.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); - int vm7size = (Integer)vm7.invoke(AsyncEventQueueTestBase.class, - "getAsyncEventListenerMapSize", new Object[] { "ln" }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", true, 100, 10, true, false, null, false, 3, + OrderPolicy.PARTITION )); + vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", true, 100, 10, true, false, null, false, 3, + OrderPolicy.PARTITION )); + vm6.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", true, 100, 10, true, false, null, false, 3, + OrderPolicy.PARTITION )); + vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln", true, 100, 10, true, false, null, false, 3, + OrderPolicy.PARTITION )); + + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm6.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() )); + + vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR", + 100 )); + + vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" )); + + int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); + int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); + int vm6size = (Integer)vm6.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); + int vm7size = (Integer)vm7.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" )); assertEquals(100, vm4size + vm5size + vm6size + vm7size); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java index 0035d1616717..a21e2ab89efe 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java @@ -38,16 +38,13 @@ public void setUp() throws Exception { public void testSameSenderWithNonColocatedRegions() throws Exception { IgnoredException.addIgnoredException("cannot have the same parallel async"); - Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class, - "createFirstLocatorWithDSId", new Object[] { 1 }); - vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort }); - vm4.invoke(AsyncEventQueueTestBase.class, "createAsyncEventQueue", new Object[] { "ln", - true, 100, 100, false, false, null, false }); - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR1", "ln", isOffHeap() }); + Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 )); + vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort )); + vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", + true, 100, 100, false, false, null, false )); + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR1", "ln", isOffHeap() )); try { - vm4.invoke(AsyncEventQueueTestBase.class, "createPartitionedRegionWithAsyncEventQueue", - new Object[] { getTestMethodName() + "_PR2", "ln", isOffHeap() }); + vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR2", "ln", isOffHeap() )); fail("Expected IllegateStateException : cannot have the same parallel gateway sender"); } catch (Exception e) { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java index 492ec610b806..e9c725d024cc 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java @@ -182,32 +182,32 @@ public void setUp() throws Exception { super.setUp(); Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(ExceptionsDUnitTest.class, "init"); + vm0.invoke(() -> ExceptionsDUnitTest.init()); } @Override protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(ExceptionsDUnitTest.class, "closeCache"); + vm0.invoke(() -> ExceptionsDUnitTest.closeCache()); } public static void testBlockingTimeOut() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(ExceptionsDUnitTest.class, "runTest1"); + vm0.invoke(() -> ExceptionsDUnitTest.runTest1()); } public static void testLoginTimeOut() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(ExceptionsDUnitTest.class, "runTest2"); + vm0.invoke(() -> ExceptionsDUnitTest.runTest2()); } public static void testTransactionTimeOut() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(ExceptionsDUnitTest.class, "runTest3"); + vm0.invoke(() -> ExceptionsDUnitTest.runTest3()); } public static void runTest1() throws Exception { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java index 96e5a8de33ac..68153ebf111d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java @@ -256,15 +256,14 @@ public void setUp() throws Exception { @Override protected final void preTearDown() throws Exception { VM vm0 = Host.getHost(0).getVM(0); - vm0.invoke(IdleTimeOutDUnitTest.class, "closeCache"); + vm0.invoke(() -> IdleTimeOutDUnitTest.closeCache()); } public void testIdleTimeOut() throws Throwable { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(IdleTimeOutDUnitTest.class, "runTest1"); - AsyncInvocation asyncObj = vm0.invokeAsync(IdleTimeOutDUnitTest.class, - "runTest2"); + vm0.invoke(() -> IdleTimeOutDUnitTest.runTest1()); + AsyncInvocation asyncObj = vm0.invokeAsync(() -> IdleTimeOutDUnitTest.runTest2()); ThreadUtils.join(asyncObj, 30 * 1000); if(asyncObj.exceptionOccurred()){ Assert.fail("asyncObj failed", asyncObj.getException()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java index c5a4e02e45f3..fb617d92a5a4 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java @@ -231,12 +231,12 @@ public void disabledtearDown2() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); try { - vm0.invoke(LoginTimeOutDUnitTest.class, "destroyTable"); + vm0.invoke(() -> LoginTimeOutDUnitTest.destroyTable()); } catch (Exception e) { if ( (e instanceof RMIException) || (e instanceof SQLException)) { // sometimes we have lock timeout problems destroying the table in // this test - vm0.invoke(DistributedTestCase.class, "disconnectFromDS"); + vm0.invoke(() -> DistributedTestCase.disconnectFromDS()); } } } @@ -250,8 +250,8 @@ public void testBug52206() { public void disabledtestLoginTimeOut() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - AsyncInvocation test1 = vm0.invokeAsync(LoginTimeOutDUnitTest.class, "runTest1"); - AsyncInvocation test2 = vm0.invokeAsync(LoginTimeOutDUnitTest.class, "runTest2"); + AsyncInvocation test1 = vm0.invokeAsync(() -> LoginTimeOutDUnitTest.runTest1()); + AsyncInvocation test2 = vm0.invokeAsync(() -> LoginTimeOutDUnitTest.runTest2()); ThreadUtils.join(test2, 120 * 1000); if(test2.exceptionOccurred()){ Assert.fail("asyncObj failed", test2.getException()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java index 1ab5b2ca7cc4..9ee5922eeda0 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java @@ -260,7 +260,7 @@ protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); try { - vm0.invoke(MaxPoolSizeDUnitTest.class, "destroyTable"); + vm0.invoke(() -> MaxPoolSizeDUnitTest.destroyTable()); } finally { disconnectAllFromDS(); } @@ -269,8 +269,7 @@ protected final void preTearDown() throws Exception { public static void testMaxPoolSize() throws Throwable{ Host host = Host.getHost(0); VM vm0 = host.getVM(0); - AsyncInvocation asyncObj = vm0.invokeAsync(MaxPoolSizeDUnitTest.class, - "runTest1"); + AsyncInvocation asyncObj = vm0.invokeAsync(() -> MaxPoolSizeDUnitTest.runTest1()); ThreadUtils.join(asyncObj, 30 * 1000); if(asyncObj.exceptionOccurred()){ Assert.fail("asyncObj failed", asyncObj.getException()); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java index fead02ec84b2..1a19b0bb7863 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java @@ -123,21 +123,21 @@ public void setUp() throws Exception { super.setUp(); Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "init"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.init()); } @Override protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "closeCache"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.closeCache()); } public static void testTimeOut() throws Throwable{ Host host = Host.getHost(0); VM vm0 = host.getVM(0); - AsyncInvocation async1 = vm0.invokeAsync(TransactionTimeOutDUnitTest.class, "runTest1"); - AsyncInvocation async2 =vm0.invokeAsync(TransactionTimeOutDUnitTest.class, "runTest2"); + AsyncInvocation async1 = vm0.invokeAsync(() -> TransactionTimeOutDUnitTest.runTest1()); + AsyncInvocation async2 =vm0.invokeAsync(() -> TransactionTimeOutDUnitTest.runTest2()); ThreadUtils.join(async1, 30 * 1000); ThreadUtils.join(async2, 30 * 1000); @@ -152,49 +152,49 @@ public static void testTimeOut() throws Throwable{ public static void test1() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "runTest3"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.runTest3()); } public static void test2() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "runTest4"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.runTest4()); } public static void test3() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "runTest5"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.runTest5()); } public static void test4() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "runTest6"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.runTest6()); } public static void test5() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "runTest7"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.runTest7()); } public static void test6() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "runTest8"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.runTest8()); } public static void test7() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "runTest9"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.runTest9()); } public static void test8() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TransactionTimeOutDUnitTest.class, "runTest10"); + vm0.invoke(() -> TransactionTimeOutDUnitTest.runTest10()); } public static void runTest1() throws Exception { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java index fab159d27bb2..8096dc0aec63 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java @@ -331,7 +331,7 @@ public void setUp() throws java.lang.Exception { vm0.invoke(CacheUtils.class, "setTableName", o); //delete the rows which are inseted in CacheUtils.init by calling delRows // method - vm0.invoke(TxnManagerMultiThreadDUnitTest.class, "delRows"); + vm0.invoke(() -> TxnManagerMultiThreadDUnitTest.delRows()); } public static void delRows() { @@ -424,13 +424,12 @@ public static void getNumberOfRows() { */ public static void test1AllCommit() throws Throwable { VM vm0 = Host.getHost(0).getVM(0); - AsyncInvocation asyncObj1 = vm0.invokeAsync( - TxnManagerMultiThreadDUnitTest.class, "callCommitThreads"); + AsyncInvocation asyncObj1 = vm0.invokeAsync(() -> TxnManagerMultiThreadDUnitTest.callCommitThreads()); ThreadUtils.join(asyncObj1, 30 * 1000); if(asyncObj1.exceptionOccurred()){ Assert.fail("asyncObj1 failed", asyncObj1.getException()); } - vm0.invoke(TxnManagerMultiThreadDUnitTest.class, "getNumberOfRows"); + vm0.invoke(() -> TxnManagerMultiThreadDUnitTest.getNumberOfRows()); }//end of testAllCommit /* @@ -457,13 +456,12 @@ public static void callCommitThreads() { */ public static void _test3Commit2Rollback() throws Throwable { VM vm0 = Host.getHost(0).getVM(0); - AsyncInvocation asyncObj1 = vm0.invokeAsync( - TxnManagerMultiThreadDUnitTest.class, "callCommitandRollbackThreads"); + AsyncInvocation asyncObj1 = vm0.invokeAsync(() -> TxnManagerMultiThreadDUnitTest.callCommitandRollbackThreads()); ThreadUtils.join(asyncObj1, 30 * 1000); if(asyncObj1.exceptionOccurred()){ Assert.fail("asyncObj1 failed", asyncObj1.getException()); } - vm0.invoke(TxnManagerMultiThreadDUnitTest.class, "getNumberOfRows"); + vm0.invoke(() -> TxnManagerMultiThreadDUnitTest.getNumberOfRows()); }//end of test3Commit2Rollback public static void callCommitandRollbackThreads() { @@ -493,7 +491,7 @@ public static void callCommitandRollbackThreads() { * (InterruptedException e) { fail ("Current thread experienced Interrupted * Exception !"); } * - * //vm0.invoke(TxnManagerMultiThreadDUnitTest.class, "getNumberOfRows"); + * //vm0.invoke(() -> TxnManagerMultiThreadDUnitTest.getNumberOfRows()); * * }//end of test3Commit2Rollback * diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java index a9f41ac47b6c..746972a641f5 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java @@ -119,14 +119,14 @@ public void setUp() throws Exception { super.setUp(); Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TxnTimeOutDUnitTest.class, "init"); + vm0.invoke(() -> TxnTimeOutDUnitTest.init()); } @Override protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(TxnTimeOutDUnitTest.class, "closeCache"); + vm0.invoke(() -> TxnTimeOutDUnitTest.closeCache()); } public void testMultiThreaded() throws NamingException, SQLException,Throwable { @@ -193,9 +193,8 @@ public void testMultiThreaded() throws NamingException, SQLException,Throwable { public static void testLoginTimeOut() throws Throwable { Host host = Host.getHost(0); VM vm0 = host.getVM(0); - AsyncInvocation asyncObj1 = vm0.invokeAsync(TxnTimeOutDUnitTest.class, - "runTest2"); - AsyncInvocation asyncObj2 = vm0.invokeAsync(TxnTimeOutDUnitTest.class, "runTest1"); + AsyncInvocation asyncObj1 = vm0.invokeAsync(() -> TxnTimeOutDUnitTest.runTest2()); + AsyncInvocation asyncObj2 = vm0.invokeAsync(() -> TxnTimeOutDUnitTest.runTest1()); ThreadUtils.join(asyncObj1, 5 * 60 * 1000); if(asyncObj1.exceptionOccurred()){ diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java index 7126c467b0b8..c038215b62a6 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java @@ -375,7 +375,7 @@ public String description() { }); // validate pub values against sub values - final int totalUpdateEvents = sub.invokeInt(getClass(), "getUpdateEvents"); + final int totalUpdateEvents = sub.invoke(() -> getUpdateEvents()); // validate pub values against pub statistics against pub archive for (int i = 0; i < NUM_PUBS; i++) { @@ -462,7 +462,7 @@ public void run2() throws CacheException { int totalCombinedPuts = 0; for (int i = 0; i < NUM_PUBS; i++) { final int pubIdx = i; - final int totalPuts = pubs[pubIdx].invokeInt(getClass(), "getPuts"); + final int totalPuts = pubs[pubIdx].invoke(() -> getPuts()); assertEquals(MAX_PUTS * NUM_PUB_THREADS, totalPuts); totalCombinedPuts += totalPuts; } @@ -537,15 +537,13 @@ public void run2() throws CacheException { } }); - final int updateEvents = sub.invokeInt(getClass(), "readIntStat", - new Object[] {new File(subArchive), "PubSubStats", "updateEvents"}); + final int updateEvents = sub.invoke(() -> readIntStat(new File(subArchive), "PubSubStats", "updateEvents")); assertTrue(updateEvents > 0); assertEquals(MAX_PUTS * NUM_PUB_THREADS * NUM_PUBS, updateEvents); int puts = 0; for (int pubVM = 0; pubVM < NUM_PUBS; pubVM++) { - int vmPuts = (int)pubs[pubVM].invokeInt(getClass(), "readIntStat", - new Object[] {new File(pubArchives[pubVM]), "PubSubStats", "puts"}); + int vmPuts = (int)pubs[pubVM].invoke(() -> readIntStat(new File(pubArchives[pubVM]), "PubSubStats", "puts")); assertTrue(vmPuts > 0); assertEquals(MAX_PUTS * NUM_PUB_THREADS, vmPuts); puts += vmPuts; diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java index 320e20a113db..6ef2180853f0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java @@ -135,8 +135,7 @@ public void testMemberMBeanOperations() throws Exception { - String log = (String) vm.invoke(CacheManagementDUnitTest.class, - "fetchLog"); + String log = (String) vm.invoke(() -> CacheManagementDUnitTest.fetchLog()); assertNotNull(log); LogWriterUtils.getLogWriter().info( " Log Of Member is " + log.toString() @@ -144,11 +143,11 @@ public void testMemberMBeanOperations() throws Exception { - vm.invoke(CacheManagementDUnitTest.class, "fetchJVMMetrics"); + vm.invoke(() -> CacheManagementDUnitTest.fetchJVMMetrics()); - vm.invoke(CacheManagementDUnitTest.class, "fetchOSMetrics"); + vm.invoke(() -> CacheManagementDUnitTest.fetchOSMetrics()); - vm.invoke(CacheManagementDUnitTest.class, "shutDownMember"); + vm.invoke(() -> CacheManagementDUnitTest.shutDownMember()); } @@ -166,8 +165,7 @@ public void testMemberMBeanOperations() throws Exception { */ public void testMemberMBeanOpsRemote() throws Exception { initManagement(false); - getManagingNode().invoke( - CacheManagementDUnitTest.class, "invokeRemoteOps"); + getManagingNode().invoke(() -> CacheManagementDUnitTest.invokeRemoteOps()); } /** @@ -191,7 +189,7 @@ public void testManager() throws Exception { // Does not start the manager createManagementCache(managingNode); - node3.invoke(CacheManagementDUnitTest.class, "startManager"); + node3.invoke(() -> CacheManagementDUnitTest.startManager()); // Now start Managing node manager. System will have two Managers now which // should be OK @@ -245,7 +243,7 @@ public void testServiceCloseManagedNode() throws Exception{ // Does not start the manager createManagementCache(managingNode); - node3.invoke(CacheManagementDUnitTest.class, "startManager"); + node3.invoke(() -> CacheManagementDUnitTest.startManager()); closeCache(node3); validateServiceResource(node3); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java index 9d42589a7060..868073eea231 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java @@ -132,18 +132,18 @@ public void testClientHealthStats_SubscriptionEnabled() throws Exception { helper.createManagementCache(managingNode); helper.startManagingNode(managingNode); - int port = (Integer) server.invoke(ClientHealthStatsDUnitTest.class, "createServerCache"); + int port = (Integer) server.invoke(() -> ClientHealthStatsDUnitTest.createServerCache()); DistributedMember serverMember = helper.getMember(server); - client.invoke(ClientHealthStatsDUnitTest.class, "createClientCache", new Object[] {server.getHost(), port, 1, true, false}); + client.invoke(() -> ClientHealthStatsDUnitTest.createClientCache(server.getHost(), port, 1, true, false)); - client2.invoke(ClientHealthStatsDUnitTest.class, "createClientCache", new Object[] {server.getHost(), port, 2, true, false}); + client2.invoke(() -> ClientHealthStatsDUnitTest.createClientCache(server.getHost(), port, 2, true, false)); - client.invoke(ClientHealthStatsDUnitTest.class, "put"); - client2.invoke(ClientHealthStatsDUnitTest.class, "put"); + client.invoke(() -> ClientHealthStatsDUnitTest.put()); + client2.invoke(() -> ClientHealthStatsDUnitTest.put()); - managingNode.invoke(ClientHealthStatsDUnitTest.class, "verifyClientStats", new Object[] {serverMember, port, 2}); + managingNode.invoke(() -> ClientHealthStatsDUnitTest.verifyClientStats(serverMember, port, 2)); helper.stopManagingNode(managingNode); } @@ -152,18 +152,18 @@ public void testClientHealthStats_SubscriptionDisabled() throws Exception { helper.createManagementCache(managingNode); helper.startManagingNode(managingNode); - int port = (Integer) server.invoke(ClientHealthStatsDUnitTest.class, "createServerCache"); + int port = (Integer) server.invoke(() -> ClientHealthStatsDUnitTest.createServerCache()); DistributedMember serverMember = helper.getMember(server); - client.invoke(ClientHealthStatsDUnitTest.class, "createClientCache", new Object[] {server.getHost(), port, 1, false, false}); + client.invoke(() -> ClientHealthStatsDUnitTest.createClientCache(server.getHost(), port, 1, false, false)); - client2.invoke(ClientHealthStatsDUnitTest.class, "createClientCache", new Object[] {server.getHost(), port, 2, false, false}); + client2.invoke(() -> ClientHealthStatsDUnitTest.createClientCache(server.getHost(), port, 2, false, false)); - client.invoke(ClientHealthStatsDUnitTest.class, "put"); - client2.invoke(ClientHealthStatsDUnitTest.class, "put"); + client.invoke(() -> ClientHealthStatsDUnitTest.put()); + client2.invoke(() -> ClientHealthStatsDUnitTest.put()); - managingNode.invoke(ClientHealthStatsDUnitTest.class, "verifyClientStats", new Object[] {serverMember, port, 0}); + managingNode.invoke(() -> ClientHealthStatsDUnitTest.verifyClientStats(serverMember, port, 0)); helper.stopManagingNode(managingNode); } @@ -172,42 +172,42 @@ public void testClientHealthStats_DurableClient() throws Exception { helper.createManagementCache(managingNode); helper.startManagingNode(managingNode); - int port = (Integer) server.invoke(ClientHealthStatsDUnitTest.class, "createServerCache"); + int port = (Integer) server.invoke(() -> ClientHealthStatsDUnitTest.createServerCache()); DistributedMember serverMember = helper.getMember(server); - client.invoke(ClientHealthStatsDUnitTest.class, "createClientCache", new Object[] {server.getHost(), port, 1, true, true}); + client.invoke(() -> ClientHealthStatsDUnitTest.createClientCache(server.getHost(), port, 1, true, true)); - client2.invoke(ClientHealthStatsDUnitTest.class, "createClientCache", new Object[] {server.getHost(), port, 2, true, true}); + client2.invoke(() -> ClientHealthStatsDUnitTest.createClientCache(server.getHost(), port, 2, true, true)); - client.invoke(ClientHealthStatsDUnitTest.class, "put"); - client2.invoke(ClientHealthStatsDUnitTest.class, "put"); + client.invoke(() -> ClientHealthStatsDUnitTest.put()); + client2.invoke(() -> ClientHealthStatsDUnitTest.put()); - client.invoke(ClientHealthStatsDUnitTest.class, "closeClientCache"); + client.invoke(() -> ClientHealthStatsDUnitTest.closeClientCache()); - client2.invoke(ClientHealthStatsDUnitTest.class, "closeClientCache"); + client2.invoke(() -> ClientHealthStatsDUnitTest.closeClientCache()); - managingNode.invoke(ClientHealthStatsDUnitTest.class, "verifyClientStats", new Object[] {serverMember, port, 2}); + managingNode.invoke(() -> ClientHealthStatsDUnitTest.verifyClientStats(serverMember, port, 2)); helper.stopManagingNode(managingNode); } public void testStatsMatchWithSize() throws Exception { // start a server - int port = (Integer) server.invoke(ClientHealthStatsDUnitTest.class, "createServerCache"); + int port = (Integer) server.invoke(() -> ClientHealthStatsDUnitTest.createServerCache()); // create durable client, with durable RI - client.invoke(ClientHealthStatsDUnitTest.class, "createClientCache", new Object[] {server.getHost(), port, 1, true, false}); + client.invoke(() -> ClientHealthStatsDUnitTest.createClientCache(server.getHost(), port, 1, true, false)); // do puts on server from three different threads, pause after 500 puts each. - server.invoke(ClientHealthStatsDUnitTest.class, "doPuts"); + server.invoke(() -> ClientHealthStatsDUnitTest.doPuts()); // close durable client - client.invoke(ClientHealthStatsDUnitTest.class, "closeClientCache"); + client.invoke(() -> ClientHealthStatsDUnitTest.closeClientCache()); // resume puts on server, add another 100. - server.invokeAsync(ClientHealthStatsDUnitTest.class, "resumePuts"); + server.invokeAsync(() -> ClientHealthStatsDUnitTest.resumePuts()); // start durable client - client.invoke(ClientHealthStatsDUnitTest.class, "createClientCache", new Object[] {server.getHost(), port, 1, true, false}); + client.invoke(() -> ClientHealthStatsDUnitTest.createClientCache(server.getHost(), port, 1, true, false)); // wait for full queue dispatch - client.invoke(ClientHealthStatsDUnitTest.class, "waitForLastKey"); + client.invoke(() -> ClientHealthStatsDUnitTest.waitForLastKey()); // verify the stats - server.invoke(ClientHealthStatsDUnitTest.class, "verifyStats",new Object[] {port}); + server.invoke(() -> ClientHealthStatsDUnitTest.verifyStats(port)); } public static int createServerCache() throws Exception { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java index e52594e30e27..e06fd3e891a2 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java @@ -273,12 +273,12 @@ public void putBigInstances(String regionName) throws CacheException { private void createRegionsInNodes() { // Create local Region on servers - managedNode1.invoke(QueryUsingFunctionContextDUnitTest.class, "createLocalRegion"); + managedNode1.invoke(() -> QueryUsingFunctionContextDUnitTest.createLocalRegion()); // Create ReplicatedRegion on servers - managedNode1.invoke(QueryUsingFunctionContextDUnitTest.class, "createReplicatedRegion"); - managedNode2.invoke(QueryUsingFunctionContextDUnitTest.class, "createReplicatedRegion"); - managedNode3.invoke(QueryUsingFunctionContextDUnitTest.class, "createReplicatedRegion"); + managedNode1.invoke(() -> QueryUsingFunctionContextDUnitTest.createReplicatedRegion()); + managedNode2.invoke(() -> QueryUsingFunctionContextDUnitTest.createReplicatedRegion()); + managedNode3.invoke(() -> QueryUsingFunctionContextDUnitTest.createReplicatedRegion()); try { this.createDistributedRegion(managedNode2, repRegionName2); this.createDistributedRegion(managedNode1, repRegionName3); @@ -288,9 +288,9 @@ private void createRegionsInNodes() { } // Create two colocated PartitionedRegions On Servers. - managedNode1.invoke(QueryUsingFunctionContextDUnitTest.class, "createColocatedPR"); - managedNode2.invoke(QueryUsingFunctionContextDUnitTest.class, "createColocatedPR"); - managedNode3.invoke(QueryUsingFunctionContextDUnitTest.class, "createColocatedPR"); + managedNode1.invoke(() -> QueryUsingFunctionContextDUnitTest.createColocatedPR()); + managedNode2.invoke(() -> QueryUsingFunctionContextDUnitTest.createColocatedPR()); + managedNode3.invoke(() -> QueryUsingFunctionContextDUnitTest.createColocatedPR()); this.managingNode.invoke(new SerializableRunnable("Wait for all Region Proxies to get replicated") { @@ -760,11 +760,11 @@ public void run() { } }); - final List member1RealData = (List)managedNode1.invoke(QueryDataDUnitTest.class, "getLocalDataSet", new Object[] { PartitionedRegionName6 }); + final List member1RealData = (List)managedNode1.invoke(() -> QueryDataDUnitTest.getLocalDataSet( PartitionedRegionName6 )); - final List member2RealData = (List) managedNode2.invoke(QueryDataDUnitTest.class, "getLocalDataSet", new Object[] { PartitionedRegionName6 }); + final List member2RealData = (List) managedNode2.invoke(() -> QueryDataDUnitTest.getLocalDataSet( PartitionedRegionName6 )); - final List member3RealData = (List) managedNode3.invoke(QueryDataDUnitTest.class, "getLocalDataSet", new Object[] { PartitionedRegionName6 }); + final List member3RealData = (List) managedNode3.invoke(() -> QueryDataDUnitTest.getLocalDataSet( PartitionedRegionName6 )); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java index c25a1db7dfdd..fcb1e228ad5e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java @@ -429,10 +429,8 @@ public void run2() throws CacheException { // create bridge client in vm0... vm0.invoke(createBridgeClient); - String clientMemberId = (String) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getMemberId"); - DistributedMember clientMember = (DistributedMember) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); + String clientMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId()); + DistributedMember clientMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember()); // should trigger both adapter and bridge listener but not system listener synchronized(adapter) { @@ -565,10 +563,8 @@ public void run() { // reconnect bridge client to test for crashed event vm0.invoke(createBridgeClient); - clientMemberId = (String) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getMemberId"); - clientMember = (DistributedMember) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); + clientMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId()); + clientMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember()); synchronized(adapter) { if (!firedAdapter[JOINED]) { @@ -888,10 +884,8 @@ public void run2() throws CacheException { // create bridge client in vm0... vm0.invoke(createBridgeClient); - String clientMemberId = (String) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getMemberId"); - DistributedMember clientMember = (DistributedMember) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); + String clientMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId()); + DistributedMember clientMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember()); // should trigger both adapter and bridge listener but not system listener synchronized(adapter) { @@ -1036,10 +1030,8 @@ public void run() { // reconnect bridge client vm0.invoke(createBridgeClient); - clientMemberId = (String) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getMemberId"); - clientMember = (DistributedMember) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); + clientMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId()); + clientMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember()); synchronized(adapter) { if (!firedAdapter[JOINED]) { @@ -1183,10 +1175,8 @@ public void run() { // reconnect bridge client vm0.invoke(createBridgeClient); - clientMemberId = (String) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getMemberId"); - clientMember = (DistributedMember) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); + clientMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId()); + clientMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember()); synchronized(adapter) { if (!firedAdapter[JOINED]) { @@ -1584,10 +1574,8 @@ public void run2() throws CacheException { vm0.invoke(createPeerCache); - String peerMemberId = (String) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getMemberId"); - DistributedMember peerMember = (DistributedMember) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); + String peerMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId()); + DistributedMember peerMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember()); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] peerMemberId=" + peerMemberId); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] peerMember=" + peerMember); @@ -1873,12 +1861,9 @@ public void run2() throws CacheException { // gather details for later creation of pool... assertEquals(ports[0], - vm0.invokeInt(UniversalMembershipListenerAdapterDUnitTest.class, - "getTestServerEventsInLonerClient_port")); - String serverMemberId = (String) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getMemberId"); - DistributedMember serverMember = (DistributedMember) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); + vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port())); + String serverMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId()); + DistributedMember serverMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember()); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId); @@ -2044,12 +2029,9 @@ public void run() { // gather details for later creation of pool... assertEquals(ports[0], - vm0.invokeInt(UniversalMembershipListenerAdapterDUnitTest.class, - "getTestServerEventsInLonerClient_port")); - serverMemberId = (String) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getMemberId"); - serverMember = (DistributedMember) vm0.invoke( - UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); + vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port())); + serverMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId()); + serverMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember()); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java index 7378adad195b..0eba70013276 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java @@ -250,7 +250,7 @@ public void testExecuteFunctionOnMember() { Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); FunctionService.registerFunction(function); final VM vm1 = Host.getHost(0).getVM(1); - final String vm1MemberId = (String) vm1.invoke(FunctionCommandsDUnitTest.class, "getMemberId"); + final String vm1MemberId = (String) vm1.invoke(() -> FunctionCommandsDUnitTest.getMemberId()); Host.getHost(0).getVM(0).invoke(new SerializableRunnable() { public void run() { @@ -404,7 +404,7 @@ public void testDestroyOnMember() { Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); FunctionService.registerFunction(function); final VM vm1 = Host.getHost(0).getVM(1); - final String vm1MemberId = (String) vm1.invoke(FunctionCommandsDUnitTest.class, "getMemberId"); + final String vm1MemberId = (String) vm1.invoke(() -> FunctionCommandsDUnitTest.getMemberId()); String command = "destroy function --id=" + function.getId() + " --member=" + vm1MemberId; LogWriterUtils.getLogWriter().info("testDestroyOnMember command=" + command); CommandResult cmdResult = executeCommand(command); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java index d6719d106436..6d9d603c2df0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java @@ -205,8 +205,8 @@ public void run() { } }); - final String vm1MemberId = (String) vm1.invoke(GemfireDataCommandsDUnitTest.class, "getMemberId"); - final String vm2MemberId = (String) vm2.invoke(GemfireDataCommandsDUnitTest.class, "getMemberId"); + final String vm1MemberId = (String) vm1.invoke(() -> GemfireDataCommandsDUnitTest.getMemberId()); + final String vm2MemberId = (String) vm2.invoke(() -> GemfireDataCommandsDUnitTest.getMemberId()); LogWriterUtils.getLogWriter().info("Vm1 ID : " + vm1MemberId); LogWriterUtils.getLogWriter().info("Vm2 ID : " + vm2MemberId); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java index 841c9606e237..a5260eb1f3ea 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java @@ -109,7 +109,7 @@ public static String getMemberId() { public void testGCForMemberID() { createDefaultSetup(null); final VM vm1 = Host.getHost(0).getVM(1); - final String vm1MemberId = (String) vm1.invoke(MiscellaneousCommandsDUnitTest.class, "getMemberId"); + final String vm1MemberId = (String) vm1.invoke(() -> MiscellaneousCommandsDUnitTest.getMemberId()); String command = "gc --member=" + vm1MemberId; CommandResult cmdResult = executeCommand(command); cmdResult.resetToFirstLine(); @@ -135,7 +135,7 @@ public void testShowLogDefault() throws IOException { props.setProperty("log-file", "testShowLogDefault.log"); createDefaultSetup(props); final VM vm1 = Host.getHost(0).getVM(0); - final String vm1MemberId = (String) vm1.invoke(MiscellaneousCommandsDUnitTest.class, "getMemberId"); + final String vm1MemberId = (String) vm1.invoke(() -> MiscellaneousCommandsDUnitTest.getMemberId()); String command = "show log --member=" + vm1MemberId; CommandResult cmdResult = executeCommand(command); if (cmdResult != null) { @@ -157,7 +157,7 @@ public void testShowLogNumLines() { try { createDefaultSetup(props); final VM vm1 = Host.getHost(0).getVM(0); - final String vm1MemberId = (String) vm1.invoke(MiscellaneousCommandsDUnitTest.class, "getMemberId"); + final String vm1MemberId = (String) vm1.invoke(() -> MiscellaneousCommandsDUnitTest.getMemberId()); String command = "show log --member=" + vm1MemberId + " --lines=50"; CommandResult cmdResult = executeCommand(command); if (cmdResult != null) { diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java index 7d67b61e0eca..9cc863f24002 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java @@ -126,7 +126,7 @@ public void testExportLogsForMember() throws IOException { String end = sf.format(enddate); final VM vm1 = Host.getHost(0).getVM(1); - final String vm1MemberId = (String) vm1.invoke(MiscellaneousCommandsDUnitTest.class, "getMemberId"); + final String vm1MemberId = (String) vm1.invoke(() -> MiscellaneousCommandsDUnitTest.getMemberId()); String dir = getCurrentTimeString(); String logLevel = LogWriterImpl.levelToString(LogWriterImpl.INFO_LEVEL); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java index c2f2b60edd0e..b410a828969b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java @@ -95,8 +95,7 @@ public void run() { } } }); - Integer numOfRunningFunctions = (Integer) managingNode.invoke( - TestFunctionsDUnitTest.class, "getNumOfRunningFunction"); + Integer numOfRunningFunctions = (Integer) managingNode.invoke(() -> TestFunctionsDUnitTest.getNumOfRunningFunction()); LogWriterUtils.getLogWriter().info( "TestNumOfFunctions numOfRunningFunctions= " + numOfRunningFunctions); assertTrue(numOfRunningFunctions > 0 ? true : false); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java index f8abe3533639..78e91b0d8264 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java @@ -79,11 +79,10 @@ public void testTotalHeapSize() throws Exception { long totalHeapSizeOnAll = 0; for (VM vm : managedNodeList) { totalHeapSizeOnAll = totalHeapSizeOnAll - + ((Number) vm.invoke(TestHeapDUnitTest.class, "getHeapSizeOfClient")) + + ((Number) vm.invoke(() -> TestHeapDUnitTest.getHeapSizeOfClient())) .longValue(); } - long totalHeapSizeFromMXBean = ((Number) managingNode.invoke( - TestHeapDUnitTest.class, "getHeapSizeOfDS")).intValue(); + long totalHeapSizeFromMXBean = ((Number) managingNode.invoke(() -> TestHeapDUnitTest.getHeapSizeOfDS())).intValue(); LogWriterUtils.getLogWriter().info( "testTotalHeapSize totalHeapSizeFromMXBean = " diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java index e9b976a803d2..926c2ff66708 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java @@ -70,8 +70,7 @@ public String description() { public void testLocatorsDUnitTest() throws Exception { initManagement(false); - int locatorCount = ((Number) managingNode.invoke( - TestLocatorsDUnitTest.class, "getNumOfLocatorFromMBean")).intValue(); + int locatorCount = ((Number) managingNode.invoke(() -> TestLocatorsDUnitTest.getNumOfLocatorFromMBean())).intValue(); LogWriterUtils.getLogWriter().info("TestLocatorsDUnitTest locatorCount =" + locatorCount); assertEquals(1, locatorCount); diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java index 7cd95fdce0fe..50965f6c4caa 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java @@ -60,10 +60,10 @@ public void setUp() throws Exception { */ @Override protected final void preTearDown() throws Exception { - vm0.invoke(getClass(), "closeCache"); - vm1.invoke(getClass(), "closeCache"); - vm2.invoke(getClass(), "closeCache"); - vm3.invoke(getClass(), "closeCache"); + vm0.invoke(() -> closeCache()); + vm1.invoke(() -> closeCache()); + vm2.invoke(() -> closeCache()); + vm3.invoke(() -> closeCache()); } /** diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java index 911454a2ff1a..b8660117f4ac 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java @@ -86,14 +86,10 @@ public void setUp() throws Exception { IgnoredException.addIgnoredException("Connection refused: connect"); - server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - client1.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { clientExpectedExceptions }); - client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { clientExpectedExceptions }); + server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + client1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions )); + client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions )); } // Region: Utility and static functions invoked by the tests @@ -225,14 +221,10 @@ public void itestValidCredentials(Boolean multiUser) { Integer locPort1 = SecurityTestUtil.getLocatorPort(); Integer locPort2 = SecurityTestUtil.getLocatorPort(); String locString = SecurityTestUtil.getLocatorString(); - Integer port1 = (Integer)server1.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, authenticator, extraProps, - javaProps }); - Integer port2 = (Integer)server2.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort2, locString, authenticator, extraProps, - javaProps }); + Integer port1 = (Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps, + javaProps )); + Integer port2 = (Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps, + javaProps )); // Start the clients with valid credentials Properties credentials1 = gen.getValidCredentials(1); @@ -245,28 +237,22 @@ public void itestValidCredentials(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testValidCredentials: For second client credentials: " + credentials2 + " : " + javaProps2); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials1, javaProps1, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials2, javaProps2, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", - new Object[] { new Integer(2) }); + client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) )); // Verify that the puts succeeded - client2.invoke(SecurityTestUtil.class, "doGets", - new Object[] { new Integer(2) }); + client2.invoke(() -> SecurityTestUtil.doGets( new Integer(2) )); if (multiUser) { - client1.invoke(SecurityTestUtil.class, "doProxyCacheClose"); - client2.invoke(SecurityTestUtil.class, "doProxyCacheClose"); - client1.invoke(SecurityTestUtil.class, "doSimplePut", - new Object[] {"CacheClosedException"}); - client2.invoke(SecurityTestUtil.class, "doSimpleGet", - new Object[] {"CacheClosedException"}); + client1.invoke(() -> SecurityTestUtil.doProxyCacheClose()); + client2.invoke(() -> SecurityTestUtil.doProxyCacheClose()); + client1.invoke(() -> SecurityTestUtil.doSimplePut("CacheClosedException")); + client2.invoke(() -> SecurityTestUtil.doSimpleGet("CacheClosedException")); } } @@ -291,14 +277,10 @@ public void itestNoCredentials(Boolean multiUser) { Integer locPort1 = SecurityTestUtil.getLocatorPort(); Integer locPort2 = SecurityTestUtil.getLocatorPort(); String locString = SecurityTestUtil.getLocatorString(); - Integer port1 = ((Integer)server1.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, authenticator, extraProps, - javaProps })); - Integer port2 = ((Integer)server2.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort2, locString, authenticator, extraProps, - javaProps })); + Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps, + javaProps ))); + Integer port2 = ((Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps, + javaProps ))); // Start first client with valid credentials Properties credentials1 = gen.getValidCredentials(1); @@ -306,13 +288,11 @@ public void itestNoCredentials(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testNoCredentials: For first client credentials: " + credentials1 + " : " + javaProps1); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials1, javaProps1, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", - new Object[] { new Integer(2) }); + client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) )); // Trying to create the region on client2 if (gen.classCode().equals(ClassCode.SSL)) { @@ -320,16 +300,14 @@ public void itestNoCredentials(Boolean multiUser) { // before handshake message is sent from client. However exception // should come in any region operations. client2 - .invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { null, null, null, port1, port2, null, multiUser, - new Integer(SecurityTestUtil.NO_EXCEPTION) }); - client2.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.OTHER_EXCEPTION) }); + .invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, null, null, port1, port2, null, multiUser, + new Integer(SecurityTestUtil.NO_EXCEPTION) )); + client2.invoke(() -> SecurityTestUtil.doPuts( + new Integer(2), new Integer(SecurityTestUtil.OTHER_EXCEPTION) )); } else { - client2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { null, null, null, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, null, null, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); } } @@ -357,14 +335,10 @@ public void itestInvalidCredentials(Boolean multiUser) { Integer locPort1 = SecurityTestUtil.getLocatorPort(); Integer locPort2 = SecurityTestUtil.getLocatorPort(); String locString = SecurityTestUtil.getLocatorString(); - Integer port1 = ((Integer)server1.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, authenticator, extraProps, - javaProps })); - Integer port2 = ((Integer)server2.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort2, locString, authenticator, extraProps, - javaProps })); + Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps, + javaProps ))); + Integer port2 = ((Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps, + javaProps ))); // Start first client with valid credentials Properties credentials1 = gen.getValidCredentials(1); @@ -372,13 +346,11 @@ public void itestInvalidCredentials(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testInvalidCredentials: For first client credentials: " + credentials1 + " : " + javaProps1); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials1, javaProps1, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", - new Object[] { new Integer(2) }); + client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) )); // Start second client with invalid credentials // Trying to create the region on client2 should throw a security @@ -388,9 +360,8 @@ public void itestInvalidCredentials(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testInvalidCredentials: For second client credentials: " + credentials2 + " : " + javaProps2); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials2, javaProps2, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) )); } public void testInvalidAuthInit() { @@ -412,10 +383,8 @@ public void itestInvalidAuthInit(Boolean multiUser) { // Start the server Integer locPort1 = SecurityTestUtil.getLocatorPort(); String locString = SecurityTestUtil.getLocatorString(); - Integer port1 = ((Integer)server1.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, authenticator, extraProps, - javaProps })); + Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps, + javaProps ))); Properties credentials = gen.getValidCredentials(1); javaProps = gen.getJavaProperties(); @@ -450,14 +419,10 @@ public void itestNoAuthInitWithCredentials(Boolean multiUser) { Integer locPort1 = SecurityTestUtil.getLocatorPort(); Integer locPort2 = SecurityTestUtil.getLocatorPort(); String locString = SecurityTestUtil.getLocatorString(); - Integer port1 = ((Integer)server1.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, authenticator, extraProps, - javaProps })); - Integer port2 = ((Integer)server2.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort2, locString, authenticator, extraProps, - javaProps })); + Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps, + javaProps ))); + Integer port2 = ((Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps, + javaProps ))); // Start the clients with valid credentials Properties credentials1 = gen.getValidCredentials(1); @@ -470,21 +435,18 @@ public void itestNoAuthInitWithCredentials(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testNoAuthInitWithCredentials: For second client credentials: " + credentials2 + " : " + javaProps2); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { null, credentials1, javaProps1, port1, port2, null, - multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { null, credentials2, javaProps2, port1, port2, null, - multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); - client2.invoke(SecurityTestUtil.class, "closeCache"); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials1, javaProps1, port1, port2, null, + multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2, port1, port2, null, + multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); + client2.invoke(() -> SecurityTestUtil.closeCache()); // Now also try with invalid credentials credentials2 = gen.getInvalidCredentials(5); javaProps2 = gen.getJavaProperties(); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { null, credentials2, javaProps2, port1, port2, null, - multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2, port1, port2, null, + multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); } public void testInvalidAuthenticator() { @@ -506,10 +468,8 @@ public void itestInvalidAuthenticator(Boolean multiUser) { // Start the server with invalid authenticator Integer locPort1 = SecurityTestUtil.getLocatorPort(); String locString = SecurityTestUtil.getLocatorString(); - Integer port1 = (Integer)server1.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, "com.gemstone.gemfire.none", - extraProps, javaProps }); + Integer port1 = (Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, "com.gemstone.gemfire.none", + extraProps, javaProps )); // Trying to create the region on client should throw a security exception Properties credentials = gen.getValidCredentials(1); @@ -517,10 +477,9 @@ public void itestInvalidAuthenticator(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testInvalidAuthenticator: For first client credentials: " + credentials + " : " + javaProps); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials, javaProps, port1, null, - new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) }); - client1.invoke(SecurityTestUtil.class, "closeCache"); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials, javaProps, port1, null, + new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) )); + client1.invoke(() -> SecurityTestUtil.closeCache()); // Also test with invalid credentials @@ -529,9 +488,8 @@ public void itestInvalidAuthenticator(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testInvalidAuthenticator: For first client credentials: " + credentials + " : " + javaProps); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials, javaProps, port1, null, - new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials, javaProps, port1, null, + new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) )); } public void testNoAuthenticatorWithCredentials() { @@ -556,12 +514,8 @@ public void itestNoAuthenticatorWithCredentials(Boolean multiUser) { Integer locPort1 = SecurityTestUtil.getLocatorPort(); Integer locPort2 = SecurityTestUtil.getLocatorPort(); String locString = SecurityTestUtil.getLocatorString(); - Integer port1 = (Integer)server1.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, null, extraProps, javaProps }); - Integer port2 = (Integer)server2.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort2, locString, null, extraProps, javaProps }); + Integer port1 = (Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, null, extraProps, javaProps )); + Integer port2 = (Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, null, extraProps, javaProps )); // Clients should connect successfully and work properly with // valid/invalid credentials when none are required on the server side @@ -575,20 +529,16 @@ public void itestNoAuthenticatorWithCredentials(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testNoAuthenticatorWithCredentials: For second client credentials: " + credentials2 + " : " + javaProps2); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials1, javaProps1, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials2, javaProps2, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", - new Object[] { new Integer(2) }); + client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) )); // Verify that the puts succeeded - client2.invoke(SecurityTestUtil.class, "doGets", - new Object[] { new Integer(2) }); + client2.invoke(() -> SecurityTestUtil.doGets( new Integer(2) )); } public void testCredentialsWithFailover() { @@ -613,10 +563,8 @@ public void itestCredentialsWithFailover(Boolean multiUser) { Integer locPort1 = SecurityTestUtil.getLocatorPort(); Integer locPort2 = SecurityTestUtil.getLocatorPort(); String locString = SecurityTestUtil.getLocatorString(); - Integer port1 = (Integer)server1.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, authenticator, extraProps, - javaProps }); + Integer port1 = (Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps, + javaProps )); // Get a port for second server but do not start it // This forces the clients to connect to the first server Integer port2 = new Integer(AvailablePort @@ -633,32 +581,25 @@ public void itestCredentialsWithFailover(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testCredentialsWithFailover: For second client credentials: " + credentials2 + " : " + javaProps2); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials1, javaProps1, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials2, javaProps2, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", - new Object[] { new Integer(2) }); + client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) )); // Verify that the puts succeeded - client2.invoke(SecurityTestUtil.class, "doGets", - new Object[] { new Integer(2) }); + client2.invoke(() -> SecurityTestUtil.doGets( new Integer(2) )); // start the second one and stop the first server to force a failover - server2.invoke(ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort2, locString, port2, authenticator, extraProps, - javaProps }); - server1.invoke(SecurityTestUtil.class, "closeCache"); + server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, port2, authenticator, extraProps, + javaProps )); + server1.invoke(() -> SecurityTestUtil.closeCache()); // Perform some create/update operations from client1 - client1.invoke(SecurityTestUtil.class, "doNPuts", - new Object[] { new Integer(4) }); + client1.invoke(() -> SecurityTestUtil.doNPuts( new Integer(4) )); // Verify that the creates/updates succeeded - client2.invoke(SecurityTestUtil.class, "doNGets", - new Object[] { new Integer(4) }); + client2.invoke(() -> SecurityTestUtil.doNGets( new Integer(4) )); // Try to connect client2 with no credentials // Verify that the creation of region throws security exception @@ -667,16 +608,14 @@ public void itestCredentialsWithFailover(Boolean multiUser) { // before handshake message is sent from client. However exception // should come in any region operations. client2 - .invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { null, null, null, port1, port2, null, multiUser, - new Integer(SecurityTestUtil.NOFORCE_AUTHREQ_EXCEPTION) }); - client2.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.OTHER_EXCEPTION) }); + .invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, null, null, port1, port2, null, multiUser, + new Integer(SecurityTestUtil.NOFORCE_AUTHREQ_EXCEPTION) )); + client2.invoke(() -> SecurityTestUtil.doPuts( + new Integer(2), new Integer(SecurityTestUtil.OTHER_EXCEPTION) )); } else { - client2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { null, null, null, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, null, null, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); } // Now try to connect client1 with invalid credentials @@ -686,17 +625,14 @@ public void itestCredentialsWithFailover(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testCredentialsWithFailover: For first client invalid credentials: " + credentials1 + " : " + javaProps1); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials1, javaProps1, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) )); if (multiUser) { - client1.invoke(SecurityTestUtil.class, "doProxyCacheClose"); - client2.invoke(SecurityTestUtil.class, "doProxyCacheClose"); - client1.invoke(SecurityTestUtil.class, "doSimplePut", - new Object[] {"CacheClosedException"}); - client2.invoke(SecurityTestUtil.class, "doSimpleGet", - new Object[] {"CacheClosedException"}); + client1.invoke(() -> SecurityTestUtil.doProxyCacheClose()); + client2.invoke(() -> SecurityTestUtil.doProxyCacheClose()); + client1.invoke(() -> SecurityTestUtil.doSimplePut("CacheClosedException")); + client2.invoke(() -> SecurityTestUtil.doSimpleGet("CacheClosedException")); } } @@ -723,10 +659,8 @@ public void itestCredentialsForNotifications(Boolean multiUser) { Integer locPort1 = SecurityTestUtil.getLocatorPort(); Integer locPort2 = SecurityTestUtil.getLocatorPort(); String locString = SecurityTestUtil.getLocatorString(); - Integer port1 = (Integer)server1.invoke( - ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, authenticator, extraProps, - javaProps }); + Integer port1 = (Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps, + javaProps )); // Get a port for second server but do not start it // This forces the clients to connect to the first server Integer port2 = new Integer(AvailablePort @@ -743,63 +677,53 @@ public void itestCredentialsForNotifications(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testCredentialsForNotifications: For second client credentials: " + credentials2 + " : " + javaProps2); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials1, javaProps1, port1, port2, - null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, + null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Set up zero forward connections to check notification handshake only Object zeroConns = new Integer(0); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials2, javaProps2, port1, port2, - zeroConns, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2, + zeroConns, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Register interest on all keys on second client client2 - .invoke(ClientAuthenticationDUnitTest.class, "registerAllInterest"); + .invoke(() -> ClientAuthenticationDUnitTest.registerAllInterest()); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", - new Object[] { new Integer(2) }); + client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) )); // Verify that the puts succeeded - client2.invoke(SecurityTestUtil.class, "doLocalGets", - new Object[] { new Integer(2) }); + client2.invoke(() -> SecurityTestUtil.doLocalGets( new Integer(2) )); // start the second one and stop the first server to force a failover - server2.invoke(ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort2, locString, port2, authenticator, extraProps, - javaProps }); - server1.invoke(SecurityTestUtil.class, "closeCache"); + server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, port2, authenticator, extraProps, + javaProps )); + server1.invoke(() -> SecurityTestUtil.closeCache()); // Wait for failover to complete Wait.pause(500); // Perform some create/update operations from client1 - client1.invoke(SecurityTestUtil.class, "doNPuts", - new Object[] { new Integer(4) }); + client1.invoke(() -> SecurityTestUtil.doNPuts( new Integer(4) )); // Verify that the creates/updates succeeded - client2.invoke(SecurityTestUtil.class, "doNLocalGets", - new Object[] { new Integer(4) }); + client2.invoke(() -> SecurityTestUtil.doNLocalGets( new Integer(4) )); // Try to connect client1 with no credentials // Verify that the creation of region throws security exception - server1.invoke(ClientAuthenticationDUnitTest.class, "createCacheServer", - new Object[] { locPort1, locString, port1, authenticator, extraProps, - javaProps }); + server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, port1, authenticator, extraProps, + javaProps )); if (gen.classCode().equals(ClassCode.SSL)) { // For SSL the exception may not come since the server can close socket // before handshake message is sent from client. However exception // should come in any region operations. - client1.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { null, null, null, port1, port2, + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, null, null, port1, port2, zeroConns, multiUser, - new Integer(SecurityTestUtil.NOFORCE_AUTHREQ_EXCEPTION) }); - client1.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.OTHER_EXCEPTION) }); + new Integer(SecurityTestUtil.NOFORCE_AUTHREQ_EXCEPTION) )); + client1.invoke(() -> SecurityTestUtil.doPuts( + new Integer(2), new Integer(SecurityTestUtil.OTHER_EXCEPTION) )); } else { - client1.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { null, null, null, port1, port2, - zeroConns, multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, null, null, port1, port2, + zeroConns, multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); } // Now try to connect client2 with invalid credentials @@ -809,41 +733,35 @@ public void itestCredentialsForNotifications(Boolean multiUser) { LogWriterUtils.getLogWriter().info( "testCredentialsForNotifications: For second client invalid credentials: " + credentials2 + " : " + javaProps2); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, credentials2, javaProps2, port1, port2, - zeroConns, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2, + zeroConns, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) )); // Now try to connect client2 with invalid auth-init method // Trying to create the region on client with valid credentials should // throw a security exception client2 - .invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { "com.gemstone.none", credentials1, javaProps1, + .invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( "com.gemstone.none", credentials1, javaProps1, port1, port2, zeroConns, multiUser, - new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); + new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); // Now start the servers with invalid authenticator method. // Skip this test for a scheme which does not have an authInit in the // first place (e.g. SSL) since that will fail with AuthReqEx before // authenticator is even invoked. if (authInit != null && authInit.length() > 0) { - server1.invoke(ClientAuthenticationDUnitTest.class, - "createCacheServer", new Object[] { locPort1, locString, port1, - "com.gemstone.gemfire.none", extraProps, javaProps }); - server2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheServer", new Object[] { locPort2, locString, port2, - "com.gemstone.gemfire.none", extraProps, javaProps }); + server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, port1, + "com.gemstone.gemfire.none", extraProps, javaProps )); + server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, port2, + "com.gemstone.gemfire.none", extraProps, javaProps )); // Trying to create the region on client with valid/invalid credentials // should throw a security exception - client2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { authInit, credentials1, + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, zeroConns, multiUser, - new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) }); - client1.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { authInit, credentials2, + new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) )); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2, zeroConns, multiUser, - new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) }); + new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) )); } else { LogWriterUtils.getLogWriter().info( @@ -855,26 +773,21 @@ public void itestCredentialsForNotifications(Boolean multiUser) { // Skip this test for a scheme which does not have an authInit in the // first place (e.g. SSL). if (authInit != null && authInit.length() > 0) { - server1.invoke(ClientAuthenticationDUnitTest.class, - "createCacheServer", new Object[] { locPort1, locString, port1, - authenticator, extraProps, javaProps }); - server2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheServer", new Object[] { locPort2, locString, port2, - authenticator, extraProps, javaProps }); - client1.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { null, credentials1, javaProps1, + server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, port1, + authenticator, extraProps, javaProps )); + server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, port2, + authenticator, extraProps, javaProps )); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials1, javaProps1, port1, port2, null, multiUser, - new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); - client2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { null, credentials2, javaProps2, + new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2, port1, port2, zeroConns, multiUser, - new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); + new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); // Now also try with invalid credentials on client2 - client2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { null, credentials2, javaProps2, + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2, port1, port2, zeroConns, multiUser, - new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) }); + new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) )); } else { LogWriterUtils.getLogWriter().info( @@ -887,54 +800,42 @@ public void itestCredentialsForNotifications(Boolean multiUser) { // If the scheme does not have an authenticator in the first place (e.g. // SSL) then skip it since this test is useless. if (authenticator != null && authenticator.length() > 0) { - server1.invoke(ClientAuthenticationDUnitTest.class, - "createCacheServer", new Object[] { locPort1, locString, port1, - null, extraProps, javaProps }); - server2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheServer", new Object[] { locPort2, locString, port2, - null, extraProps, javaProps }); - client1.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { authInit, credentials1, + server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, port1, + null, extraProps, javaProps )); + server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, port2, + null, extraProps, javaProps )); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, null, multiUser, - new Integer(SecurityTestUtil.NO_EXCEPTION) }); - client2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { authInit, credentials2, + new Integer(SecurityTestUtil.NO_EXCEPTION) )); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2, zeroConns, multiUser, - new Integer(SecurityTestUtil.NO_EXCEPTION) }); + new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Register interest on all keys on second client - client2.invoke(ClientAuthenticationDUnitTest.class, - "registerAllInterest"); + client2.invoke(() -> ClientAuthenticationDUnitTest.registerAllInterest()); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", - new Object[] { new Integer(4) }); + client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(4) )); // Verify that the puts succeeded - client2.invoke(SecurityTestUtil.class, "doLocalGets", - new Object[] { new Integer(4) }); + client2.invoke(() -> SecurityTestUtil.doLocalGets( new Integer(4) )); // Now also try with valid credentials on client2 - client1.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { authInit, credentials2, + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2, null, multiUser, - new Integer(SecurityTestUtil.NO_EXCEPTION) }); - client2.invoke(ClientAuthenticationDUnitTest.class, - "createCacheClient", new Object[] { authInit, credentials1, + new Integer(SecurityTestUtil.NO_EXCEPTION) )); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2, zeroConns, multiUser, - new Integer(SecurityTestUtil.NO_EXCEPTION) }); + new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Register interest on all keys on second client - client2.invoke(ClientAuthenticationDUnitTest.class, - "registerAllInterest"); + client2.invoke(() -> ClientAuthenticationDUnitTest.registerAllInterest()); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doNPuts", - new Object[] { new Integer(4) }); + client1.invoke(() -> SecurityTestUtil.doNPuts( new Integer(4) )); // Verify that the puts succeeded - client2.invoke(SecurityTestUtil.class, "doNLocalGets", - new Object[] { new Integer(4) }); + client2.invoke(() -> SecurityTestUtil.doNLocalGets( new Integer(4) )); } else { LogWriterUtils.getLogWriter().info( @@ -958,10 +859,10 @@ public void xtestValidCredentialsForMultipleUsers() { @Override protected final void preTearDown() throws Exception { // close the clients first - client1.invoke(SecurityTestUtil.class, "closeCache"); - client2.invoke(SecurityTestUtil.class, "closeCache"); + client1.invoke(() -> SecurityTestUtil.closeCache()); + client2.invoke(() -> SecurityTestUtil.closeCache()); // then close the servers - server1.invoke(SecurityTestUtil.class, "closeCache"); - server2.invoke(SecurityTestUtil.class, "closeCache"); + server1.invoke(() -> SecurityTestUtil.closeCache()); + server2.invoke(() -> SecurityTestUtil.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java index 2774e35fedf6..fe2a62d36c30 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java @@ -66,14 +66,10 @@ public void setUp() throws Exception { client1 = host.getVM(2); client2 = host.getVM(3); - server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - client1.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { clientExpectedExceptions }); - client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { clientExpectedExceptions }); + server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + client1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions )); + client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions )); SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions); } @@ -194,10 +190,9 @@ else if ((opFlags & OpFlags.CHECK_EXCEPTION) > 0) { opFlags), new Integer(expectedResult)); } else { - clientVM.invoke(ClientAuthorizationTestBase.class, "doOp", - new Object[] { new Byte(opCode.toOrdinal()), + clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(opCode.toOrdinal()), currentOp.getIndices(), new Integer(opFlags), - new Integer(expectedResult) }); + new Integer(expectedResult) )); } } } @@ -222,12 +217,10 @@ public void testAllowPutsGets() { // Start servers with all required properties Properties serverProps = buildProperties(authenticator, accessor, false, extraAuthProps, extraAuthzProps); - Integer port1 = ((Integer)server1.invoke( - ClientAuthorizationTestBase.class, "createCacheServer", new Object[] { - SecurityTestUtil.getLocatorPort(), serverProps, javaProps })); - Integer port2 = ((Integer)server2.invoke( - ClientAuthorizationTestBase.class, "createCacheServer", new Object[] { - SecurityTestUtil.getLocatorPort(), serverProps, javaProps })); + Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer( + SecurityTestUtil.getLocatorPort(), serverProps, javaProps ))); + Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( + SecurityTestUtil.getLocatorPort(), serverProps, javaProps ))); // Start client1 with valid CREATE credentials Properties createCredentials = gen.getAllowedCredentials( @@ -237,9 +230,8 @@ public void testAllowPutsGets() { LogWriterUtils.getLogWriter().info( "testAllowPutsGets: For first client credentials: " + createCredentials); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, createCredentials, javaProps, port1, port2, - null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, javaProps, port1, port2, + null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Start client2 with valid GET credentials Properties getCredentials = gen.getAllowedCredentials( @@ -250,17 +242,16 @@ public void testAllowPutsGets() { .info( "testAllowPutsGets: For second client credentials: " + getCredentials); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, getCredentials, javaProps, port1, port2, - null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, javaProps, port1, port2, + null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> SecurityTestUtil.doPuts( + new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Verify that the gets succeed - client2.invoke(SecurityTestUtil.class, "doGets", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doGets( + new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) )); } public void testDisallowPutsGets() { @@ -300,30 +291,26 @@ public void testDisallowPutsGets() { // Start servers with all required properties Properties serverProps = buildProperties(authenticator, accessor, false, extraAuthProps, extraAuthzProps); - Integer port1 = ((Integer)server1.invoke( - ClientAuthorizationTestBase.class, "createCacheServer", new Object[] { - SecurityTestUtil.getLocatorPort(), serverProps, javaProps })); - Integer port2 = ((Integer)server2.invoke( - ClientAuthorizationTestBase.class, "createCacheServer", new Object[] { - SecurityTestUtil.getLocatorPort(), serverProps, javaProps })); + Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer( + SecurityTestUtil.getLocatorPort(), serverProps, javaProps ))); + Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( + SecurityTestUtil.getLocatorPort(), serverProps, javaProps ))); // Start client1 with valid CREATE credentials - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, createCredentials, createJavaProps, port1, - port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1, + port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Start client2 with invalid GET credentials - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, getCredentials, getJavaProps, port1, port2, - null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2, + null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> SecurityTestUtil.doPuts( + new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Gets as normal user should throw exception - client2.invoke(SecurityTestUtil.class, "doGets", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doGets( + new Integer(2), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) )); // Try to connect client2 with reader credentials getCredentials = gen.getAllowedCredentials( @@ -333,17 +320,16 @@ public void testDisallowPutsGets() { LogWriterUtils.getLogWriter().info( "testDisallowPutsGets: For second client with GET credentials: " + getCredentials); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, getCredentials, getJavaProps, port1, port2, - null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2, + null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Verify that the gets succeed - client2.invoke(SecurityTestUtil.class, "doGets", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doGets( + new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Verify that the puts throw exception - client2.invoke(SecurityTestUtil.class, "doNPuts", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doNPuts( + new Integer(2), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) )); } public void testInvalidAccessor() { @@ -363,9 +349,8 @@ public void testInvalidAccessor() { // Start server1 with invalid accessor Properties serverProps = buildProperties(authenticator, "com.gemstone.none", false, extraAuthProps, extraAuthzProps); - Integer port1 = ((Integer)server1.invoke( - ClientAuthorizationTestBase.class, "createCacheServer", new Object[] { - SecurityTestUtil.getLocatorPort(), serverProps, javaProps })); + Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer( + SecurityTestUtil.getLocatorPort(), serverProps, javaProps ))); Integer port2 = new Integer(AvailablePort .getRandomAvailablePort(AvailablePort.SOCKET)); @@ -384,43 +369,38 @@ public void testInvalidAccessor() { LogWriterUtils.getLogWriter().info( "testInvalidAccessor: For second client GET credentials: " + getCredentials); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, createCredentials, createJavaProps, port1, + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1, port2, null, Boolean.FALSE, Boolean.FALSE, - Integer.valueOf(SecurityTestUtil.NO_EXCEPTION) }); - client1.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(1), new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) }); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, getCredentials, getJavaProps, port1, port2, + Integer.valueOf(SecurityTestUtil.NO_EXCEPTION) )); + client1.invoke(() -> SecurityTestUtil.doPuts( + new Integer(1), new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) )); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2, null, Boolean.FALSE, Boolean.FALSE, - Integer.valueOf(SecurityTestUtil.NO_EXCEPTION) }); - client2.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(1), new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) }); + Integer.valueOf(SecurityTestUtil.NO_EXCEPTION) )); + client2.invoke(() -> SecurityTestUtil.doPuts( + new Integer(1), new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) )); // Now start server2 that has valid accessor LogWriterUtils.getLogWriter().info("testInvalidAccessor: Using accessor: " + accessor); serverProps = buildProperties(authenticator, accessor, false, extraAuthProps, extraAuthzProps); - server2.invoke(ClientAuthorizationTestBase.class, "createCacheServer", - new Object[] { SecurityTestUtil.getLocatorPort(), port2, serverProps, - javaProps }); - server1.invoke(SecurityTestUtil.class, "closeCache"); + server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps, + javaProps )); + server1.invoke(() -> SecurityTestUtil.closeCache()); // Client creation should be successful now - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, createCredentials, createJavaProps, port1, - port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, getCredentials, getJavaProps, port1, port2, - null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1, + port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2, + null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Now perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> SecurityTestUtil.doPuts( + new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Verify that the gets succeed - client2.invoke(SecurityTestUtil.class, "doGets", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doGets( + new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) )); } public void testPutsGetsWithFailover() { @@ -443,9 +423,8 @@ public void testPutsGetsWithFailover() { // Start servers with all required properties Properties serverProps = buildProperties(authenticator, accessor, false, extraAuthProps, extraAuthzProps); - Integer port1 = ((Integer)server1.invoke( - ClientAuthorizationTestBase.class, "createCacheServer", new Object[] { - SecurityTestUtil.getLocatorPort(), serverProps, javaProps })); + Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer( + SecurityTestUtil.getLocatorPort(), serverProps, javaProps ))); // Get a port for second server but do not start it // This forces the clients to connect to the first server Integer port2 = new Integer(AvailablePort @@ -459,9 +438,8 @@ public void testPutsGetsWithFailover() { LogWriterUtils.getLogWriter().info( "testPutsGetsWithFailover: For first client credentials: " + createCredentials); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, createCredentials, createJavaProps, port1, - port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1, + port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Start client2 with valid GET credentials Properties getCredentials = gen.getAllowedCredentials( @@ -471,29 +449,27 @@ public void testPutsGetsWithFailover() { LogWriterUtils.getLogWriter().info( "testPutsGetsWithFailover: For second client credentials: " + getCredentials); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, getCredentials, getJavaProps, port1, port2, - null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2, + null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> SecurityTestUtil.doPuts( + new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Verify that the puts succeeded - client2.invoke(SecurityTestUtil.class, "doGets", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doGets( + new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // start the second one and stop the first server to force a failover - server2.invoke(ClientAuthorizationTestBase.class, "createCacheServer", - new Object[] { SecurityTestUtil.getLocatorPort(), port2, serverProps, - javaProps }); - server1.invoke(SecurityTestUtil.class, "closeCache"); + server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps, + javaProps )); + server1.invoke(() -> SecurityTestUtil.closeCache()); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doNPuts", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> SecurityTestUtil.doNPuts( + new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Verify that the puts succeeded - client2.invoke(SecurityTestUtil.class, "doNGets", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doNGets( + new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Now re-connect with credentials not allowed to do gets Properties noGetCredentials = gen.getDisallowedCredentials( @@ -506,42 +482,39 @@ public void testPutsGetsWithFailover() { + noGetCredentials); // Re-connect client2 with invalid GET credentials - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, noGetCredentials, getJavaProps, port1, - port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, noGetCredentials, getJavaProps, port1, + port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> SecurityTestUtil.doPuts( + new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Gets as normal user should throw exception - client2.invoke(SecurityTestUtil.class, "doGets", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doGets( + new Integer(4), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) )); // force a failover and do the drill again - server1.invoke(ClientAuthorizationTestBase.class, "createCacheServer", - new Object[] { SecurityTestUtil.getLocatorPort(), port1, serverProps, - javaProps }); - server2.invoke(SecurityTestUtil.class, "closeCache"); + server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port1, serverProps, + javaProps )); + server2.invoke(() -> SecurityTestUtil.closeCache()); // Perform some put operations from client1 - client1.invoke(SecurityTestUtil.class, "doNPuts", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> SecurityTestUtil.doNPuts( + new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Gets as normal user should throw exception - client2.invoke(SecurityTestUtil.class, "doNGets", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doNGets( + new Integer(4), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) )); // Try to connect client2 with reader credentials - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, getCredentials, getJavaProps, port1, port2, - null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2, + null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Verify that the gets succeed - client2.invoke(SecurityTestUtil.class, "doNGets", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doNGets( + new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Verify that the puts throw exception - client2.invoke(SecurityTestUtil.class, "doPuts", new Object[] { - new Integer(4), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) }); + client2.invoke(() -> SecurityTestUtil.doPuts( + new Integer(4), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) )); } public void testUnregisterInterestWithFailover() { @@ -652,20 +625,18 @@ public void testUnregisterInterestWithFailover() { // on the servers with/without failover if (opBlock.size() > 0) { // Start the first server and execute the operation block - server1.invoke(ClientAuthorizationTestBase.class, - "createCacheServer", new Object[] { + server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port1, serverProps, - javaProps }); - server2.invoke(SecurityTestUtil.class, "closeCache"); + javaProps )); + server2.invoke(() -> SecurityTestUtil.closeCache()); executeRIOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, javaProps); if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) { // Failover to the second server and run the block again - server2.invoke(ClientAuthorizationTestBase.class, - "createCacheServer", new Object[] { + server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps, - javaProps }); - server1.invoke(SecurityTestUtil.class, "closeCache"); + javaProps )); + server1.invoke(() -> SecurityTestUtil.closeCache()); executeRIOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, javaProps); } @@ -787,11 +758,11 @@ public void testAllOpsWithFailover() { @Override protected final void preTearDown() throws Exception { // close the clients first - client1.invoke(SecurityTestUtil.class, "closeCache"); - client2.invoke(SecurityTestUtil.class, "closeCache"); + client1.invoke(() -> SecurityTestUtil.closeCache()); + client2.invoke(() -> SecurityTestUtil.closeCache()); SecurityTestUtil.closeCache(); // then close the servers - server1.invoke(SecurityTestUtil.class, "closeCache"); - server2.invoke(SecurityTestUtil.class, "closeCache"); + server1.invoke(() -> SecurityTestUtil.closeCache()); + server2.invoke(() -> SecurityTestUtil.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java index 665867fbacb5..09dd49bebee7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java @@ -798,10 +798,9 @@ else if ((opFlags & OpFlags.CHECK_EXCEPTION) > 0) { opFlags), new Integer(expectedResult)); } else { - clientVM.invoke(ClientAuthorizationTestBase.class, "doOp", - new Object[] { new Byte(opCode.toOrdinal()), + clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(opCode.toOrdinal()), currentOp.getIndices(), new Integer(opFlags), - new Integer(expectedResult) }); + new Integer(expectedResult) )); } } } @@ -875,21 +874,19 @@ protected void runOpsWithFailover(OperationWithAction[] opCodes, if (opBlock.size() > 0) { port1Keeper.release(); // Start the first server and execute the operation block - server1.invoke(ClientAuthorizationTestBase.class, - "createCacheServer", new Object[] { + server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port1, serverProps, - javaProps }); - server2.invoke(SecurityTestUtil.class, "closeCache"); + javaProps )); + server2.invoke(() -> SecurityTestUtil.closeCache()); executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, tgen, rnd); if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) { // Failover to the second server and run the block again port2Keeper.release(); - server2.invoke(ClientAuthorizationTestBase.class, - "createCacheServer", new Object[] { + server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps, - javaProps }); - server1.invoke(SecurityTestUtil.class, "closeCache"); + javaProps )); + server1.invoke(() -> SecurityTestUtil.closeCache()); executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, tgen, rnd); } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java index f175d985136c..fcf735cb5932 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java @@ -53,12 +53,9 @@ public void setUp() throws Exception { client1 = host.getVM(2); client2 = host.getVM(3); - server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { clientExpectedExceptions }); + server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions )); SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions); } @@ -86,12 +83,10 @@ public void testOps1() throws Exception { extraAuthProps, extraAuthzProps); Integer port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); Integer port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - server1.invoke(ClientAuthorizationTestBase.class, "createCacheServer", - new Object[] {SecurityTestUtil.getLocatorPort(), port1, serverProps, - javaProps}); - server2.invoke(ClientAuthorizationTestBase.class, "createCacheServer", - new Object[] {SecurityTestUtil.getLocatorPort(), port2, serverProps, - javaProps}); + server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port1, serverProps, + javaProps)); + server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port2, serverProps, + javaProps)); if (!prepareClientsForOps(gen, cGen, new OperationCode[] { OperationCode.PUT, OperationCode.PUT}, new OperationCode[] { @@ -316,7 +311,7 @@ private void verifyContainsKeyInvalidates(Boolean isMultiuser, Boolean opAllowed } private void verifyGetAllInTX() { - server1.invoke(ClientMultiUserAuthzDUnitTest.class, "doPuts"); + server1.invoke(() -> ClientMultiUserAuthzDUnitTest.doPuts()); client1.invoke(SecurityTestUtil.class, "doMultiUserGetAll", new Object[] { Integer.valueOf(2), new Integer[] {SecurityTestUtil.NO_EXCEPTION, @@ -324,7 +319,7 @@ private void verifyGetAllInTX() { } private void verifyGetAllRegionDestroys() { - server1.invoke(ClientMultiUserAuthzDUnitTest.class, "doPuts"); + server1.invoke(() -> ClientMultiUserAuthzDUnitTest.doPuts()); client1.invoke(SecurityTestUtil.class, "doMultiUserGetAll", new Object[] { Integer.valueOf(2), new Integer[] {SecurityTestUtil.NO_EXCEPTION, @@ -364,12 +359,10 @@ public void testOps2() throws Exception { extraAuthProps, extraAuthzProps); Integer port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); Integer port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - server1.invoke(ClientAuthorizationTestBase.class, "createCacheServer", - new Object[] {SecurityTestUtil.getLocatorPort(), port1, serverProps, - javaProps}); - server2.invoke(ClientAuthorizationTestBase.class, "createCacheServer", - new Object[] {SecurityTestUtil.getLocatorPort(), port2, serverProps, - javaProps}); + server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port1, serverProps, + javaProps)); + server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port2, serverProps, + javaProps)); // Start client1 with valid/invalid QUERY credentials Properties[] client1Credentials = new Properties[] { @@ -442,7 +435,7 @@ public void testOps2() throws Exception { Boolean.FALSE}); // Failover - server1.invoke(SecurityTestUtil.class, "closeCache"); + server1.invoke(() -> SecurityTestUtil.closeCache()); Thread.sleep(2000); client1.invoke(SecurityTestUtil.class, "doMultiUserPuts", new Object[] { @@ -495,12 +488,10 @@ public void testOpsWithClientsInDifferentModes() throws Exception { extraAuthProps, extraAuthzProps); Integer port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); Integer port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - server1.invoke(ClientAuthorizationTestBase.class, "createCacheServer", - new Object[] {SecurityTestUtil.getLocatorPort(), port1, serverProps, - javaProps}); - server2.invoke(ClientAuthorizationTestBase.class, "createCacheServer", - new Object[] {SecurityTestUtil.getLocatorPort(), port2, serverProps, - javaProps}); + server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port1, serverProps, + javaProps)); + server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port2, serverProps, + javaProps)); if (!prepareClientsForOps(gen, cGen, new OperationCode[] { OperationCode.PUT, OperationCode.PUT}, new OperationCode[] { @@ -525,11 +516,11 @@ public void testOpsWithClientsInDifferentModes() throws Exception { @Override protected final void preTearDown() throws Exception { // close the clients first - client1.invoke(SecurityTestUtil.class, "closeCache"); - client2.invoke(SecurityTestUtil.class, "closeCache"); + client1.invoke(() -> SecurityTestUtil.closeCache()); + client2.invoke(() -> SecurityTestUtil.closeCache()); SecurityTestUtil.closeCache(); // then close the servers - server1.invoke(SecurityTestUtil.class, "closeCache"); - server2.invoke(SecurityTestUtil.class, "closeCache"); + server1.invoke(() -> SecurityTestUtil.closeCache()); + server2.invoke(() -> SecurityTestUtil.closeCache()); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java index 2b44631b6d35..44089019b947 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java @@ -106,24 +106,21 @@ public void setUp() throws Exception { client1 = host.getVM(2); client2 = host.getVM(3); - server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { clientExpectedExceptions }); + server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions )); SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions); } @Override protected final void preTearDown() throws Exception { // close the clients first - client1.invoke(SecurityTestUtil.class, "closeCache"); - client2.invoke(SecurityTestUtil.class, "closeCache"); + client1.invoke(() -> SecurityTestUtil.closeCache()); + client2.invoke(() -> SecurityTestUtil.closeCache()); SecurityTestUtil.closeCache(); // then close the servers - server1.invoke(SecurityTestUtil.class, "closeCache"); - server2.invoke(SecurityTestUtil.class, "closeCache"); + server1.invoke(() -> SecurityTestUtil.closeCache()); + server2.invoke(() -> SecurityTestUtil.closeCache()); } public void testAllowPutsGets() throws Exception { @@ -144,12 +141,10 @@ public void testAllowPutsGets() throws Exception { // Start servers with all required properties Properties serverProps = buildProperties(authenticator, accessor, false, extraAuthProps, extraAuthzProps); - Integer port1 = ((Integer)server1.invoke( - ClientAuthorizationTestBase.class, "createCacheServer", new Object[] { - SecurityTestUtil.getLocatorPort(), serverProps, javaProps })); - Integer port2 = ((Integer)server2.invoke( - ClientAuthorizationTestBase.class, "createCacheServer", new Object[] { - SecurityTestUtil.getLocatorPort(), serverProps, javaProps })); + Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer( + SecurityTestUtil.getLocatorPort(), serverProps, javaProps ))); + Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( + SecurityTestUtil.getLocatorPort(), serverProps, javaProps ))); // Start client1 with valid CREATE credentials Properties createCredentials = gen.getAllowedCredentials( @@ -159,9 +154,8 @@ public void testAllowPutsGets() throws Exception { LogWriterUtils.getLogWriter().info( "testAllowPutsGets: For first client credentials: " + createCredentials); - client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, createCredentials, javaProps, port1, port2, - null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, javaProps, port1, port2, + null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Start client2 with valid GET credentials Properties getCredentials = gen.getAllowedCredentials( @@ -172,19 +166,18 @@ public void testAllowPutsGets() throws Exception { .info( "testAllowPutsGets: For second client credentials: " + getCredentials); - client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient", - new Object[] { authInit, getCredentials, javaProps, port1, port2, - null, new Integer(SecurityTestUtil.NO_EXCEPTION) }); + client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, javaProps, port1, port2, + null, new Integer(SecurityTestUtil.NO_EXCEPTION) )); // Perform some put operations from client1 - client1.invoke(DeltaClientAuthorizationDUnitTest.class, "doPuts", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION), Boolean.FALSE }); + client1.invoke(() -> DeltaClientAuthorizationDUnitTest.doPuts( + new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION), Boolean.FALSE )); Thread.sleep(5000); - assertTrue("Delta feature NOT used", (Boolean)client1.invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")); + assertTrue("Delta feature NOT used", (Boolean)client1.invoke(() -> DeltaTestImpl.toDeltaFeatureUsed())); // Verify that the gets succeed - client2.invoke(DeltaClientAuthorizationDUnitTest.class, "doGets", new Object[] { - new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION), Boolean.FALSE }); + client2.invoke(() -> DeltaClientAuthorizationDUnitTest.doGets( + new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION), Boolean.FALSE )); } public static void doPuts(Integer num, Integer expectedResult, diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java index fe3cec642dd5..0e33a62f1fba 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java @@ -68,24 +68,21 @@ public void setUp() throws Exception { client1 = host.getVM(2); client2 = host.getVM(3); - server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { serverExpectedExceptions }); - client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions", - new Object[] { clientExpectedExceptions }); + server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions )); + client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions )); SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions); } @Override protected final void preTearDown() throws Exception { // close the clients first - client1.invoke(SecurityTestUtil.class, "closeCache"); - client2.invoke(SecurityTestUtil.class, "closeCache"); + client1.invoke(() -> SecurityTestUtil.closeCache()); + client2.invoke(() -> SecurityTestUtil.closeCache()); SecurityTestUtil.closeCache(); // then close the servers - server1.invoke(SecurityTestUtil.class, "closeCache"); - server2.invoke(SecurityTestUtil.class, "closeCache"); + server1.invoke(() -> SecurityTestUtil.closeCache()); + server2.invoke(() -> SecurityTestUtil.closeCache()); } public void testPutPostOpNotifications() throws Exception { @@ -165,20 +162,18 @@ public void testPutPostOpNotifications() throws Exception { // on the servers with failover if (opBlock.size() > 0) { // Start the first server and execute the operation block - server1.invoke(ClientAuthorizationTestBase.class, - "createCacheServer", new Object[] { + server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port1, serverProps, - javaProps }); - server2.invoke(SecurityTestUtil.class, "closeCache"); + javaProps )); + server2.invoke(() -> SecurityTestUtil.closeCache()); executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, tgen, rnd); if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) { // Failover to the second server and run the block again - server2.invoke(ClientAuthorizationTestBase.class, - "createCacheServer", new Object[] { + server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps, - javaProps }); - server1.invoke(SecurityTestUtil.class, "closeCache"); + javaProps )); + server1.invoke(() -> SecurityTestUtil.closeCache()); executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, tgen, rnd); } @@ -289,10 +284,9 @@ else if ((opFlags & OpFlags.CHECK_EXCEPTION) > 0) { opFlags), new Integer(expectedResult)); } else { - clientVM.invoke(DeltaClientPostAuthorizationDUnitTest.class, "doOp", - new Object[] { new Byte(opCode.toOrdinal()), + clientVM.invoke(() -> DeltaClientPostAuthorizationDUnitTest.doOp( new Byte(opCode.toOrdinal()), currentOp.getIndices(), new Integer(opFlags), - new Integer(expectedResult) }); + new Integer(expectedResult) )); } } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java index 07bd7c7f09a9..dd01b3bf0cc9 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java @@ -173,9 +173,9 @@ public void testP2PAuthenticationWithInvalidAuthInitialize() throws Exception { authInit); setProperty(props, DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, authenticator); - locatorVM.invoke(SecurityTestUtil.class, "startLocator", new Object[]{ + locatorVM.invoke(() -> SecurityTestUtil.startLocator( getUniqueName(), new Integer(port), props, javaProps, - expectedExceptions}); + expectedExceptions)); LogWriter dsLogger = LogWriterUtils.createLogWriter(props); SecurityTestUtil.addExpectedExceptions(expectedExceptions, dsLogger); @@ -186,8 +186,8 @@ public void testP2PAuthenticationWithInvalidAuthInitialize() throws Exception { // success } finally { SecurityTestUtil.removeExpectedExceptions(expectedExceptions, dsLogger); - locatorVM.invoke(SecurityTestUtil.class, "stopLocator", new Object[]{ - new Integer(port), expectedExceptions}); + locatorVM.invoke(() -> SecurityTestUtil.stopLocator( + new Integer(port), expectedExceptions)); } } @@ -211,9 +211,9 @@ public void testP2PAuthenticationWithInvalidAuthenticator() throws Exception { authInit); setProperty(props, DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, authenticator); - locatorVM.invoke(SecurityTestUtil.class, "startLocator", new Object[] { + locatorVM.invoke(() -> SecurityTestUtil.startLocator( getUniqueName(), new Integer(port), props, javaProps, - expectedExceptions }); + expectedExceptions )); LogWriter dsLogger = LogWriterUtils.createLogWriter(props); SecurityTestUtil.addExpectedExceptions(expectedExceptions, dsLogger); @@ -226,8 +226,8 @@ public void testP2PAuthenticationWithInvalidAuthenticator() throws Exception { } finally { SecurityTestUtil.removeExpectedExceptions(expectedExceptions, dsLogger); - locatorVM.invoke(SecurityTestUtil.class, "stopLocator", new Object[] { - new Integer(port), expectedExceptions }); + locatorVM.invoke(() -> SecurityTestUtil.stopLocator( + new Integer(port), expectedExceptions )); } } @@ -251,9 +251,9 @@ public void testP2PAuthenticationWithNoCredentials() throws Exception { authInit); setProperty(props, DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, authenticator); - locatorVM.invoke(SecurityTestUtil.class, "startLocator", new Object[] { + locatorVM.invoke(() -> SecurityTestUtil.startLocator( getUniqueName(), new Integer(port), props, javaProps, - expectedExceptions }); + expectedExceptions )); LogWriter dsLogger = LogWriterUtils.createLogWriter(props); SecurityTestUtil.addExpectedExceptions(expectedExceptions, dsLogger); @@ -266,8 +266,8 @@ public void testP2PAuthenticationWithNoCredentials() throws Exception { } finally { SecurityTestUtil.removeExpectedExceptions(expectedExceptions, dsLogger); - locatorVM.invoke(SecurityTestUtil.class, "stopLocator", new Object[] { - new Integer(port), expectedExceptions }); + locatorVM.invoke(() -> SecurityTestUtil.stopLocator( + new Integer(port), expectedExceptions )); } } @@ -292,17 +292,17 @@ public void testP2PAuthenticationWithValidCredentials() throws Exception { Properties credentials = gen.getValidCredentials(1); Properties javaProps = gen.getJavaProperties(); props.putAll(credentials); - locatorVM.invoke(SecurityTestUtil.class, "startLocator", new Object[] { + locatorVM.invoke(() -> SecurityTestUtil.startLocator( getUniqueName(), new Integer(port), props, javaProps, - expectedExceptions }); + expectedExceptions )); try { createDS(props, javaProps); verifyMembers(new Integer(2)); disconnectFromDS(); } finally { - locatorVM.invoke(SecurityTestUtil.class, "stopLocator", new Object[] { - new Integer(port), expectedExceptions }); + locatorVM.invoke(() -> SecurityTestUtil.stopLocator( + new Integer(port), expectedExceptions )); } } @@ -331,9 +331,9 @@ public void testP2PAuthenticationWithBothValidAndInValidCredentials() Properties credentials = gen.getValidCredentials(1); Properties javaProps = gen.getJavaProperties(); props.putAll(credentials); - locatorVM.invoke(SecurityTestUtil.class, "startLocator", new Object[] { + locatorVM.invoke(() -> SecurityTestUtil.startLocator( getUniqueName(), new Integer(port), props, javaProps, - expectedExceptions }); + expectedExceptions )); try { // invalid credentials for the peer credentials = gen.getInvalidCredentials(1); @@ -361,8 +361,8 @@ public void testP2PAuthenticationWithBothValidAndInValidCredentials() disconnectFromDS(); } finally { - locatorVM.invoke(SecurityTestUtil.class, "stopLocator", new Object[] { - new Integer(port), expectedExceptions }); + locatorVM.invoke(() -> SecurityTestUtil.stopLocator( + new Integer(port), expectedExceptions )); } } @@ -411,9 +411,9 @@ public void disabled_testP2PViewChangeReject() throws Exception { Properties javaProps = gen.getJavaProperties(); props.putAll(credentials); props.putAll(extraProps); - locatorVM.invoke(SecurityTestUtil.class, "startLocator", new Object[] { + locatorVM.invoke(() -> SecurityTestUtil.startLocator( getUniqueName(), new Integer(port), props, javaProps, - expectedExceptions }); + expectedExceptions )); try { // Start the first peer with different authenticator @@ -442,51 +442,42 @@ public void disabled_testP2PViewChangeReject() throws Exception { javaProps = gen.getJavaProperties(); props.putAll(credentials); props.putAll(extraProps); - peer2.invoke(P2PAuthenticationDUnitTest.class, "createDS", new Object[] { - props, javaProps }); + peer2.invoke(() -> P2PAuthenticationDUnitTest.createDS( + props, javaProps )); // Start the third peer with the same authenticator as locator - peer3.invoke(P2PAuthenticationDUnitTest.class, "createDS", new Object[] { - props, javaProps }); + peer3.invoke(() -> P2PAuthenticationDUnitTest.createDS( + props, javaProps )); // wait for view propagation Wait.pause(2000); // Verify the number of members on all peers and locator - locatorVM.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(4) }); + locatorVM.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(4) )); verifyMembers(new Integer(2)); - peer2.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(4) }); - peer3.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(4) }); + peer2.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(4) )); + peer3.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(4) )); // Disconnect the first peer and check again disconnectFromDS(); Wait.pause(2000); - locatorVM.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(3) }); - peer2.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(3) }); - peer3.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(3) }); + locatorVM.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(3) )); + peer2.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(3) )); + peer3.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(3) )); // Disconnect the second peer and check again - peer2.invoke(DistributedTestCase.class, "disconnectFromDS"); + peer2.invoke(() -> DistributedTestCase.disconnectFromDS()); Wait.pause(2000); - locatorVM.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(2) }); - peer3.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(2) }); + locatorVM.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(2) )); + peer3.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(2) )); // Same for last peer - peer3.invoke(DistributedTestCase.class, "disconnectFromDS"); + peer3.invoke(() -> DistributedTestCase.disconnectFromDS()); Wait.pause(2000); - locatorVM.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(1) }); + locatorVM.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(1) )); } finally { - locatorVM.invoke(SecurityTestUtil.class, "stopLocator", new Object[] { - new Integer(port), expectedExceptions }); + locatorVM.invoke(() -> SecurityTestUtil.stopLocator( + new Integer(port), expectedExceptions )); } } @@ -525,9 +516,9 @@ public void testP2PLargeCredentialSucceeds() throws Exception { Properties javaProps = gen.getJavaProperties(); props.putAll(credentials); props.putAll(extraProps); - locatorVM.invoke(SecurityTestUtil.class, "startLocator", new Object[] { + locatorVM.invoke(() -> SecurityTestUtil.startLocator( getUniqueName(), new Integer(port), props, javaProps, - expectedExceptions }); + expectedExceptions )); try { // Start the first peer with huge credentials @@ -576,33 +567,30 @@ public void testP2PLargeCredentialSucceeds() throws Exception { javaProps = gen.getJavaProperties(); props.putAll(credentials); props.putAll(extraProps); - peer2.invoke(P2PAuthenticationDUnitTest.class, "createDS", new Object[] { - props, javaProps }); + peer2.invoke(() -> P2PAuthenticationDUnitTest.createDS( + props, javaProps )); // Start the third peer with the same authenticator as locator - peer3.invoke(P2PAuthenticationDUnitTest.class, "createDS", new Object[] { - props, javaProps }); + peer3.invoke(() -> P2PAuthenticationDUnitTest.createDS( + props, javaProps )); // wait for view propagation Wait.pause(2000); // Verify the number of members on all peers and locator - locatorVM.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(4) }); - peer2.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(4) }); - peer3.invoke(P2PAuthenticationDUnitTest.class, "verifyMembers", - new Object[] { new Integer(4) }); + locatorVM.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(4) )); + peer2.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(4) )); + peer3.invoke(() -> P2PAuthenticationDUnitTest.verifyMembers( new Integer(4) )); // Disconnect the peers disconnectFromDS(); - peer2.invoke(DistributedTestCase.class, "disconnectFromDS"); - peer3.invoke(DistributedTestCase.class, "disconnectFromDS"); + peer2.invoke(() -> DistributedTestCase.disconnectFromDS()); + peer3.invoke(() -> DistributedTestCase.disconnectFromDS()); } finally { // Stopping the locator - locatorVM.invoke(SecurityTestUtil.class, "stopLocator", new Object[] { - new Integer(port), expectedExceptions }); + locatorVM.invoke(() -> SecurityTestUtil.stopLocator( + new Integer(port), expectedExceptions )); } } diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/AsyncInvocation.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/AsyncInvocation.java index 544638e3c682..a612f8798569 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/AsyncInvocation.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/AsyncInvocation.java @@ -31,8 +31,8 @@ * AsyncInvocation can be used as follows:

* * 
- *   AsyncInvocation ai1 = vm.invokeAsync(Test.class, "method1");
- *   AsyncInvocation ai2 = vm.invokeAsync(Test.class, "method2");
+ *   AsyncInvocation ai1 = vm.invokeAsync(() -> Test.method1());
+ *   AsyncInvocation ai2 = vm.invokeAsync(() -> Test.method2());
  *
  *   ai1.join();
  *   ai2.join();
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
index 1a5fac4ae17e..3e2915af6c4b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
@@ -27,7 +27,7 @@
  * 
  *     VM vm0 = host0.getVM(0);
  *     try {
- *       vm.invoke(this.getClass(), "getUnknownObject");
+ *       vm.invoke(() -> this.getUnknownObject());
  *
  *     } catch (RMIException ex) {
  *       assertEquals(ex.getCause() instanceof ObjectException);
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
index f9d033c89cbb..068e81bb2508 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
@@ -44,14 +44,14 @@ public BasicDUnitTest(String name) {
   public void _testDontCatchRemoteException() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
-    vm.invoke(this.getClass(), "remoteThrowException");
+    vm.invoke(() -> this.remoteThrowException());
   }
 
   public void testRemoteInvocationWithException() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     try {
-      vm.invoke(this.getClass(), "remoteThrowException");
+      vm.invoke(() -> this.remoteThrowException());
       fail("Should have thrown a BasicTestException");
 
     } catch (RMIException ex) {
@@ -113,16 +113,14 @@ public void testRemoteInvokeAsync() throws InterruptedException {
     String value = "Hello";
 
     AsyncInvocation ai =
-      vm.invokeAsync(this.getClass(), "remoteBind", 
-                     new Object[] { name, value });
+      vm.invokeAsync(() -> this.remoteBind( name, value ));
     ai.join();
     // TODO shouldn't we call fail() here?
     if (ai.exceptionOccurred()) {
       Assert.fail("remoteBind failed", ai.getException());
     }
 
-    ai = vm.invokeAsync(this.getClass(), "remoteValidateBind",
-                        new Object[] {name, value });
+    ai = vm.invokeAsync(() -> this.remoteValidateBind(name, value ));
     ai.join();
     if (ai.exceptionOccurred()) {
       Assert.fail("remoteValidateBind failed", ai.getException());
@@ -149,7 +147,7 @@ public void testRemoteInvokeAsyncWithException()
 //    String value = "Hello";
 
     AsyncInvocation ai =
-      vm.invokeAsync(this.getClass(), "remoteThrowException");
+      vm.invokeAsync(() -> this.remoteThrowException());
     ai.join();
     assertTrue(ai.exceptionOccurred());
     Throwable ex = ai.getException();
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
index b9cce7fa2499..9cea1cc6f68d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
@@ -46,7 +46,7 @@ public void notestInvokeNonExistentMethod() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     try {
-      vm.invoke(VMDUnitTest.class, "nonExistentMethod");
+      vm.invoke(() -> VMDUnitTest.nonExistentMethod());
       fail("Should have thrown an RMIException");
 
     } catch (RMIException ex) {
@@ -68,7 +68,7 @@ public void notestInvokeStaticBoolean() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     assertEquals(BOOLEAN_VALUE,
-                 vm.invokeBoolean(VMDUnitTest.class, "remoteBooleanMethod")); 
+                 vm.invoke(() -> VMDUnitTest.remoteBooleanMethod())); 
   }
 
   /**
@@ -83,7 +83,7 @@ public void notestInvokeStaticBooleanNotBoolean() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     try {
-      vm.invokeBoolean(VMDUnitTest.class, "remoteByteMethod");
+      vm.invoke(() -> VMDUnitTest.remoteByteMethod());
       fail("Should have thrown an IllegalArgumentException");
 
     } catch (IllegalArgumentException ex) {
@@ -95,7 +95,7 @@ public void notestInvokeStaticLong() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     assertEquals(LONG_VALUE,
-                 vm.invokeLong(VMDUnitTest.class, "remoteLongMethod")); 
+                 vm.invoke(() -> VMDUnitTest.remoteLongMethod())); 
   }
 
   /**
@@ -110,7 +110,7 @@ public void notestInvokeStaticLongNotLong() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     try {
-      vm.invokeLong(VMDUnitTest.class, "remoteByteMethod");
+      vm.invoke(() -> VMDUnitTest.remoteByteMethod());
       fail("Should have thrown an IllegalArgumentException");
 
     } catch (IllegalArgumentException ex) {
@@ -212,19 +212,19 @@ public void testReturnValue() throws Exception {
     final Host host = Host.getHost(0);
     final VM vm = host.getVM(0);
     // Assert class static invocation works
-    AsyncInvocation a1 = vm.invokeAsync(getClass(), "getAndIncStaticCount");
+    AsyncInvocation a1 = vm.invokeAsync(() -> getAndIncStaticCount());
     a1.join();
     assertEquals(new Integer(0), a1.getReturnValue());
     // Assert class static invocation with args works
-    a1 = vm.invokeAsync(getClass(), "incrementStaticCount", new Object[] {new Integer(2)});
+    a1 = vm.invokeAsync(() -> incrementStaticCount(new Integer(2)));
     a1.join();
     assertEquals(new Integer(3), a1.getReturnValue());
     // Assert that previous values are not returned when invoking method w/ no return val
-    a1 = vm.invokeAsync(getClass(), "incStaticCount");
+    a1 = vm.invokeAsync(() -> incStaticCount());
     a1.join();
     assertNull(a1.getReturnValue());
     // Assert that previous null returns are over-written 
-    a1 = vm.invokeAsync(getClass(), "getAndIncStaticCount");
+    a1 = vm.invokeAsync(() -> getAndIncStaticCount());
     a1.join();
     assertEquals(new Integer(4), a1.getReturnValue());
 
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
index 5850e6f25ab4..ebc6f530e098 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
@@ -94,8 +94,7 @@ public void testClientWithFeederAndCQ() throws Exception
 
     cqDUnitTest.createServer(server);
 
-    final int port = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
@@ -141,13 +140,13 @@ public void testCQHAWithState() throws Exception {
     IgnoredException.addIgnoredException("Could not find any server");
     cqDUnitTest.createServer(server1);
     
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
     
     cqDUnitTest.createServer(server2, ports[0]);
-    final int port2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
             
     // Create client - With 3 server endpoints and redundancy level set to 2.
     
@@ -206,7 +205,7 @@ public void testCQHAWithState() throws Exception {
     
     // UPDATE with stop.
     cqDUnitTest.createServer(server3, ports[1]);
-    server3.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    server3.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     Wait.pause(2 * 1000);
     
     cqDUnitTest.clearCQListenerEvents(client, "testCQHAWithState_0");
@@ -257,8 +256,7 @@ public void testCQWithDestroysAndInvalidates() throws Exception
     VM client = host.getVM(1);
     VM producer = host.getVM(2);
     cqDUnitTest.createServer(server, 0, true);
-    final int port = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
@@ -333,7 +331,7 @@ public void testCQWithMultipleClients() throws Exception {
     
     /* Create Server and Client */
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     cqDUnitTest.createClient(client1, port, host0);
     cqDUnitTest.createClient(client2, port, host0);
@@ -402,7 +400,7 @@ public void testCQWithLoad() throws Exception {
     cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
     cqDUnitTest.createServer(server2, 0, false, MirrorType.KEYS);
         
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
       
     cqDUnitTest.createClient(client, port1, host0);
@@ -478,7 +476,7 @@ public void run2() throws CacheException {
       }
     });
         
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
       
     cqDUnitTest.createClient(client, port1, host0);
@@ -520,7 +518,7 @@ public void testCQWithConnectionPool() throws Exception {
 
     cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
 
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String serverHost = NetworkUtils.getServerHostName(server1.getHost());
 
     final String[] regions = cqDUnitTest.regions;
@@ -578,7 +576,7 @@ public void testCQWithBridgeClient() throws Exception {
 
     cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
 
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String serverHost = NetworkUtils.getServerHostName(server1.getHost());
 
     final String[] regions = cqDUnitTest.regions;
@@ -633,7 +631,7 @@ public void testCQWithPool() throws Exception {
 
     cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
 
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String serverHost = NetworkUtils.getServerHostName(server1.getHost());
 
     final String[] regions = cqDUnitTest.regions;
@@ -687,7 +685,7 @@ public void testCQWithEstablishCallBackConnection() throws Exception {
 
     cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
 
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String serverHost = NetworkUtils.getServerHostName(server1.getHost());
 
     final String[] regions = cqDUnitTest.regions;
@@ -752,7 +750,7 @@ public void testRegionEvents() throws Exception {
     VM client = host.getVM(1);
     
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     cqDUnitTest.createClient(client, port, host0);
@@ -833,7 +831,7 @@ public void testEventsDuringQueryExecution() throws Exception {
     VM client = host.getVM(1);
     final String cqName = "testEventsDuringQueryExecution_0";
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Initialize Client.
@@ -972,8 +970,7 @@ public void testMultipleExecuteWithInitialResults() throws Exception {
 
     // initialize server and retreive host and port values
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Initialize Client.
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
index 82d62797c9e1..a329a2b5be17 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
@@ -112,8 +112,7 @@ public void testClientWithFeederAndCQ() throws Exception
 
     cqDUnitTest.createServer(server);
 
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testClientWithFeederAndCQ";
@@ -160,13 +159,13 @@ public void testCQHAWithState() throws Exception {
     
     cqDUnitTest.createServer(server1);
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
     
     cqDUnitTest.createServer(server2, ports[0]);
-    final int port2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port2 = server2.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
             
     // Create client - With 3 server endpoints and redundancy level set to 2.
     
@@ -228,7 +227,7 @@ public void testCQHAWithState() throws Exception {
     
     // UPDATE with stop.
     cqDUnitTest.createServer(server3, ports[1]);
-    server3.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    server3.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     Wait.pause(2 * 1000);
     
     cqDUnitTest.clearCQListenerEvents(client, "testCQHAWithState_0");
@@ -278,8 +277,7 @@ public void testCQWithDestroysAndInvalidates() throws Exception
     VM client = host.getVM(1);
     VM producer = host.getVM(2);
     cqDUnitTest.createServer(server, 0, true);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testCQWithDestroysAndInvalidates";
@@ -358,7 +356,7 @@ public void testCQWithMultipleClients() throws Exception {
     
     /* Create Server and Client */
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName1 = "testCQWithMultipleClients1";
@@ -434,7 +432,7 @@ public void testCQWithLoad() throws Exception {
     cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
     cqDUnitTest.createServer(server2, 0, false, MirrorType.KEYS);
         
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     String poolName = "testCQWithLoad";
@@ -516,7 +514,7 @@ public void run2() throws CacheException {
 
     cqDUnitTest.createServer(server2, 0, false, MirrorType.NONE);
         
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
       
     String poolName = "testCQWithEviction";
@@ -597,7 +595,7 @@ public void testCQWithEstablishCallBackConnection() throws Exception {
 
     cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
 
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String serverHost = NetworkUtils.getServerHostName(server1.getHost());
 
 //    final String[] regions = cqDUnitTest.regions;
@@ -647,7 +645,7 @@ public void testRegionEvents() throws Exception {
     VM client = host.getVM(1);
     
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName = "testRegionEvents";
@@ -731,7 +729,7 @@ public void testEventsDuringQueryExecution() throws Exception {
     final String cqName = "testEventsDuringQueryExecution_0";
     cqDUnitTest.createServer(server);
     
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
  
     String poolName = "testEventsDuringQueryExecution";
@@ -869,17 +867,14 @@ public void testCqStatInitializationTimingIssue() {
     VM client2 = host.getVM(2);
  
     // Start server 1
-    final int server1Port = ((Integer) server.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int server1Port = ((Integer) server.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
     
     // Start a  client
-    client.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(client.getHost()), server1Port), regionName});
+    client.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(client.getHost()), server1Port), regionName));
     
     // Start a pub client
-    client2.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(client2.getHost()), server1Port), regionName});
+    client2.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(client2.getHost()), server1Port), regionName));
     
     //client has thread that invokes new and remove cq over and over
     client.invokeAsync(new CacheSerializableRunnable("Register cq") {
@@ -929,9 +924,9 @@ public void run2() throws CacheException {
       }
     });
     
-    client.invoke(CacheServerTestUtil.class, "closeCache");
-    client2.invoke(CacheServerTestUtil.class, "closeCache");
-    server.invoke(CacheServerTestUtil.class, "closeCache");
+    client.invoke(() -> CacheServerTestUtil.closeCache());
+    client2.invoke(() -> CacheServerTestUtil.closeCache());
+    server.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   public void testGetDurableCQsFromPoolOnly() throws Exception {
@@ -943,7 +938,7 @@ public void testGetDurableCQsFromPoolOnly() throws Exception {
     
     /* Create Server and Client */
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
   
     final String poolName1 = "pool1";
@@ -1082,7 +1077,7 @@ public void testGetDurableCQsFromServerWithEmptyList() throws Exception {
     
     /* Create Server and Client */
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
   
     final String poolName1 = "pool1";
@@ -1125,17 +1120,14 @@ public void testGetDurableCqsFromServer() {
     VM client2 = host.getVM(2);
  
     // Start server 1
-    final int server1Port = ((Integer) server.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int server1Port = ((Integer) server.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
     
     // Start client 1
-    client1.invoke(CacheServerTestUtil.class, "createClientCache", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(client1.getHost()), server1Port), regionName});
+    client1.invoke(() -> CacheServerTestUtil.createClientCache(getClientPool(NetworkUtils.getServerHostName(client1.getHost()), server1Port), regionName));
     
     // Start client 2
-    client2.invoke(CacheServerTestUtil.class, "createClientCache", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(client2.getHost()), server1Port), regionName});
+    client2.invoke(() -> CacheServerTestUtil.createClientCache(getClientPool(NetworkUtils.getServerHostName(client2.getHost()), server1Port), regionName));
     
     createClient1CqsAndDurableCqs(client1, regionName);
     createClient2CqsAndDurableCqs(client2, regionName);
@@ -1174,9 +1166,9 @@ public void run2() throws CacheException {
       }
     });
     
-    client1.invoke(CacheServerTestUtil.class, "closeCache");
-    client2.invoke(CacheServerTestUtil.class, "closeCache");
-    server.invoke(CacheServerTestUtil.class, "closeCache");
+    client1.invoke(() -> CacheServerTestUtil.closeCache());
+    client2.invoke(() -> CacheServerTestUtil.closeCache());
+    server.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   public void testGetDurableCqsFromServerCycleClients() {
@@ -1187,17 +1179,14 @@ public void testGetDurableCqsFromServerCycleClients() {
     VM client2 = host.getVM(2);
     int timeout = 60000;
     // Start server 1
-    final int server1Port = ((Integer) server.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int server1Port = ((Integer) server.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
     
     // Start client 1
-    client1.invoke(CacheServerTestUtil.class, "createClientCache", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(client1.getHost()), server1Port), regionName, getDurableClientProperties("client1_dc", timeout)});
+    client1.invoke(() -> CacheServerTestUtil.createClientCache(getClientPool(NetworkUtils.getServerHostName(client1.getHost()), server1Port), regionName, getDurableClientProperties("client1_dc", timeout)));
     
     // Start client 2
-    client2.invoke(CacheServerTestUtil.class, "createClientCache", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(client2.getHost()), server1Port), regionName, getDurableClientProperties("client2_dc", timeout)});
+    client2.invoke(() -> CacheServerTestUtil.createClientCache(getClientPool(NetworkUtils.getServerHostName(client2.getHost()), server1Port), regionName, getDurableClientProperties("client2_dc", timeout)));
     
     createClient1CqsAndDurableCqs(client1, regionName);
     createClient2CqsAndDurableCqs(client2, regionName);
@@ -1239,9 +1228,9 @@ public void run2() throws CacheException {
       }
     });
     
-    client1.invoke(CacheServerTestUtil.class, "closeCache");
-    client2.invoke(CacheServerTestUtil.class, "closeCache");
-    server.invoke(CacheServerTestUtil.class, "closeCache");
+    client1.invoke(() -> CacheServerTestUtil.closeCache());
+    client2.invoke(() -> CacheServerTestUtil.closeCache());
+    server.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   public void testGetDurableCqsFromServerCycleClientsAndMoreCqs() {
@@ -1252,17 +1241,14 @@ public void testGetDurableCqsFromServerCycleClientsAndMoreCqs() {
     VM client2 = host.getVM(2);
     int timeout = 60000;
     // Start server 1
-    final int server1Port = ((Integer) server.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int server1Port = ((Integer) server.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
     
     // Start client 1
-    client1.invoke(CacheServerTestUtil.class, "createClientCache", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(client1.getHost()), server1Port), regionName, getDurableClientProperties("client1_dc", timeout)});
+    client1.invoke(() -> CacheServerTestUtil.createClientCache(getClientPool(NetworkUtils.getServerHostName(client1.getHost()), server1Port), regionName, getDurableClientProperties("client1_dc", timeout)));
     
     // Start client 2
-    client2.invoke(CacheServerTestUtil.class, "createClientCache", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(client2.getHost()), server1Port), regionName, getDurableClientProperties("client2_dc", timeout)});
+    client2.invoke(() -> CacheServerTestUtil.createClientCache(getClientPool(NetworkUtils.getServerHostName(client2.getHost()), server1Port), regionName, getDurableClientProperties("client2_dc", timeout)));
     
     //create the test cqs
     createClient1CqsAndDurableCqs(client1, regionName);
@@ -1375,9 +1361,9 @@ public void run2() throws CacheException {
       }
     });
     
-    client1.invoke(CacheServerTestUtil.class, "closeCache");
-    client2.invoke(CacheServerTestUtil.class, "closeCache");
-    server.invoke(CacheServerTestUtil.class, "closeCache");
+    client1.invoke(() -> CacheServerTestUtil.closeCache());
+    client2.invoke(() -> CacheServerTestUtil.closeCache());
+    server.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   private Properties getDurableClientProperties(String durableClientId, int durableClientTimeout) {
@@ -1462,8 +1448,7 @@ public void run2() throws CacheException {
       }
     });
     
-    client.invoke(CacheServerTestUtil.class, "createClientCache", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(client.getHost()), serverPort), regionName, getDurableClientProperties(dcName, durableClientTimeout)});
+    client.invoke(() -> CacheServerTestUtil.createClientCache(getClientPool(NetworkUtils.getServerHostName(client.getHost()), serverPort), regionName, getDurableClientProperties(dcName, durableClientTimeout)));
   }
   
 
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
index a9747f2a2f5d..97035f0cdac0 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -85,8 +85,7 @@ public void perf_testCQPerf() throws Exception {
     
     cqDUnitTest.createServer(server);
     
-    final int port = server.invokeInt(CqQueryDUnitTest.class,
-    "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Create client.
@@ -191,7 +190,7 @@ public void testKeyMaintainance() throws Exception {
     VM client = host.getVM(1);
     
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     cqDUnitTest.createClient(client, port, host0);
     
@@ -411,7 +410,7 @@ public void testMatchingCqs() throws Exception {
     VM client = host.getVM(1);
     
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     cqDUnitTest.createClient(client, port, host0);
     
@@ -526,7 +525,7 @@ public void testMatchingCQWithMultipleClients() throws Exception {
     VM clients[] = new VM[]{client1, client2, client3};
     
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
         
     for (int clientIndex=0; clientIndex < 3; clientIndex++){
@@ -685,7 +684,7 @@ public void testMatchingCQsWithMultipleServers() throws Exception {
     
     VM clients[] = new VM[]{client1, client2};
     
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     // Create client.
     
@@ -726,7 +725,7 @@ public void testMatchingCQsWithMultipleServers() throws Exception {
     cqDUnitTest.createServer(server2, ports[0]);
     
     
-    final int port2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     System.out.println("### Port on which server1 running : " + port1 + 
         " Server2 running : " + port2);
 
@@ -848,7 +847,7 @@ public void testMatchingCQsOnDataNodeWithMultipleServers() throws Exception {
     
     VM clients[] = new VM[]{client1, client2};
     
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
     
@@ -896,8 +895,8 @@ public void perf_testPerformanceForMatchingCQs() throws Exception {
     
 //    VM clients[] = new VM[]{client1, client2};
     
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
-    final int port2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
+    final int port2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     // Create client.
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
index 3c7e3b58cdb1..e63188643f42 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -85,8 +85,7 @@ public void perf_testCQPerf() throws Exception {
     
     cqDUnitTest.createServer(server);
     
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
-    "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Create client.
@@ -191,7 +190,7 @@ public void testKeyMaintenance() throws Exception {
     VM client = host.getVM(1);
     
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     // cqDUnitTest.createClient(client, port, host0);
 
@@ -411,7 +410,7 @@ public void testMatchingCqs() throws Exception {
     VM client = host.getVM(1);
     
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     //cqDUnitTest.createClient(client, port, host0);
     
@@ -529,7 +528,7 @@ public void testMatchingCQWithMultipleClients() throws Exception {
     VM clients[] = new VM[]{client1, client2, client3};
     
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     String poolName = "testMatchingCQWithMultipleClients";     
     for (int clientIndex=0; clientIndex < 3; clientIndex++){
@@ -692,7 +691,7 @@ public void testMatchingCQsWithMultipleServers() throws Exception {
     
     VM clients[] = new VM[]{client1, client2};
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     // Create client.
     
@@ -739,7 +738,7 @@ public void testMatchingCQsWithMultipleServers() throws Exception {
     cqDUnitTest.createServer(server2, ports[0]);
     
     
-    final int port2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port2 = server2.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     System.out.println("### Port on which server1 running : " + port1 + 
         " Server2 running : " + port2);
 
@@ -856,8 +855,8 @@ public void perf_testPerformanceForMatchingCQs() throws Exception {
     
 //    VM clients[] = new VM[]{client1, client2};
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
-    final int port2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
+    final int port2 = server2.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     // Create client.
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index 24187a0682be..bc0121b68453 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -1618,7 +1618,7 @@ public void testCQRemainsWhenServerGCs() throws Exception {
     createServer(server);
     createServer(server2);
 
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
@@ -1661,7 +1661,7 @@ public void testInterestListAndCQs() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     createClient(client, thePort, host0);
     
@@ -1831,7 +1831,7 @@ public void testCQStopExecute() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     createClient(client, thePort, host0);
     
@@ -1914,7 +1914,7 @@ public void testCQAttributesMutator() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     createClient(client, thePort, host0);
     
@@ -2010,7 +2010,7 @@ public void testCQCreateClose() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     createClient(client, thePort, host0);
     
@@ -2196,7 +2196,7 @@ public void testRegionDestroy() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     createClient(client, thePort, host0);
     
@@ -2280,7 +2280,7 @@ public void testCQWithMultipleClients() throws Exception {
     
     /* Create Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     createClient(client1, thePort, host0);
     createClient(client2, thePort, host0);
@@ -2430,7 +2430,7 @@ public void testCQResultSet() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Create client.
@@ -2501,7 +2501,7 @@ public void testCQEvents() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Create client.
@@ -2603,8 +2603,7 @@ public void testCQMapValues() throws Exception {
     
     createMapValues(server, regions[0], size/2);
 
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
@@ -2688,7 +2687,7 @@ public void testEnableDisableCQ() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Create client.
@@ -2830,7 +2829,7 @@ public void testQuery() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Create client.
@@ -2872,7 +2871,7 @@ public void testCQFailOver() throws Exception {
     
     createServer(server1);
     
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     // Create client.
 //    Properties props = new Properties();
@@ -2898,7 +2897,7 @@ public void testCQFailOver() throws Exception {
     Wait.pause(1 * 1000);
     
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     System.out.println("### Port on which server1 running : " + port1 + 
         " Server2 running : " + thePort2);
     Wait.pause(3 * 1000);
@@ -2960,16 +2959,16 @@ public void testCQHA() throws Exception {
     
     createServer(server1);
     
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
     
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     
     createServer(server3, ports[1]);
-    final int port3 = server3.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port3 = server3.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     System.out.println("### Port on which server1 running : " + port1 + 
         " server2 running : " + thePort2 + 
         " Server3 running : " + port3);
@@ -3058,10 +3057,10 @@ public void testWithoutCQs() throws Exception {
     createServer(server1);
     createServer(server2);
     
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     
     SerializableRunnable createConnectionPool =
       new CacheSerializableRunnable("Create region") {
@@ -3118,7 +3117,7 @@ public void testGetCQsForARegionName() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Create client.
@@ -3187,7 +3186,7 @@ public void testCqExceptionForReplicateRegionWithEvictionLocalDestroy() throws E
     createReplicateRegionWithLocalDestroy(server, new String[]{regions[0]});
     
     
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Create client.
@@ -3222,8 +3221,7 @@ public void testQueryWithNULLInWhereClause() throws Exception
 
     createServer(server);
 
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
@@ -3306,13 +3304,11 @@ public void run2() throws CacheException
     server1.invoke(createServer);
     server2.invoke(createServer);
     
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
 
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class,
-    "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
 
     // Create client.
     createClient(client, new int[] {port1, thePort2}, host0, "-1");
@@ -3375,7 +3371,7 @@ public void testCQWhereCondOnShort() throws Exception {
       
       createServer(server);
       
-      final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+      final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
       final String host0 = NetworkUtils.getServerHostName(server.getHost());
       
       // Create client.
@@ -3407,7 +3403,7 @@ public void testCQEquals() throws Exception {
       
       createServer(server);
       
-      final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+      final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
       final String host0 = NetworkUtils.getServerHostName(server.getHost());
       
       // Create client.
@@ -3459,7 +3455,7 @@ public void testCQEqualsWithIndex() throws Exception {
       
       createServer(server);
       
-      final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+      final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
       final String host0 = NetworkUtils.getServerHostName(server.getHost());
       
       // Create client.
@@ -3510,8 +3506,7 @@ public void testCQAllServersCrash() throws Exception {
 
     createServer(server1);
 
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
@@ -3530,8 +3525,7 @@ public void testCQAllServersCrash() throws Exception {
     waitForCreated(client, "testCQAllServersLeave_11", KEY + 10);
 
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     Wait.pause(8 * 1000);
 
     // Close server1.
@@ -3558,8 +3552,7 @@ public void testCQAllServersLeave() throws Exception {
     VM client = host.getVM(2);
 
     createServer(server1);
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
     
@@ -3577,8 +3570,7 @@ public void testCQAllServersLeave() throws Exception {
     waitForCreated(client, "testCQAllServersLeave_11", KEY + 10);
 
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     Wait.pause(10 * 1000);
 
     // Close server1 and pause so server has chance to close
@@ -3605,8 +3597,7 @@ public void testCQAllServersLeaveAndRejoin() throws Exception {
     VM client = host.getVM(2);
 
     createServer(server1);
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
@@ -3626,8 +3617,7 @@ public void testCQAllServersLeaveAndRejoin() throws Exception {
     
     //start server 2
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     Wait.pause(8 * 1000);
 
     // Close server1.
@@ -3667,8 +3657,7 @@ public void testCQPrimaryLeaves() throws Exception {
     VM client = host.getVM(2);
 
     createServer(server1);
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
@@ -3685,8 +3674,7 @@ public void testCQPrimaryLeaves() throws Exception {
     waitForCreated(client, "testCQAllServersLeave_11", KEY + 10);
 
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     Wait.pause(8 * 1000);
 
     // Close server1 and give time for server1 to actually shutdown
@@ -3716,14 +3704,12 @@ public void testCQAllServersLeaveMultiplePool() throws Exception {
 
     createServer(server1);
 
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
 
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     Wait.pause(8 * 1000);
 
     // Create client
@@ -3770,7 +3756,7 @@ public void testCqCloseAndExecuteWithInitialResults() throws Exception {
    
    createServer(server);
    
-   final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+   final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
    final String host0 = NetworkUtils.getServerHostName(server.getHost());
    
    // Create client.
@@ -3799,7 +3785,7 @@ public void testCQEventsWithNotEqualsUndefined() throws Exception {
   
   createServer(server);
   
-  final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+  final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
   final String host0 = NetworkUtils.getServerHostName(server.getHost());
   
   // Create client.
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
index 6be233a5670f..a3ccf36868f6 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -72,8 +72,7 @@ public void testCqExecuteWithoutQueryExecution() throws Exception {
     // Create values.
     createValues(server, regions[0], numOfEntries);
 
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
@@ -171,8 +170,7 @@ public void run2() throws CacheException {
     // Create values.
     createValues(server, regions[0], numOfEntries);
 
-    final int thePort = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
@@ -266,14 +264,12 @@ public void testCQAllServersLeaveMultiplePool() throws Exception {
 
     createServer(server1);
 
-    final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
 
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     Wait.pause(8 * 1000);
 
     // Create client
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index 2f317f2a016a..680112b45166 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -1345,7 +1345,7 @@ public void testInterestListAndCQs() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName = "testInterestListAndCQs";
@@ -1537,7 +1537,7 @@ public void testCQStopExecute() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName = "testCQStopExecute";
@@ -1624,7 +1624,7 @@ public void testCQAttributesMutator() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName = "testCQAttributesMutator";
@@ -1722,7 +1722,7 @@ public void testCQCreateClose() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName = "testCQCreateClose";
@@ -1891,7 +1891,7 @@ public void testRegionDestroy() throws Exception {
     
     /* Init Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName = "testRegionDestroy";
@@ -1996,7 +1996,7 @@ public void testCQWithMultipleClients() throws Exception {
     
     /* Create Server and Client */
     createServer(server);
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName1 = "testCQWithMultipleClients1";
@@ -2149,7 +2149,7 @@ public void testCQResultSet() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName = "testCQResultSet";
@@ -2223,7 +2223,7 @@ public void testCQEvents() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testCQEvents";
@@ -2328,7 +2328,7 @@ public void testCqEventsWithoutAlias() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testCQEvents";
@@ -2430,7 +2430,7 @@ public void testEnableDisableCQ() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testEnableDisableCQ";
@@ -2571,7 +2571,7 @@ public void testQuery() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName = "testQuery";
@@ -2616,7 +2616,7 @@ public void testCQFailOver() throws Exception {
     
     createServer(server1);
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     // Create client.
 //    Properties props = new Properties();
@@ -2645,7 +2645,7 @@ public void testCQFailOver() throws Exception {
     Wait.pause(1 * 1000);
     
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     System.out.println("### Port on which server1 running : " + port1 + 
         " Server2 running : " + thePort2);
     Wait.pause(3 * 1000);
@@ -2710,16 +2710,16 @@ public void testCQHA() throws Exception {
     
     createServer(server1);
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
     
     createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     
     createServer(server3, ports[1]);
-    final int port3 = server3.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port3 = server3.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     System.out.println("### Port on which server1 running : " + port1 + 
         " server2 running : " + thePort2 + 
         " Server3 running : " + port3);
@@ -2810,7 +2810,7 @@ public void testFilterRegistrationDuringGII() throws Exception {
     
     createServer(server1);
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
@@ -2942,10 +2942,10 @@ public void testWithoutCQs() throws Exception {
     createServer(server1);
     createServer(server2);
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
-    final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     
     SerializableRunnable createConnectionPool =
       new CacheSerializableRunnable("Create region") {
@@ -3002,7 +3002,7 @@ public void testGetCQsForARegionName() throws Exception {
     
     createServer(server);
     
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Create client.
@@ -3076,8 +3076,7 @@ public void testQueryWithNULLInWhereClause() throws Exception
 
     createServer(server);
 
-    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testQueryWithNULLInWhereClause";
@@ -3164,13 +3163,11 @@ public void run2() throws CacheException
     server1.invoke(createServer);
     server2.invoke(createServer);
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
 
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
-    final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class,
-    "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
 
     String poolName = "testForSupportedRegionAttributes";
     createPool(client, poolName, new String[] {host0, host0}, new int[] {port1, thePort2});
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index 71049479a37d..35cef9d36081 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -159,8 +159,7 @@ public void testCqResults() throws Exception
 
     cqDUnitTest.createServer(server);
 
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testCqResults";
@@ -214,8 +213,7 @@ public void testCqResultsWithCompactRangeIndex() throws Exception
 
     cqDUnitTest.createServer(server);
 
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testCqResults";
@@ -259,8 +257,7 @@ public void testCqResultsWithRangeIndex() throws Exception
 
     cqDUnitTest.createServer(server);
 
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testCqResults";
@@ -318,8 +315,7 @@ public void testCqResultsOnPR() throws Exception
     cqDUnitTest.createServerWithPR(server1, 0, false, 0);
     cqDUnitTest.createServerWithPR(server2, 0, false, 0);
     
-    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testCqResults";
@@ -375,8 +371,7 @@ public void testCqResultsWithCompactRangeIndexOnPR() throws Exception
     cqDUnitTest.createServerWithPR(server1, 0, false, 0);
     cqDUnitTest.createServerWithPR(server2, 0, false, 0);
 
-    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testCqResults";
@@ -424,8 +419,7 @@ public void testCqResultsWithRangeIndexOnPR() throws Exception
     cqDUnitTest.createServerWithPR(server1, 0, false, 0);
     cqDUnitTest.createServerWithPR(server2, 0, false, 0);
 
-    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testCqResults";
@@ -493,8 +487,7 @@ public void testCqResultsCaching() throws Exception
 
     cqDUnitTest.createServer(server);
 
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testCqResults";
@@ -617,8 +610,7 @@ public void testCqResultsCachingForMultipleCQs() throws Exception
 
     cqDUnitTest.createServer(server);
 
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testCqResults";
@@ -746,8 +738,7 @@ public void testCqResultsCachingForPR() throws Exception
     cqDUnitTest.createServerWithPR(server1, 0, false, 0);
     cqDUnitTest.createServerWithPR(server2, 0, false, 0);
     
-    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testCqResults";
@@ -859,8 +850,7 @@ public void testCqResultsCachingForDestroyEventsOnPR() throws Exception
     cqDUnitTest.createServerWithPR(server1, 0, false, 0);
     cqDUnitTest.createServerWithPR(server2, 0, false, 0);
     
-    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testCqResults";
@@ -977,7 +967,7 @@ public void testCqResultsCachingWithFailOver() throws Exception
     
     cqDUnitTest.createServer(server1);
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
     
@@ -1080,7 +1070,7 @@ public void run2()throws CacheException {
     });
     
     cqDUnitTest.createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     System.out.println("### Port on which server1 running : " + port1 + 
         " Server2 running : " + thePort2);
     Wait.pause(3 * 1000);
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
index facb3d9b8499..2363d2d771f8 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -79,7 +79,7 @@ public void testCqResultsCachingWithFailOver() throws Exception
     
     cqDUnitTest.createServer(server1);
     
-    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port1 = server1.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
     
@@ -182,7 +182,7 @@ public void run2()throws CacheException {
     });
     
     cqDUnitTest.createServer(server2, ports[0]);
-    final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int thePort2 = server2.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     System.out.println("### Port on which server1 running : " + port1 + 
         " Server2 running : " + thePort2);
     Wait.pause(3 * 1000);
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
index a006f46cdd47..6afdaecfa7e6 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -248,7 +248,7 @@ public void testCQStatistics() throws Exception {
     
     /* Init Server and Client */
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     cqDUnitTest.createClient(client, port, host0);
     
@@ -339,7 +339,7 @@ public void testCQServiceStatistics() throws Exception {
     
     /* Init Server and Client */
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     cqDUnitTest.createClient(client1, port, host0);
     cqDUnitTest.createClient(client2, port, host0);
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index 869ea817b230..04e9b421e07c 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -248,7 +248,7 @@ public void testCQStatistics() throws Exception {
     
     /* Init Server and Client */
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName = "testCQStatistics";
@@ -343,7 +343,7 @@ public void testCQServiceStatistics() throws Exception {
     
     /* Init Server and Client */
     cqDUnitTest.createServer(server);
-    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     String poolName1 = "testCQServiceStatistics1";
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index c9aa5643fe93..ca506fa160a8 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -128,7 +128,7 @@ public void testCQLeakWithPartitionedRegion() throws Exception {
     
     // create client 
     
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     createClient(client, port, host0);
@@ -158,8 +158,8 @@ public void testCQLeakWithPartitionedRegion() throws Exception {
         /* totalEvents: */ size);
     
     
-    int cc1 = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCqCountFromRegionProfile");
-    int cc2 = server2.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCqCountFromRegionProfile");
+    int cc1 = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile());
+    int cc2 = server2.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile());
     assertEquals("Should have one", 1, cc1);
     assertEquals("Should have one", 1, cc2);
     
@@ -167,8 +167,8 @@ public void testCQLeakWithPartitionedRegion() throws Exception {
     
     cqHelper.closeClient(client);
     Wait.pause(10 * 1000);
-    //cc1 = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCqCountFromRegionProfile");
-    cc2 = server2.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCqCountFromRegionProfile");
+    //cc1 = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile());
+    cc2 = server2.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile());
     
     //assertEquals("Should have one", 0, cc1);
     assertEquals("Should have one", 0, cc2);
@@ -190,7 +190,7 @@ public void testCQAndPartitionedRegion() throws Exception {
     
     // create client 
     
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     createClient(client, port, host0);
@@ -303,7 +303,7 @@ public void testPartitionedCqOnAccessorBridgeServer() throws Exception {
     
     // create client 
     
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     createClient(client, port, host0);
@@ -394,7 +394,7 @@ public void testPartitionedCqOnSingleBridgeServer() throws Exception {
     
     // creating an accessor vm with Bridge Server installed.
     createServer(server1);
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     createClient(client, port, host0);
@@ -492,7 +492,7 @@ public void testPRCqOnSingleBridgeServerUpdatesOriginatingAtAccessor() throws Ex
     
     // create client 
     
-    final int port = server2.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server2.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server2.getHost());
     
     createClient(client, port, host0);
@@ -587,7 +587,7 @@ public void testPRCqWithInvalidatesOnBridgeServer()  {
     createServer(server2);
     
     
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     createClient(client, port, host0);
@@ -683,7 +683,7 @@ public void testPRCqWithInvalidatesOnAccessorBridgeServer() throws Exception {
     createServer(server2);
     
     
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     createClient(client, port, host0);
@@ -779,7 +779,7 @@ public void testPRCqWithUpdatesFromClients() throws Exception {
     createServer(server2, false , 1);
     
     
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     createClient(client, port, host0);
@@ -881,7 +881,7 @@ public void testPRCqWithMultipleRegionsOnServer() throws Exception {
     // Wait for server to initialize.
     Wait.pause(2000);
     
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     createClient(client, port, host0);
@@ -1022,7 +1022,7 @@ public void testPRWithCQsAndProfileUpdates() throws Exception {
     createServer(server2, false , 1);
     
     
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     createClient(client, port, host0);
@@ -1240,7 +1240,7 @@ public void testEventsDuringQueryExecution() throws Exception {
     createServer(server1);
     createServer(server2);
     
-    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     // Initialize Client.
@@ -1373,7 +1373,7 @@ public void testDestroyRegionEventOnClientsWithCQRegistered() throws Exception{
     
     createServerWithoutRootRegion(server, 0, false, 0);
     
-    final int port = server.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final int port = server.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     
     // Initialize Client.
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
index 659bf124c2ce..7989bc080631 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -66,8 +66,7 @@ public void testCqExecuteWithoutQueryExecution() throws Exception {
     // Create values.
     createValues(server, regions[0], numOfEntries);
 
-    final int thePort = server.invokeInt(PartitionedRegionCqQueryOptimizedExecuteDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort = server.invoke(() -> PartitionedRegionCqQueryOptimizedExecuteDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
@@ -164,8 +163,7 @@ public void run2() throws CacheException {
     // Create values.
     createValues(server, regions[0], numOfEntries);
 
-    final int thePort = server.invokeInt(PartitionedRegionCqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int thePort = server.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index 273380d79e05..a443641799fa 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -120,7 +120,7 @@ public void testCQAndPartitionedRegion() throws Exception {
     
     // create client 
     
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     //createClient(client, port, host0);
@@ -235,7 +235,7 @@ public void testPartitionedCqOnAccessorBridgeServer() throws Exception {
     
     // create client 
     
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     String poolName = "testPartitionedCqOnAccessorBridgeServer";
@@ -329,7 +329,7 @@ public void testPartitionedCqOnSingleBridgeServer() throws Exception {
     
     // creating an accessor vm with Bridge Server installed.
     createServer(server1);
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     String poolName = "testPartitionedCqOnSingleBridgeServer";
@@ -429,7 +429,7 @@ public void testPRCqOnSingleBridgeServerUpdatesOriginatingAtAccessor() throws Ex
     
     // create client 
     
-    final int port = server2.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server2.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server2.getHost());
     
     String poolName = "testPRCqOnSingleBridgeServerUpdatesOriginatingAtAccessor";
@@ -527,7 +527,7 @@ public void testPRCqWithInvalidatesOnBridgeServer()  {
     createServer(server2);
     
     
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testPRCqWithInvalidatesOnBridgeServer";
@@ -627,7 +627,7 @@ public void testPRCqWithInvalidatesOnAccessorBridgeServer() throws Exception {
     createServer(server2);
     
     
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     String poolName = "testPRCqWithInvalidatesOnAccessorBridgeServer";
@@ -728,7 +728,7 @@ public void testPRCqWithUpdatesFromClients() throws Exception {
     createServer(server2, false , 1);
     
     
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     String poolName1 = "testPRCqWithUpdatesFromClients1";
@@ -837,7 +837,7 @@ public void testPRCqWithMultipleRegionsOnServer() throws Exception {
     // Wait for server to initialize.
     Wait.pause(2000);
     
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName1 = "testPRCqWithMultipleRegionsOnServer1";
@@ -983,7 +983,7 @@ public void testPRWithCQsAndProfileUpdates() throws Exception {
     // Wait for server to initialize.
     Wait.pause(2000);
     
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     String poolName1 = "testPRWithCQsAndProfileUpdates1";
@@ -1202,7 +1202,7 @@ public void testEventsDuringQueryExecution() throws Exception {
     createServer(server1);
     createServer(server2);
     
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
     
     String poolName1 = "testEventsDuringQueryExecution";
@@ -1336,7 +1336,7 @@ public void testCQsWithPutalls() throws Exception {
     // create values
     final int size = 100;
 
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testCQsWithPutalls";
@@ -1430,7 +1430,7 @@ public void testCQsWithPutallsValidateStats() throws Exception {
     // create values
     final int size = 100;
 
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testCQsWithPutalls";
@@ -1532,7 +1532,7 @@ public void testCQsWithPutallsWithTx() throws Exception {
     // create values
     final int size = 100;
 
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testCQsWithPutallsTx";
@@ -1654,7 +1654,7 @@ public void testCQsWithPutallsWithTxValidateStats() throws Exception {
     // create values
     final int size = 100;
 
-    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port = server1.invoke(() -> PrCqUsingPoolDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server1.getHost());
 
     String poolName = "testCQsWithPutallsTx";
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
index 49a125231d27..8180b31ab1d6 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -85,8 +85,8 @@ public void run2() throws CacheException {
     });
 
     // Client pool.
-    final int port0 = vm0.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
-    final int port1 = vm1.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+    final int port0 = vm0.invoke(() -> PdxQueryCQTestBase.getCacheServerPort());
+    final int port1 = vm1.invoke(() -> PdxQueryCQTestBase.getCacheServerPort());
 
     final String host0 = NetworkUtils.getServerHostName(vm0.getHost());
 
@@ -266,8 +266,8 @@ public void run2() throws CacheException {
     });
 
     // Client pool.
-    final int port0 = vm0.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
-    final int port1 = vm1.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+    final int port0 = vm0.invoke(() -> PdxQueryCQTestBase.getCacheServerPort());
+    final int port1 = vm1.invoke(() -> PdxQueryCQTestBase.getCacheServerPort());
 
     final String host0 = NetworkUtils.getServerHostName(vm0.getHost());
 
@@ -469,9 +469,9 @@ public void run2() throws CacheException {
     });
     
     // Client pool.
-    final int port0 = vm0.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
-    final int port1 = vm1.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
-    final int port2 = vm2.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+    final int port0 = vm0.invoke(() -> PdxQueryCQTestBase.getCacheServerPort());
+    final int port1 = vm1.invoke(() -> PdxQueryCQTestBase.getCacheServerPort());
+    final int port2 = vm2.invoke(() -> PdxQueryCQTestBase.getCacheServerPort());
     
     final String host0 = NetworkUtils.getServerHostName(vm0.getHost());
 
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
index 6e4de65225d8..2662120f76fe 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -96,8 +96,7 @@ public void testClientIndexUpdateWithRIOnKeys() throws Exception{
 
     this.createServer(server, 0, false);
 
-    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> QueryIndexUpdateRIDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Init values at server. 
@@ -142,8 +141,7 @@ public void testClientIndexUpdateWithRIOnOverlapKeys() throws Exception{
 
     this.createServer(server, 0, false);
 
-    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> QueryIndexUpdateRIDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     String poolName = "testClientIndexUpdateWithRegisterInterest";
@@ -193,8 +191,7 @@ public void testClientIndexUpdateWithRIOnRegion() throws Exception{
 
     this.createServer(server, 0, false);
 
-    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> QueryIndexUpdateRIDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     //Init values at server. 
@@ -234,8 +231,7 @@ public void testClientIndexUpdateWithRIOnRegEx() throws Exception{
 
     this.createServer(server, 0, false);
 
-    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> QueryIndexUpdateRIDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     //Init values at server. 
@@ -281,8 +277,7 @@ public void testClientIndexUpdateWithRIOnClearedRegion() throws Exception{
 
     this.createServer(server, 0, false);
 
-    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> QueryIndexUpdateRIDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     //Init values at server. 
@@ -338,8 +333,7 @@ public void testClientIndexUpdateWithRIOnPRRegion() throws Exception{
 
     this.createServer(server, 0, true);
 
-    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> QueryIndexUpdateRIDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Init values at server. 
@@ -379,8 +373,7 @@ public void testClientIndexUpdateWithRIOnPRKeys() throws Exception{
 
     this.createServer(server, 0, true);
 
-    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> QueryIndexUpdateRIDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Init values at server. 
@@ -420,8 +413,7 @@ public void testClientIndexUpdateWithRIOnPRRegEx() throws Exception{
 
     this.createServer(server, 0, true);
 
-    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> QueryIndexUpdateRIDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Init values at server. 
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index febe78ebe276..8008c3a202e8 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -177,7 +177,7 @@ protected final void preTearDownCacheTestCase() throws Exception {
     disconnectFromDS();
     // shut down clients before servers
     for (int i=numServers; i<4; i++) {
-      host.getVM(i).invoke(CacheTestCase.class, "disconnectFromDS");
+      host.getVM(i).invoke(() -> CacheTestCase.disconnectFromDS());
     }
   }
   
@@ -262,7 +262,7 @@ public void run() {
   public void configClient(VM client, VM[] server){
     final int[] port = new int[server.length];
     for (int i=0; i < server.length; i++){
-      port[i] = server[i].invokeInt(QueryMonitorDUnitTest.class, "getCacheServerPort");
+      port[i] = server[i].invoke(() -> QueryMonitorDUnitTest.getCacheServerPort());
     }
     final String host0 = NetworkUtils.getServerHostName(server[0].getHost());
 
@@ -1018,8 +1018,7 @@ public void testCQWithDestroysAndInvalidates() throws Exception
     VM producerClient = host.getVM(2);
     
     cqDUnitTest.createServer(server, 0, true);
-    final int port = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
index 8a4eeaab07f8..12fd791db61f 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -135,12 +135,9 @@ public void setUp() throws Exception {
     dataStore3 = host.getVM(3);
     
     DeltaTestImpl.resetDeltaInvokationCounters();
-    dataStore1.invoke(PRDeltaPropagationDUnitTest.class,
-        "resetAll");
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class,
-        "resetAll");
-    dataStore3.invoke(PRDeltaPropagationDUnitTest.class,
-    "resetAll");
+    dataStore1.invoke(() -> PRDeltaPropagationDUnitTest.resetAll());
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.resetAll());
+    dataStore3.invoke(() -> PRDeltaPropagationDUnitTest.resetAll());
   }
 
   /**
@@ -153,10 +150,8 @@ public void testDeltaPropagationForPR() throws Throwable {
     createCacheInAllPRVms();
     createDeltaPR(Boolean.FALSE);
     put();
-    Boolean deltaUsed1 = (Boolean)dataStore1.invoke(
-        PRDeltaPropagationDUnitTest.class, "checkForDelta");
-    Boolean deltaUsed2 = (Boolean)dataStore2.invoke(
-        PRDeltaPropagationDUnitTest.class, "checkForDelta");
+    Boolean deltaUsed1 = (Boolean)dataStore1.invoke(() -> PRDeltaPropagationDUnitTest.checkForDelta());
+    Boolean deltaUsed2 = (Boolean)dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.checkForDelta());
     assertTrue("Delta Propagation Not Used in PR", (deltaUsed1 && deltaUsed2));
   }
 
@@ -172,12 +167,10 @@ public void testDeltaPropagationForPRFailover() throws Throwable {
     Integer port2 = (Integer)dataStore2.invoke(
         PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args);
     // Do puts after slowing the dispatcher.
-    dataStore1.invoke(ConflationDUnitTest.class, "setIsSlowStart",
-        new Object[] { "60000" });
-    dataStore2.invoke(ConflationDUnitTest.class, "setIsSlowStart",
-        new Object[] { "60000" });
+    dataStore1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" ));
+    dataStore2.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" ));
     createClientCache(port1,port2);
-    client1.invoke(PRDeltaPropagationDUnitTest.class,"createClientCache", new Object[] {port1,port2});
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache(port1,port2));
     
     int deltaSent = putsWhichReturnsDeltaSent();
     
@@ -192,12 +185,12 @@ public void testDeltaPropagationForPRFailover() throws Throwable {
       secondary = dataStore1;
     }
     
-    primary.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
+    primary.invoke(() -> PRDeltaPropagationDUnitTest.closeCache());
     Thread.sleep(5000);    
-    secondary.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+    secondary.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
     
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.checkDeltaInvoked(new Integer(deltaSent)));    
   }
 
   public void testDeltaPropagationForPRFailoverWithCompression() throws Throwable {
@@ -213,12 +206,10 @@ public void testDeltaPropagationForPRFailoverWithCompression() throws Throwable
       });
 
     // Do puts after slowing the dispatcher.    
-    dataStore1.invoke(ConflationDUnitTest.class, "setIsSlowStart",
-        new Object[] { "60000" });
-    dataStore2.invoke(ConflationDUnitTest.class, "setIsSlowStart",
-        new Object[] { "60000" });
+    dataStore1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" ));
+    dataStore2.invoke(() -> ConflationDUnitTest.setIsSlowStart( "60000" ));
     createClientCache(port1,port2);
-    client1.invoke(PRDeltaPropagationDUnitTest.class,"createClientCache", new Object[] {port1,port2});
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache(port1,port2));
     
     int deltaSent = putsWhichReturnsDeltaSent();
     
@@ -233,12 +224,12 @@ public void testDeltaPropagationForPRFailoverWithCompression() throws Throwable
       secondary = dataStore1;
     }
     
-    primary.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
+    primary.invoke(() -> PRDeltaPropagationDUnitTest.closeCache());
     Thread.sleep(5000);    
-    secondary.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+    secondary.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
     
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.checkDeltaInvoked(new Integer(deltaSent)));    
   }
   
   /**
@@ -249,8 +240,8 @@ public void testDeltaPropagationForPRWithExpiry() throws Throwable {
     createCacheInAllPRVms();
     createDeltaPR(Boolean.TRUE);
     putWithExpiry();
-    dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "checkForFullObject");
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "checkForFullObject");
+    dataStore1.invoke(() -> PRDeltaPropagationDUnitTest.checkForFullObject());
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.checkForFullObject());
   }
 
   /**
@@ -269,12 +260,11 @@ public void testDeltaPropagationPRAccessorAsBridgeServer() throws Throwable {
     Integer port1 = (Integer)dataStore1.invoke(
         PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
     createClientCache(port1, new Boolean(true), new Boolean(false), new Boolean(false));
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
-        new Object[] { port2, new Boolean(true), new Boolean(false), new Boolean(false)});    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache( port2, new Boolean(true), new Boolean(false), new Boolean(false)));    
     int deltaSent = putsWhichReturnsDeltaSent();
     
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.checkDeltaInvoked(new Integer(deltaSent)));    
   }
   
   /**
@@ -297,8 +287,7 @@ public void testDeltaPropagationPRAccessorAsBridgeServerWithDeltaException() thr
     Integer port1 = (Integer)dataStore1.invoke(
         PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
     createClientCache(port1, new Boolean(false), new Boolean(false),  new Boolean(false));
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
-        new Object[] { port2, new Boolean(true) , new Boolean(false), new Boolean(false)});    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache( port2, new Boolean(true) , new Boolean(false), new Boolean(false)));    
 
     // feed delta
     DeltaTestImpl test = new DeltaTestImpl();
@@ -308,7 +297,7 @@ public void testDeltaPropagationPRAccessorAsBridgeServerWithDeltaException() thr
     deltaPR.put(DELTA_KEY, test);
 
     // perform invalidate on accessor
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "invalidateDeltaKey");
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.invalidateDeltaKey());
     
     /*Thread.sleep(2000);*/
 
@@ -318,8 +307,8 @@ public void testDeltaPropagationPRAccessorAsBridgeServerWithDeltaException() thr
 
 /*    putWithExpiry();*/    
     deltaPR.put(LAST_KEY, "");    
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkForFullObject");    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.checkForFullObject());    
   }
   
   /**
@@ -343,8 +332,7 @@ public void testDeltaPropagationClientEmptyPRAccessorAsBridgeServerWithDeltaExce
     Integer port1 = (Integer)dataStore1.invoke(
         PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
     createClientCache(port1, new Boolean(false), new Boolean(true),  new Boolean(false));
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
-        new Object[] { port2, new Boolean(true), new Boolean(false), new Boolean(false)});
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache( port2, new Boolean(true), new Boolean(false), new Boolean(false)));
     
     // feed delta
     DeltaTestImpl test = new DeltaTestImpl();
@@ -354,7 +342,7 @@ public void testDeltaPropagationClientEmptyPRAccessorAsBridgeServerWithDeltaExce
     deltaPR.put(DELTA_KEY, test);
 
     // perform invalidate on accessor
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "invalidateDeltaKey");
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.invalidateDeltaKey());
 
     test = new DeltaTestImpl();
     test.setStr("DELTA");
@@ -364,8 +352,8 @@ public void testDeltaPropagationClientEmptyPRAccessorAsBridgeServerWithDeltaExce
     
     checkToDeltaCounter(new Integer(2));
     
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkForFullObject");
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.checkForFullObject());
     
   }
   
@@ -400,7 +388,7 @@ public void testDeltaPropagationReplicatedRegionPeerWithDeltaException() throws
     deltaPR.put(DELTA_KEY, test);
 
     // perform invalidate on accessor
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "invalidateDeltaKey");
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.invalidateDeltaKey());
 
     test = new DeltaTestImpl();
     test.setStr("DELTA");
@@ -408,12 +396,11 @@ public void testDeltaPropagationReplicatedRegionPeerWithDeltaException() throws
 
     deltaPR.put(LAST_KEY, "");
     
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());
     // check and reset isFailed flag
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "checkIsFailed");
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.checkIsFailed());
     
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "fromDeltaCounter",
-        new Object[] { new Integer(1) });
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.fromDeltaCounter( new Integer(1) ));
   }
   
   /**
@@ -437,18 +424,16 @@ public void testCqClientConnectAccessorAndDataStore()
         new Boolean(false));
     
     // enable CQ listner validation for this test for this client
-    client1.invoke(PRDeltaPropagationDUnitTest.class,
-        "setForOldNewCQVarification", new Object[] { new Boolean(true) });
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.setForOldNewCQVarification( new Boolean(true) ));
     
     // Not registering any interest but register cq server2
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
-        new Object[] { port2, new Boolean(false), new Boolean(false),
-            new Boolean(true) });
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache( port2, new Boolean(false), new Boolean(false),
+            new Boolean(true) ));
     
     // check cloning is disabled
-    dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "checkCloning");
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "checkCloning");
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkCloning");
+    dataStore1.invoke(() -> PRDeltaPropagationDUnitTest.checkCloning());
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.checkCloning());
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.checkCloning());
     checkCloning();
     
     // feed delta
@@ -461,18 +446,15 @@ public void testCqClientConnectAccessorAndDataStore()
     deltaPR.put(LAST_KEY, new DeltaTestImpl(5, ""));
     
     // wait for last key
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());
     // full object, server will send full object as only CQ are registered
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "fromDeltaCounter",
-        new Object[] { new Integer(0) });
-    boolean failed = ((Boolean)client1.invoke(
-        PRDeltaPropagationDUnitTest.class, "isFailed")).booleanValue();
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.fromDeltaCounter( new Integer(0) ));
+    boolean failed = ((Boolean)client1.invoke(() -> PRDeltaPropagationDUnitTest.isFailed())).booleanValue();
     // no cq events should get miss
     assertTrue("EVENT Missed", failed == true);
     
     // region size should be zero in second client as no registration happens
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkRegionSize",
-        new Object[] { new Integer(0)});
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.checkRegionSize( new Integer(0)));
   }
   
   /**
@@ -497,9 +479,8 @@ public void testClientOnAccessorReceivesCqEvents()
     createClientCache(port1, new Boolean(false), new Boolean(true),
         new Boolean(false));
     // no register interest but register cq
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
-        new Object[] { port1, new Boolean(false), new Boolean(false),
-            new Boolean(true) });
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache( port1, new Boolean(false), new Boolean(false),
+            new Boolean(true) ));
 
     // feed delta
     // This delta obj satisfies CQ
@@ -512,12 +493,10 @@ public void testClientOnAccessorReceivesCqEvents()
 
     deltaPR.put(LAST_KEY, new DeltaTestImpl(8,""));
 
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
-    boolean flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
-        "verifyQueryUpdateExecuted")).booleanValue();
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());
+    boolean flag = ((Boolean)client1.invoke(() -> PRDeltaPropagationDUnitTest.verifyQueryUpdateExecuted())).booleanValue();
     assertTrue("client update cq not executed properly", flag);
-    flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
-        "verifyQueryDestroyExecuted")).booleanValue();
+    flag = ((Boolean)client1.invoke(() -> PRDeltaPropagationDUnitTest.verifyQueryDestroyExecuted())).booleanValue();
     assertTrue("client destroy cq not executed properly", flag);        
   }
 
@@ -557,9 +536,8 @@ public void testCQClientOnRedundantBucketReceivesCQEvents()
         new Boolean(false));
     // client1 is attached to BridgeServer dataStore3
     // client1 does not registerInterest but registers cq
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
-        new Object[] { port3, new Boolean(false), new Boolean(false),
-            new Boolean(true) });
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache( port3, new Boolean(false), new Boolean(false),
+            new Boolean(true) ));
 
     // create delta keys (1 primary 1 redundant bucket on each dataStore)
     DeltaTestImpl test = new DeltaTestImpl(8, "");
@@ -570,15 +548,12 @@ public void testCQClientOnRedundantBucketReceivesCQEvents()
 
     deltaPR.put(LAST_KEY, new DeltaTestImpl(8, ""));
   
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());
     // verify no delta is sent by server to client1
-    dataStore3.invoke(PRDeltaPropagationDUnitTest.class, "verifyDeltaSent",
-        new Object[] { Integer.valueOf(1) });
-    boolean flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
-        "verifyQueryUpdateExecuted")).booleanValue();
+    dataStore3.invoke(() -> PRDeltaPropagationDUnitTest.verifyDeltaSent( Integer.valueOf(1) ));
+    boolean flag = ((Boolean)client1.invoke(() -> PRDeltaPropagationDUnitTest.verifyQueryUpdateExecuted())).booleanValue();
     assertTrue("client update cq not executed properly", flag);
-    flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
-        "verifyQueryDestroyExecuted")).booleanValue();
+    flag = ((Boolean)client1.invoke(() -> PRDeltaPropagationDUnitTest.verifyQueryDestroyExecuted())).booleanValue();
     assertTrue("client destroy cq not executed properly", flag);        
   }
 
@@ -619,9 +594,8 @@ public void testCQRIClientOnRedundantBucketReceivesDeltaAndCQEvents()
         new Boolean(false));
     // client1 is attached to BridgeServer dataStore3
     // client1 registers Interest as well as cq
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
-        new Object[] { port3, new Boolean(true), new Boolean(false),
-            new Boolean(true) });
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache( port3, new Boolean(true), new Boolean(false),
+            new Boolean(true) ));
 
     // create delta keys (1 primary 1 redundant bucket on each dataStore)
     DeltaTestImpl test = new DeltaTestImpl(8, "");
@@ -632,14 +606,11 @@ public void testCQRIClientOnRedundantBucketReceivesDeltaAndCQEvents()
   
     deltaPR.put(LAST_KEY, new DeltaTestImpl(8, ""));
   
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "fromDeltaCounter",
-        new Object[] { new Integer(1) });
-    boolean flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
-        "verifyQueryUpdateExecuted")).booleanValue();
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.fromDeltaCounter( new Integer(1) ));
+    boolean flag = ((Boolean)client1.invoke(() -> PRDeltaPropagationDUnitTest.verifyQueryUpdateExecuted())).booleanValue();
     assertTrue("client update cq not executed properly", flag);
-    flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
-        "verifyQueryDestroyExecuted")).booleanValue();
+    flag = ((Boolean)client1.invoke(() -> PRDeltaPropagationDUnitTest.verifyQueryDestroyExecuted())).booleanValue();
     assertTrue("client destroy cq not executed properly", flag);        
   }
 
@@ -660,12 +631,11 @@ public void testDeltaPropagationWithAdjunctMessaging() throws Throwable {
     Integer port1 = (Integer)dataStore1.invoke(
         PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
     createClientCache(port1, new Boolean(true), new Boolean(false), new Boolean(false));
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
-        new Object[] { port1, new Boolean(true), new Boolean(false), new Boolean(false)});    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache( port1, new Boolean(true), new Boolean(false), new Boolean(false)));    
     int deltaSent = putsWhichReturnsDeltaSent();
     
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.checkDeltaInvoked(new Integer(deltaSent)));    
   }
   
   /**
@@ -687,17 +657,15 @@ public void testDeltaPropagationWithAdjunctMessagingForEmptyClient() throws Thro
     //Empty data policy on client
     createClientCache(port1, new Boolean(true), new Boolean(true), new Boolean(false));
     
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
-        new Object[] { port1, new Boolean(true), new Boolean(false), new Boolean(false)});    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.createClientCache( port1, new Boolean(true), new Boolean(false), new Boolean(false)));    
     
     //Feed on an accessor
-    int deltaSent =  (Integer)dataStore1.invoke(
-        PRDeltaPropagationDUnitTest.class,"putsWhichReturnsDeltaSent");
+    int deltaSent =  (Integer)dataStore1.invoke(() -> PRDeltaPropagationDUnitTest.putsWhichReturnsDeltaSent());
     
     waitForLastKey();
     checkDeltaInvoked(new Integer(0));
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.waitForLastKey());    
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.checkDeltaInvoked(new Integer(deltaSent)));    
   }
   
   /**
@@ -721,18 +689,18 @@ public void testDeltaPropagationWithAdjunctMessagingAndBadDelta() throws Throwab
 
     PRDeltaTestImpl val1 = new PRDeltaTestImpl();
     val1.setIntVar(11);
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "put", new Object[]{val1});
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.put(val1));
 
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "setBadToDelta", new Object[]{true});
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.setBadToDelta(true));
     try {
       PRDeltaTestImpl val2 = new PRDeltaTestImpl();
       val2.setIntVar(22);
-      dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "put", new Object[]{val2});
+      dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.put(val2));
       fail("Did not expect successful delta put.");
     } catch (Exception e) {
       // expected
     }
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "checkVal", new Object[]{val1});
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.checkVal(val1));
   }
   
   public static void checkToDeltaCounter(Integer count) {
@@ -1023,8 +991,8 @@ public void afterCreate(EntryEvent event) {
 
   public static void createCacheInAllPRVms() {
     createCacheInVm();
-    dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "createCacheInVm");
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "createCacheInVm");
+    dataStore1.invoke(() -> PRDeltaPropagationDUnitTest.createCacheInVm());
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.createCacheInVm());
   }
 
   public static void put() throws Exception {
@@ -1145,10 +1113,10 @@ public static void resetAll() {
   @Override
   protected final void preTearDown() throws Exception {
     closeCache();
-    client1.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
-    dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
-    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
-    dataStore3.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
+    client1.invoke(() -> PRDeltaPropagationDUnitTest.closeCache());
+    dataStore1.invoke(() -> PRDeltaPropagationDUnitTest.closeCache());
+    dataStore2.invoke(() -> PRDeltaPropagationDUnitTest.closeCache());
+    dataStore3.invoke(() -> PRDeltaPropagationDUnitTest.closeCache());
   }
 
   public static void closeCache() {
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 9b8f28f24949..0ddb70d5a6c2 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -164,12 +164,8 @@ public void setUp() throws Exception {
     clientVM1 = host.getVM(2);
     clientVM2 = host.getVM(3);
 
-    PORT1 = ((Integer)serverVM0.invoke(CQListGIIDUnitTest.class,
-        "createServerCache",
-        new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue();
-    PORT2 = ((Integer)serverVM1.invoke(CQListGIIDUnitTest.class,
-        "createServerCache",
-        new Object[] { HARegionQueue.HA_EVICTION_POLICY_ENTRY })).intValue();
+    PORT1 = ((Integer)serverVM0.invoke(() -> CQListGIIDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue();
+    PORT2 = ((Integer)serverVM1.invoke(() -> CQListGIIDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_ENTRY ))).intValue();
   }
 
   /**
@@ -177,14 +173,14 @@ public void setUp() throws Exception {
    */
   @Override
   protected final void preTearDown() throws Exception {
-    serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
-    serverVM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+    serverVM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
+    serverVM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
     closeCache();
-    clientVM1.invoke(CQListGIIDUnitTest.class, "closeCache");
-    clientVM2.invoke(CQListGIIDUnitTest.class, "closeCache");
+    clientVM1.invoke(() -> CQListGIIDUnitTest.closeCache());
+    clientVM2.invoke(() -> CQListGIIDUnitTest.closeCache());
     // then close the servers
-    serverVM0.invoke(CQListGIIDUnitTest.class, "closeCache");
-    serverVM1.invoke(CQListGIIDUnitTest.class, "closeCache");
+    serverVM0.invoke(() -> CQListGIIDUnitTest.closeCache());
+    serverVM1.invoke(() -> CQListGIIDUnitTest.closeCache());
     disconnectAllFromDS();
   }
 
@@ -610,40 +606,36 @@ public static void putEntries(String rName, Integer num) {
   public void _testSpecificClientCQIsGIIedPart1() throws Exception {
     Integer size = Integer.valueOf(10);
     // slow start for dispatcher
-    serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart",
-        new Object[] { "30000" });
-    serverVM1.invoke(ConflationDUnitTest.class, "setIsSlowStart",
-        new Object[] { "30000" });
+    serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" ));
+    serverVM1.invoke(() -> ConflationDUnitTest.setIsSlowStart( "30000" ));
 
     // createClientCache(Integer.valueOf(PORT1), Integer.valueOf(PORT2), "1");
-    clientVM1.invoke(CQListGIIDUnitTest.class, "createClientCache",
-        new Object[] { Integer.valueOf(PORT1), Integer.valueOf(PORT2), "1" });
-    clientVM2.invoke(CQListGIIDUnitTest.class, "createClientCache",
-        new Object[] { Integer.valueOf(PORT1), Integer.valueOf(PORT2), "0" });
-
-    clientVM1.invoke(CQListGIIDUnitTest.class, "createCQ", new Object[] {
-        "testSpecificClientCQIsGIIed_0", cqs[0] });
-    clientVM1.invoke(CQListGIIDUnitTest.class, "executeCQ", new Object[] {
-        "testSpecificClientCQIsGIIed_0", Boolean.FALSE });
-    clientVM2.invoke(CQListGIIDUnitTest.class, "createCQ", new Object[] {
-        "testSpecificClientCQIsGIIed_0", cqs[0] });
-    clientVM2.invoke(CQListGIIDUnitTest.class, "executeCQ", new Object[] {
-        "testSpecificClientCQIsGIIed_0", Boolean.FALSE });
-
-    serverVM1.invoke(CQListGIIDUnitTest.class, "stopServer");
-
-    serverVM0.invoke(CQListGIIDUnitTest.class, "putEntries", new Object[] {
-        regions[0], size });
-
-    serverVM1.invoke(CQListGIIDUnitTest.class, "startServer");
+    clientVM1.invoke(() -> CQListGIIDUnitTest.createClientCache( Integer.valueOf(PORT1), Integer.valueOf(PORT2), "1" ));
+    clientVM2.invoke(() -> CQListGIIDUnitTest.createClientCache( Integer.valueOf(PORT1), Integer.valueOf(PORT2), "0" ));
+
+    clientVM1.invoke(() -> CQListGIIDUnitTest.createCQ(
+        "testSpecificClientCQIsGIIed_0", cqs[0] ));
+    clientVM1.invoke(() -> CQListGIIDUnitTest.executeCQ(
+        "testSpecificClientCQIsGIIed_0", Boolean.FALSE ));
+    clientVM2.invoke(() -> CQListGIIDUnitTest.createCQ(
+        "testSpecificClientCQIsGIIed_0", cqs[0] ));
+    clientVM2.invoke(() -> CQListGIIDUnitTest.executeCQ(
+        "testSpecificClientCQIsGIIed_0", Boolean.FALSE ));
+
+    serverVM1.invoke(() -> CQListGIIDUnitTest.stopServer());
+
+    serverVM0.invoke(() -> CQListGIIDUnitTest.putEntries(
+        regions[0], size ));
+
+    serverVM1.invoke(() -> CQListGIIDUnitTest.startServer());
     Thread.sleep(3000); // TODO: Find a better 'n reliable alternative
 
-    serverVM0.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
-        size, Integer.valueOf(2) });
-    serverVM1.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
-        size, Integer.valueOf(1) });
-    serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
-    serverVM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+    serverVM0.invoke(() -> CQListGIIDUnitTest.VerifyCUMCQList(
+        size, Integer.valueOf(2) ));
+    serverVM1.invoke(() -> CQListGIIDUnitTest.VerifyCUMCQList(
+        size, Integer.valueOf(1) ));
+    serverVM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
+    serverVM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
   }
 
   /**
@@ -657,44 +649,40 @@ public void testClientCQNotLostAtGIIReceiver() throws Exception {
     Integer size = Integer.valueOf(10);
     VM serverVM2 = clientVM2;
 
-    int port3 = ((Integer)serverVM2.invoke(CQListGIIDUnitTest.class,
-        "createServerCache",
-        new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue();
+    int port3 = ((Integer)serverVM2.invoke(() -> CQListGIIDUnitTest.createServerCache( HARegionQueue.HA_EVICTION_POLICY_MEMORY ))).intValue();
 
     // slow start for dispatcher
-    serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart",
-        new Object[] { "45000" });
+    serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart( "45000" ));
 
     // createClientCache(Integer.valueOf(PORT1), Integer.valueOf(PORT2), "1");
     createClientCache(Integer.valueOf(PORT1), Integer.valueOf(PORT2),
         Integer.valueOf(port3), "1");
     try {
-    clientVM1.invoke(CQListGIIDUnitTest.class, "createClientCache",
-        new Object[] { Integer.valueOf(PORT1), Integer.valueOf(port3),
-            Integer.valueOf(PORT2), "1" });
+    clientVM1.invoke(() -> CQListGIIDUnitTest.createClientCache( Integer.valueOf(PORT1), Integer.valueOf(port3),
+            Integer.valueOf(PORT2), "1" ));
     try {
     createCQ("testSpecificClientCQIsGIIed_0", cqs[0]);
     executeCQ("testSpecificClientCQIsGIIed_0", Boolean.FALSE);
-    clientVM1.invoke(CQListGIIDUnitTest.class, "createCQ", new Object[] {
-        "testSpecificClientCQIsGIIed_0", cqs[0] });
-    clientVM1.invoke(CQListGIIDUnitTest.class, "executeCQ", new Object[] {
-        "testSpecificClientCQIsGIIed_0", Boolean.FALSE });
+    clientVM1.invoke(() -> CQListGIIDUnitTest.createCQ(
+        "testSpecificClientCQIsGIIed_0", cqs[0] ));
+    clientVM1.invoke(() -> CQListGIIDUnitTest.executeCQ(
+        "testSpecificClientCQIsGIIed_0", Boolean.FALSE ));
 
-    serverVM0.invoke(CQListGIIDUnitTest.class, "putEntries", new Object[] {
-        regions[0], size });
+    serverVM0.invoke(() -> CQListGIIDUnitTest.putEntries(
+        regions[0], size ));
 
-    serverVM1.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
-        size, Integer.valueOf(1) });
+    serverVM1.invoke(() -> CQListGIIDUnitTest.VerifyCUMCQList(
+        size, Integer.valueOf(1) ));
 
-    serverVM2.invoke(CQListGIIDUnitTest.class, "stopServer");
+    serverVM2.invoke(() -> CQListGIIDUnitTest.stopServer());
     Thread.sleep(3000); // TODO: Find a better 'n reliable alternative
 
-    serverVM0.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
-      size, Integer.valueOf(2) });
-    serverVM1.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
-        size, Integer.valueOf(2) });
+    serverVM0.invoke(() -> CQListGIIDUnitTest.VerifyCUMCQList(
+      size, Integer.valueOf(2) ));
+    serverVM1.invoke(() -> CQListGIIDUnitTest.VerifyCUMCQList(
+        size, Integer.valueOf(2) ));
     } finally {
-      clientVM1.invoke(CQListGIIDUnitTest.class, "destroyClientPool");
+      clientVM1.invoke(() -> CQListGIIDUnitTest.destroyClientPool());
     }
 
     } finally {
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index 8920afb9acdf..5b10d3dfac92 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -135,38 +135,34 @@ public void setUp() throws Exception
     // client 2 VM
     client2 = host.getVM(3);
 
-    PORT1 = ((Integer)server1.invoke(HADispatcherDUnitTest.class,
-        "createServerCache", new Object[] { new Boolean(false) })).intValue();
-    server1.invoke(ConflationDUnitTest.class, "setIsSlowStart");
-    server1.invoke(HADispatcherDUnitTest.class, "makeDispatcherSlow");
-    server1.invoke(HADispatcherDUnitTest.class, "setQRMslow");
-    PORT2 = ((Integer)server2.invoke(HADispatcherDUnitTest.class,
-        "createServerCache", new Object[] { new Boolean(true) })).intValue();
-
-    client1.invoke( CacheServerTestUtil.class, "disableShufflingOfEndpoints");
-    client2.invoke( CacheServerTestUtil.class, "disableShufflingOfEndpoints");
-    client1.invoke(HADispatcherDUnitTest.class, "createClientCache",
-        new Object[] {
+    PORT1 = ((Integer)server1.invoke(() -> HADispatcherDUnitTest.createServerCache( new Boolean(false) ))).intValue();
+    server1.invoke(() -> ConflationDUnitTest.setIsSlowStart());
+    server1.invoke(() -> HADispatcherDUnitTest.makeDispatcherSlow());
+    server1.invoke(() -> HADispatcherDUnitTest.setQRMslow());
+    PORT2 = ((Integer)server2.invoke(() -> HADispatcherDUnitTest.createServerCache( new Boolean(true) ))).intValue();
+
+    client1.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
+    client2.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
+    client1.invoke(() -> HADispatcherDUnitTest.createClientCache(
             NetworkUtils.getServerHostName(Host.getHost(0)),
             new Integer(PORT1), new Integer(PORT2),
-            new Boolean(false) });
-    client2.invoke(HADispatcherDUnitTest.class, "createClientCache",
-        new Object[] {
+            new Boolean(false) ));
+    client2.invoke(() -> HADispatcherDUnitTest.createClientCache(
             NetworkUtils.getServerHostName(Host.getHost(0)),
             new Integer(PORT1), new Integer(PORT2),
-            new Boolean(true) });
+            new Boolean(true) ));
     //createClientCache(new Integer(PORT1), new Integer(PORT2), new Boolean(true) );
 
   }
 
   @Override
   protected final void preTearDown() throws Exception {
-    client1.invoke(HADispatcherDUnitTest.class, "closeCache");
-    client2.invoke(HADispatcherDUnitTest.class, "closeCache");
+    client1.invoke(() -> HADispatcherDUnitTest.closeCache());
+    client2.invoke(() -> HADispatcherDUnitTest.closeCache());
     // close server
-    server1.invoke(HADispatcherDUnitTest.class, "resetQRMslow");
-    server1.invoke(HADispatcherDUnitTest.class, "closeCache");
-    server2.invoke(HADispatcherDUnitTest.class, "closeCache");
+    server1.invoke(() -> HADispatcherDUnitTest.resetQRMslow());
+    server1.invoke(() -> HADispatcherDUnitTest.closeCache());
+    server2.invoke(() -> HADispatcherDUnitTest.closeCache());
   }
 
   public static void closeCache()
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index 0449a78e57ea..0e589e463208 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -137,16 +137,16 @@ public void setUp() throws Exception {
   protected final void preTearDown() throws Exception {
     // reset all flags
     DeltaTestImpl.resetDeltaInvokationCounters();
-    server.invoke(DeltaTestImpl.class, "resetDeltaInvokationCounters");
-    server2.invoke(DeltaTestImpl.class, "resetDeltaInvokationCounters");
-    client.invoke(DeltaTestImpl.class, "resetDeltaInvokationCounters");
-    client2.invoke(DeltaTestImpl.class, "resetDeltaInvokationCounters");
+    server.invoke(() -> DeltaTestImpl.resetDeltaInvokationCounters());
+    server2.invoke(() -> DeltaTestImpl.resetDeltaInvokationCounters());
+    client.invoke(() -> DeltaTestImpl.resetDeltaInvokationCounters());
+    client2.invoke(() -> DeltaTestImpl.resetDeltaInvokationCounters());
     // close the clients first
-    client.invoke(ClientToServerDeltaDUnitTest.class, "closeCache");
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "closeCache");
+    client.invoke(() -> ClientToServerDeltaDUnitTest.closeCache());
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.closeCache());
     // then close the servers
-    server.invoke(ClientToServerDeltaDUnitTest.class, "closeCache");
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "closeCache");
+    server.invoke(() -> ClientToServerDeltaDUnitTest.closeCache());
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.closeCache());
   }
   
   public void initialise(Boolean cq) {
@@ -155,40 +155,30 @@ public void initialise(Boolean cq) {
   }
 
   public void initialise(Boolean clone, String[] queries, Boolean cq, Boolean RI, Boolean enableDelta) {
-    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "createServerCache",
-        new Object[] { Boolean.TRUE, Boolean.FALSE, clone, enableDelta })).intValue();
+    Integer PORT1 = ((Integer)server.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.TRUE, Boolean.FALSE, clone, enableDelta ))).intValue();
 
-    Integer PORT2 = ((Integer)server2.invoke(
-        ClientToServerDeltaDUnitTest.class, "createServerCache", new Object[] {
-            Boolean.TRUE, Boolean.FALSE, clone, enableDelta })).intValue();
+    Integer PORT2 = ((Integer)server2.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache(
+            Boolean.TRUE, Boolean.FALSE, clone, enableDelta ))).intValue();
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
-        new Object[] { NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
-            Boolean.FALSE, Boolean.FALSE, Boolean.FALSE });
+    client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.FALSE, Boolean.FALSE ));
 
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
-        new Object[] { NetworkUtils.getServerHostName(server2.getHost()),
-            new Integer(PORT2), Boolean.TRUE, Boolean.FALSE, cq, queries, RI });
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( NetworkUtils.getServerHostName(server2.getHost()),
+            new Integer(PORT2), Boolean.TRUE, Boolean.FALSE, cq, queries, RI ));
   }
 
   // Same as initialise() except listener flag is false.
   public void initialise2(Boolean clone, String[] queries, Boolean cq, Boolean RI, Boolean enableDelta) {
-    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "createServerCache",
-        new Object[] { Boolean.FALSE, Boolean.FALSE, clone, enableDelta })).intValue();
+    Integer PORT1 = ((Integer)server.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.FALSE, Boolean.FALSE, clone, enableDelta ))).intValue();
 
-    Integer PORT2 = ((Integer)server2.invoke(
-        ClientToServerDeltaDUnitTest.class, "createServerCache", new Object[] {
-            Boolean.FALSE, Boolean.FALSE, clone, enableDelta })).intValue();
+    Integer PORT2 = ((Integer)server2.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache(
+            Boolean.FALSE, Boolean.FALSE, clone, enableDelta ))).intValue();
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
-        new Object[] { NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
-            Boolean.FALSE, Boolean.FALSE, Boolean.FALSE });
+    client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.FALSE, Boolean.FALSE ));
 
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
-        new Object[] { NetworkUtils.getServerHostName(server2.getHost()),
-            new Integer(PORT2), Boolean.TRUE, Boolean.FALSE, cq, queries, RI });
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( NetworkUtils.getServerHostName(server2.getHost()),
+            new Integer(PORT2), Boolean.TRUE, Boolean.FALSE, cq, queries, RI ));
   }
 
   /**
@@ -199,23 +189,19 @@ public void initialise2(Boolean clone, String[] queries, Boolean cq, Boolean RI,
   public void testSendingofFullDeltaObjectsWhenFromDeltaFails() {
     initialise(false);
     // set expected value on server
-    server.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
-        new Object[] { putDelta[1], (Integer)putDelta[2] });
-    client.invoke(ClientToServerDeltaDUnitTest.class, "putWithFromDeltaERR",
-        new Object[] { KEY1 });
+    server.invoke(() -> ClientToServerDeltaDUnitTest.setFirstSecondUpdate( putDelta[1], (Integer)putDelta[2] ));
+    client.invoke(() -> ClientToServerDeltaDUnitTest.putWithFromDeltaERR( KEY1 ));
 
     assertTrue("to Delta Propagation feature NOT used.", ((Boolean)client
-        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+        .invoke(() -> DeltaTestImpl.toDeltaFeatureUsed())).booleanValue());
     assertTrue("from Delta Propagation feature NOT used.", ((Boolean)server
-        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
+        .invoke(() -> DeltaTestImpl.fromDeltaFeatureUsed())).booleanValue());
 
-    assertFalse("Delta Propagation toDeltaFailed", ((Boolean)client.invoke(
-        DeltaTestImpl.class, "isToDeltaFailure")).booleanValue());
+    assertFalse("Delta Propagation toDeltaFailed", ((Boolean)client.invoke(() -> DeltaTestImpl.isToDeltaFailure())).booleanValue());
     assertTrue("Delta Propagation fromDelta not Failed", ((Boolean)server
-        .invoke(DeltaTestImpl.class, "isFromDeltaFailure")).booleanValue());
+        .invoke(() -> DeltaTestImpl.isFromDeltaFailure())).booleanValue());
 
-    boolean err = ((Boolean)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "getError")).booleanValue();
+    boolean err = ((Boolean)server.invoke(() -> ClientToServerDeltaDUnitTest.getError())).booleanValue();
     assertFalse("validation fails", err);
   }
 
@@ -226,22 +212,17 @@ public void testSendingofFullDeltaObjectsWhenFromDeltaFails() {
   public void testPutForDeltaObjects() {
     initialise(false);
     // set expected value on server
-    server.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
-        new Object[] { putDelta[0], (Integer)putDelta[2] });
+    server.invoke(() -> ClientToServerDeltaDUnitTest.setFirstSecondUpdate( putDelta[0], (Integer)putDelta[2] ));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "put",
-        new Object[] { KEY1 });
+    client.invoke(() -> ClientToServerDeltaDUnitTest.put( KEY1 ));
 
     assertTrue("to Delta Propagation feature NOT used.", ((Boolean)client
-        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+        .invoke(() -> DeltaTestImpl.toDeltaFeatureUsed())).booleanValue());
     assertTrue("from Delta Propagation feature NOT used.", ((Boolean)server
-        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
-    assertFalse("Delta Propagation toDeltaFailed", ((Boolean)client.invoke(
-        DeltaTestImpl.class, "isToDeltaFailure")).booleanValue());
-    assertFalse("Delta Propagation fromDeltaFailed", ((Boolean)server.invoke(
-        DeltaTestImpl.class, "isFromDeltaFailure")).booleanValue());
-    boolean err = ((Boolean)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "getError")).booleanValue();
+        .invoke(() -> DeltaTestImpl.fromDeltaFeatureUsed())).booleanValue());
+    assertFalse("Delta Propagation toDeltaFailed", ((Boolean)client.invoke(() -> DeltaTestImpl.isToDeltaFailure())).booleanValue());
+    assertFalse("Delta Propagation fromDeltaFailed", ((Boolean)server.invoke(() -> DeltaTestImpl.isFromDeltaFailure())).booleanValue());
+    boolean err = ((Boolean)server.invoke(() -> ClientToServerDeltaDUnitTest.getError())).booleanValue();
     assertFalse("validation fails", err);
   }
 
@@ -252,39 +233,32 @@ public void testPutForDeltaObjects() {
   public void testClientToClientDeltaPropagation() throws Exception {
     initialise(false);
     // set expected value on s1,s1 and c2
-    server.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
-        new Object[] { putDelta[0], (Integer)putDelta[2] });
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
-        new Object[] { putDelta[0], (Integer)putDelta[2] });
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
-        new Object[] { putDelta[0], (Integer)putDelta[2] });
+    server.invoke(() -> ClientToServerDeltaDUnitTest.setFirstSecondUpdate( putDelta[0], (Integer)putDelta[2] ));
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.setFirstSecondUpdate( putDelta[0], (Integer)putDelta[2] ));
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.setFirstSecondUpdate( putDelta[0], (Integer)putDelta[2] ));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
-        new Object[] { KEY1 });
+    client.invoke(() -> ClientToServerDeltaDUnitTest.putDelta( KEY1 ));
 
     Thread.sleep(5000);
 
     assertTrue("To Delta Propagation feature NOT used.", ((Boolean)client
-        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+        .invoke(() -> DeltaTestImpl.toDeltaFeatureUsed())).booleanValue());
     assertTrue("From Delta Propagation feature NOT used.", ((Boolean)server
-        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
+        .invoke(() -> DeltaTestImpl.fromDeltaFeatureUsed())).booleanValue());
     // toDelta() should not be invoked
     assertFalse("To Delta Propagation feature used.", ((Boolean)server
-        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+        .invoke(() -> DeltaTestImpl.toDeltaFeatureUsed())).booleanValue());
     assertTrue("From Delta Propagation feature NOT used.", ((Boolean)server2
-        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
+        .invoke(() -> DeltaTestImpl.fromDeltaFeatureUsed())).booleanValue());
     // toDelta() should not be invoked
     assertFalse("To Delta Propagation feature used.", ((Boolean)server2
-        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+        .invoke(() -> DeltaTestImpl.toDeltaFeatureUsed())).booleanValue());
     assertTrue("from Delta Propagation feature NOT used.", ((Boolean)client2
-        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
-
-    boolean err = ((Boolean)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "getError")).booleanValue();
-    err = ((Boolean)server2.invoke(ClientToServerDeltaDUnitTest.class,
-        "getError")).booleanValue();
-    err = ((Boolean)client2.invoke(ClientToServerDeltaDUnitTest.class,
-        "getError")).booleanValue();
+        .invoke(() -> DeltaTestImpl.fromDeltaFeatureUsed())).booleanValue());
+
+    boolean err = ((Boolean)server.invoke(() -> ClientToServerDeltaDUnitTest.getError())).booleanValue();
+    err = ((Boolean)server2.invoke(() -> ClientToServerDeltaDUnitTest.getError())).booleanValue();
+    err = ((Boolean)client2.invoke(() -> ClientToServerDeltaDUnitTest.getError())).booleanValue();
     assertFalse("validation fails", err);
   }
 
@@ -708,31 +682,23 @@ public static void closeCache() {
    * 1)Verifies that cacheless client calls toDelta 

    */
   public void testEmptyClientAsFeederToServer() {
-    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "createServerCache", new Object[] { Boolean.FALSE,
-            Boolean.FALSE })).intValue();
-
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "createServerCache",
-        new Object[] { Boolean.FALSE, Boolean.FALSE });
-
-    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
-        new Object[] { NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
-            Boolean.FALSE, Boolean.TRUE, Boolean.FALSE });
-
-/*    server2.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
-        new Object[] { putDelta[0], (Integer)putDelta[2] });*/
-
-    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
-        new Object[] { KEY1 });
-
-    client.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
-        new Object[] { new Integer(2)});
-    server.invoke(ClientToServerDeltaDUnitTest.class, "checkFromdeltaCounter");
-    server.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
-        new Object[] { new Integer(0)});
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkFromdeltaCounter");
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
-        new Object[] { new Integer(0)});
+    Integer PORT1 = ((Integer)server.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.FALSE,
+            Boolean.FALSE ))).intValue();
+
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.FALSE, Boolean.FALSE ));
+
+    client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.TRUE, Boolean.FALSE ));
+
+/*    server2.invoke(() -> ClientToServerDeltaDUnitTest.setFirstSecondUpdate( putDelta[0], (Integer)putDelta[2] ));*/
+
+    client.invoke(() -> ClientToServerDeltaDUnitTest.putDelta( KEY1 ));
+
+    client.invoke(() -> ClientToServerDeltaDUnitTest.checkTodeltaCounter( new Integer(2)));
+    server.invoke(() -> ClientToServerDeltaDUnitTest.checkFromdeltaCounter());
+    server.invoke(() -> ClientToServerDeltaDUnitTest.checkTodeltaCounter( new Integer(0)));
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.checkFromdeltaCounter());
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.checkTodeltaCounter( new Integer(0)));
   }
 
   /**
@@ -741,28 +707,22 @@ public void testEmptyClientAsFeederToServer() {
    * policy just by passed delta to data store

    */
   public void testEmptyServerAsFeederToPeer() {
-    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "createServerCache", new Object[] { Boolean.FALSE,
-            Boolean.TRUE })).intValue();
+    Integer PORT1 = ((Integer)server.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.FALSE,
+            Boolean.TRUE ))).intValue();
 
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "createServerCache",
-        new Object[] { Boolean.FALSE, Boolean.FALSE });
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.FALSE, Boolean.FALSE ));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
-        new Object[] { NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
-            Boolean.FALSE, Boolean.TRUE, Boolean.FALSE });
+    client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.TRUE, Boolean.FALSE ));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
-        new Object[] { KEY1 });
+    client.invoke(() -> ClientToServerDeltaDUnitTest.putDelta( KEY1 ));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
-        new Object[] { new Integer(2)});
+    client.invoke(() -> ClientToServerDeltaDUnitTest.checkTodeltaCounter( new Integer(2)));
     
-    server.invoke(ClientToServerDeltaDUnitTest.class, "checkDeltaFeatureNotUsed");
+    server.invoke(() -> ClientToServerDeltaDUnitTest.checkDeltaFeatureNotUsed());
     
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
-        new Object[] { new Integer(0)});
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkFromdeltaCounter");
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.checkTodeltaCounter( new Integer(0)));
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.checkFromdeltaCounter());
     
   }
   
@@ -773,29 +733,24 @@ public void testEmptyServerAsFeederToPeer() {
    * 
    */
   public void testClientsConnectedToEmptyServer() {
-    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "createServerCache", new Object[] { Boolean.FALSE,
-            Boolean.TRUE })).intValue();
+    Integer PORT1 = ((Integer)server.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.FALSE,
+            Boolean.TRUE ))).intValue();
 
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "createServerCache",
-        new Object[] { Boolean.FALSE, Boolean.FALSE });
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.FALSE, Boolean.FALSE ));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
-        new Object[] { NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
-            Boolean.TRUE, Boolean.TRUE, Boolean.FALSE });
+    client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.TRUE, Boolean.TRUE, Boolean.FALSE ));
 
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
-        new Object[] { NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
-            Boolean.TRUE, Boolean.FALSE, Boolean.FALSE });
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.TRUE, Boolean.FALSE, Boolean.FALSE ));
     
-    int deltaSent =  (Integer)server2.invoke(
-        ClientToServerDeltaDUnitTest.class,"putsWhichReturnsDeltaSent");
+    int deltaSent =  (Integer)server2.invoke(() -> ClientToServerDeltaDUnitTest.putsWhichReturnsDeltaSent());
     
-    client.invoke(ClientToServerDeltaDUnitTest.class, "waitForLastKey");    
-    client.invoke(ClientToServerDeltaDUnitTest.class, "checkForDelta");
+    client.invoke(() -> ClientToServerDeltaDUnitTest.waitForLastKey());    
+    client.invoke(() -> ClientToServerDeltaDUnitTest.checkForDelta());
     
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "waitForLastKey");    
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.waitForLastKey());    
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.checkDeltaInvoked(new Integer(deltaSent)));
     
   }
   
@@ -804,28 +759,22 @@ public void testClientsConnectedToEmptyServer() {
    * 1)Verifies that To delta called on client should be equal to fromDeltaCounter on datastore 

    */
   public void testClientNonEmptyEmptyServerAsFeederToPeer() {
-    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "createServerCache", new Object[] { Boolean.FALSE,
-            Boolean.TRUE })).intValue();
+    Integer PORT1 = ((Integer)server.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.FALSE,
+            Boolean.TRUE ))).intValue();
 
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "createServerCache",
-        new Object[] { Boolean.FALSE, Boolean.FALSE });
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache( Boolean.FALSE, Boolean.FALSE ));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
-        new Object[] { NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
-            Boolean.FALSE, Boolean.FALSE, Boolean.FALSE});
+    client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.FALSE, Boolean.FALSE));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
-        new Object[] { KEY1 });
+    client.invoke(() -> ClientToServerDeltaDUnitTest.putDelta( KEY1 ));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
-        new Object[] { new Integer(2)});
+    client.invoke(() -> ClientToServerDeltaDUnitTest.checkTodeltaCounter( new Integer(2)));
     
-    server.invoke(ClientToServerDeltaDUnitTest.class, "checkDeltaFeatureNotUsed");
+    server.invoke(() -> ClientToServerDeltaDUnitTest.checkDeltaFeatureNotUsed());
     
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
-        new Object[] { new Integer(0)});
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkFromdeltaCounter");
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.checkTodeltaCounter( new Integer(0)));
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.checkFromdeltaCounter());
     
   }
 
@@ -849,10 +798,10 @@ public void testC2CDeltaPropagationWithCQ() throws Exception {
         new Object[] { KEY1, new Integer(1), new Integer[] { 1 },
             new Boolean[] { false, true, false, false } });
     
-    client.invoke(ClientToServerDeltaDUnitTest.class, "putLastKeyWithDelta");
+    client.invoke(() -> ClientToServerDeltaDUnitTest.putLastKeyWithDelta());
     
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "waitForLastKey");
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "verifyDeltaReceived");    
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.waitForLastKey());
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.verifyDeltaReceived());    
   }
 
   /**
@@ -873,49 +822,44 @@ public void testC2CDeltaPropagationWithCQWithoutRI() throws Exception {
         new Object[] { KEY1, new Integer(1), new Integer[] { 1 },
             new Boolean[] { false, true, false, false } });
     
-    client.invoke(ClientToServerDeltaDUnitTest.class, "putLastKeyWithDelta");
+    client.invoke(() -> ClientToServerDeltaDUnitTest.putLastKeyWithDelta());
     
-    client2.invoke(ClientToServerDeltaDUnitTest.class, "waitForLastKey");
-    server2.invoke(ClientToServerDeltaDUnitTest.class, "verifyDeltaSent",
-        new Object[] { Integer.valueOf(1) });
+    client2.invoke(() -> ClientToServerDeltaDUnitTest.waitForLastKey());
+    server2.invoke(() -> ClientToServerDeltaDUnitTest.verifyDeltaSent( Integer.valueOf(1) ));
   }
 
   public void testClientSendsFullValueToServerWhenDeltaOffAtServer() {
     initialise2(false/* clone */, new String[] { CQs[1] }, false/* CQ */,
         true/* RI */, false/* enable delta */);
     // set expected value on server
-    server.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
-        new Object[] { putDelta[0], (Integer)putDelta[2] });
+    server.invoke(() -> ClientToServerDeltaDUnitTest.setFirstSecondUpdate( putDelta[0], (Integer)putDelta[2] ));
 
-    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
-        new Object[] { DELTA_KEY });
+    client.invoke(() -> ClientToServerDeltaDUnitTest.putDelta( DELTA_KEY ));
 
     assertFalse("Delta Propagation feature used at client.", (Boolean)client
-        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed"));
+        .invoke(() -> DeltaTestImpl.toDeltaFeatureUsed()));
     assertFalse("Delta Propagation feature used at server.", (Boolean)server
-        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed"));
+        .invoke(() -> DeltaTestImpl.fromDeltaFeatureUsed()));
     assertFalse(
         "Failures at client while calculating delta. But delta-propagation is false at server.",
-        ((Boolean)client.invoke(DeltaTestImpl.class, "isToDeltaFailure"))
+        ((Boolean)client.invoke(() -> DeltaTestImpl.isToDeltaFailure()))
             .booleanValue());
     assertFalse(
         "Failures at server while applying delta. But delta-propagation is false at server.",
-        (Boolean)server.invoke(DeltaTestImpl.class, "isFromDeltaFailure"));
+        (Boolean)server.invoke(() -> DeltaTestImpl.isFromDeltaFailure()));
   }
 
   public void testC2SDeltaPropagationWithOldValueInvalidatedAtServer()
       throws Exception {
     String key = "DELTA_KEY";
-    Integer port1 = (Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
-        "createServerCache", new Object[] {false, false, false, true});
+    Integer port1 = (Integer)server.invoke(() -> ClientToServerDeltaDUnitTest.createServerCache(false, false, false, true));
     createClientCache("localhost", port1, false, false, false, null, false,
         false);
 
     LocalRegion region = (LocalRegion)cache.getRegion(REGION_NAME);
     region.put(key, new DeltaTestImpl());
 
-    server.invoke(ClientToServerDeltaDUnitTest.class, "doInvalidate",
-        new Object[] {key});
+    server.invoke(() -> ClientToServerDeltaDUnitTest.doInvalidate(key));
     DeltaTestImpl value = new DeltaTestImpl();
     value.setStr("UPDATED_VALUE");
     region.put(key, value);
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index 809507920aff..7316e0c067b9 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -106,10 +106,10 @@ public void setUp() throws Exception {
 
   @Override
   protected final void preTearDown() throws Exception {
-    server1.invoke(DeltaPropagationWithCQDUnitTest.class, "close");
-    server2.invoke(DeltaPropagationWithCQDUnitTest.class, "close");
-    client1.invoke(DeltaPropagationWithCQDUnitTest.class, "close");
-    client2.invoke(DeltaPropagationWithCQDUnitTest.class, "close");
+    server1.invoke(() -> DeltaPropagationWithCQDUnitTest.close());
+    server2.invoke(() -> DeltaPropagationWithCQDUnitTest.close());
+    client1.invoke(() -> DeltaPropagationWithCQDUnitTest.close());
+    client2.invoke(() -> DeltaPropagationWithCQDUnitTest.close());
     close();
   }
   
@@ -124,22 +124,20 @@ public static void close() throws Exception {
 
   public void testCqWithRI() throws Exception {
     // 1. setup a cache server
-    int port = (Integer)server1.invoke(DeltaPropagationWithCQDUnitTest.class,
-        "createCacheServer");
+    int port = (Integer)server1.invoke(() -> DeltaPropagationWithCQDUnitTest.createCacheServer());
     // 2. setup a client
     client1
-        .invoke(DeltaPropagationWithCQDUnitTest.class, "createClientCache",
-            new Object[] {NetworkUtils.getServerHostName(server1.getHost()), port,
-                Boolean.TRUE});
+        .invoke(() -> DeltaPropagationWithCQDUnitTest.createClientCache(NetworkUtils.getServerHostName(server1.getHost()), port,
+                Boolean.TRUE));
     // 3. setup another client with cqs and interest in all keys.
     createClientCache(NetworkUtils.getServerHostName(server1.getHost()), port, true);
     registerCQs(1, "CQWithInterestDUnitTest_cq");
     // 4. put a key on client1
-    client1.invoke(DeltaPropagationWithCQDUnitTest.class, "doPut", new Object[] {
-        "SAMPLE_KEY", "SAMPLE_VALUE"});
+    client1.invoke(() -> DeltaPropagationWithCQDUnitTest.doPut(
+        "SAMPLE_KEY", "SAMPLE_VALUE"));
     // 5. update the key with new value, on client1
-    client1.invoke(DeltaPropagationWithCQDUnitTest.class, "doPut", new Object[] {
-        "SAMPLE_KEY", "NEW_VALUE"});
+    client1.invoke(() -> DeltaPropagationWithCQDUnitTest.doPut(
+        "SAMPLE_KEY", "NEW_VALUE"));
     // 6. Wait for some time
     WaitCriterion wc = new WaitCriterion() {
       public boolean done() {
@@ -162,13 +160,11 @@ public void testFullValueRequestsWithCqWithoutRI() throws Exception {
     int numOfKeys = 10;
     int numOfCQs = 3;
     // 1. setup a cache server
-    int port = (Integer)server1.invoke(DeltaPropagationWithCQDUnitTest.class,
-        "createCacheServer");
+    int port = (Integer)server1.invoke(() -> DeltaPropagationWithCQDUnitTest.createCacheServer());
     // 2. setup a client with register interest
     client1
-        .invoke(DeltaPropagationWithCQDUnitTest.class, "createClientCache",
-            new Object[] {NetworkUtils.getServerHostName(server1.getHost()), port,
-                Boolean.TRUE});
+        .invoke(() -> DeltaPropagationWithCQDUnitTest.createClientCache(NetworkUtils.getServerHostName(server1.getHost()), port,
+                Boolean.TRUE));
     // 3. setup another client with cqs but without interest.
     createClientCache(NetworkUtils.getServerHostName(server1.getHost()), port, false/*RI*/);
     for (int i = 0; i < numOfCQs; i++) {
@@ -179,17 +175,14 @@ public void testFullValueRequestsWithCqWithoutRI() throws Exception {
     // verify client2's CQ listeners see above puts
     verifyCqListeners(numOfListeners * numOfKeys * numOfCQs);
     // verify full value requests at server are zero
-    server1.invoke(DeltaPropagationWithCQDUnitTest.class,
-        "verifyFullValueRequestsFromClients", new Object[] {0L});
+    server1.invoke(() -> DeltaPropagationWithCQDUnitTest.verifyFullValueRequestsFromClients(0L));
 
     // 4. do delta updates on client1
-    client1.invoke(DeltaPropagationWithCQDUnitTest.class, "doPuts",
-        new Object[] {numOfKeys, true});
+    client1.invoke(() -> DeltaPropagationWithCQDUnitTest.doPuts(numOfKeys, true));
     // verify client2's CQ listeners see above puts
     verifyCqListeners(numOfListeners * numOfKeys * numOfCQs * 2);
     // verify full value requests at server 
-    server1.invoke(DeltaPropagationWithCQDUnitTest.class,
-        "verifyFullValueRequestsFromClients", new Object[] {10L});
+    server1.invoke(() -> DeltaPropagationWithCQDUnitTest.verifyFullValueRequestsFromClients(10L));
   }
 
   public static void verifyCqListeners(final Integer events) throws Exception {
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 886e671ef856..8f0db7035410 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -138,30 +138,26 @@ public void testDeltaToRegionForRegisterCQ(){
     
     // Register CQ on region with data policy as EMPTY
     // CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName1, CQ1, new Boolean(false)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName1, CQ1, new Boolean(false)));
     
     // Register CQ on region with data policy other then EMPTY
     // CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName2, CQ2, new Boolean(false)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName2, CQ2, new Boolean(false)));
     
     // validation on server side
-    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+    server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServer());
    
     //  check for multiple time cq registration 
     //  Register CQ on region with data policy as EMPTY
     //  CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName3, CQ3, new Boolean(false)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName3, CQ3, new Boolean(false)));
     
     // Register CQ on region with data policy as EMPTY
     // CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName4, CQ4, new Boolean(true)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName4, CQ4, new Boolean(true)));
     
     // validation on server side
-    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+    server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServer());
     
     tearDownforSimpleCase();
   }
@@ -178,31 +174,27 @@ public void testDeltaToRegionForRegisterCQIR(){
     
     // Register CQ on region with data policy as EMPTY
     // CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName1, CQ1, new Boolean(true)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName1, CQ1, new Boolean(true)));
     
     // Register CQ on region with data policy other then EMPTY
     // CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName2, CQ2, new Boolean(true)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName2, CQ2, new Boolean(true)));
     
     // validation on server side
-    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+    server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServer());
    
     //  check for multiple time registration Interest
     
     //  Register CQ on region with data policy as EMPTY
     //  CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName3, CQ3, new Boolean(true) });
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName3, CQ3, new Boolean(true) ));
     
     // Register CQ on region with data policy as EMPTY
     // CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName4, CQ4, new Boolean(false)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName4, CQ4, new Boolean(false)));
     
     // validation on server side
-    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+    server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServer());
     
     tearDownforSimpleCase();
   }
@@ -218,31 +210,27 @@ public void testDeltaToRegionForRegisterCQIRThroughPool(){
     
     // Register CQ on region
     // CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
-        new Object[] {cqName1, CQ1, new Boolean(true)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCqThroughPool(cqName1, CQ1, new Boolean(true)));
     
     // Register CQ on region 
     // CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
-        new Object[] {cqName2, CQ2, new Boolean(true)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCqThroughPool(cqName2, CQ2, new Boolean(true)));
     
     // validation on server side
-    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+    server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServerForCqRegistrationFromPool());
    
     //  check for multiple time registration cq
     
     //  Register CQ on region 
     //  CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
-        new Object[] {cqName3, CQ3, new Boolean(true) });
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCqThroughPool(cqName3, CQ3, new Boolean(true) ));
     
     // Register CQ on region
     // CQ registration
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
-        new Object[] {cqName4, CQ4, new Boolean(false)});
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCqThroughPool(cqName4, CQ4, new Boolean(false)));
     
     // validation on server side
-    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+    server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServerForCqRegistrationFromPool());
     
     tearDownforSimpleCase();
   }
@@ -258,11 +246,9 @@ public void testDeltaToRegionForRegisterCQFailover(){
     
     intialSetUpForFailOver();
     // Register CQ on region with data policy as EMPTY
-    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName1, CQ1, new Boolean(false)});
+    client2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName1, CQ1, new Boolean(false)));
     // Register CQ on region with data policy other then EMPTY
-    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName2, CQ2, new Boolean(false)});
+    client2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName2, CQ2, new Boolean(false)));
         
     validationForFailOver();
     tearDownForFailOver();
@@ -277,12 +263,10 @@ public void testDeltaToRegionForRegisterCQFailover(){
   public void testDeltaToRegionForRegisterCQIRFaliover() {
     intialSetUpForFailOver();
     // Register CQ on region with data policy as EMPTY
-    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName1, CQ1, new Boolean(true)});
+    client2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName1, CQ1, new Boolean(true)));
 
     // Register CQ on region with data policy other then EMPTY
-    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
-        new Object[] {cqName2, CQ2, new Boolean(true)});
+    client2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCq(cqName2, CQ2, new Boolean(true)));
 
     validationForFailOver();
     tearDownForFailOver();
@@ -296,12 +280,10 @@ public void testDeltaToRegionForRegisterCQIRFaliover() {
   public void testDeltaToRegionForRegisterCQIRFromPoolFaliover() {
     intialSetUpNoRegiononClientForFailOver();
     // Register CQ on region
-    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
-        new Object[] {cqName1, CQ1, new Boolean(true)});
+    client2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCqThroughPool(cqName1, CQ1, new Boolean(true)));
     
     //  Register CQ on region 
-    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
-        new Object[] {cqName2, CQ2, new Boolean(true)});
+    client2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.registerCqThroughPool(cqName2, CQ2, new Boolean(true)));
     
     validationForCQFiredFromPoolFailOver();
     tearDownForFailOver();
@@ -661,64 +643,52 @@ public static void stopCacheServer(){
    * initial setup required for testcase with out failover
    */
   public void intialSetUp() {
-    PORT1 = ((Integer)server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
-        "createServerCache")).intValue();
+    PORT1 = ((Integer)server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createServerCache())).intValue();
     client
-        .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCache",
-            new Object[] { NetworkUtils.getServerHostName(server.getHost()),
-                new Integer(PORT1) });
+        .invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server.getHost()),
+                new Integer(PORT1) ));
   }
   
   /*
    * initial setup required for testcase with out failover
    */
   public void intialSetUpClientWithNoRegion() {
-    PORT1 = ((Integer)server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
-        "createServerCache")).intValue();
+    PORT1 = ((Integer)server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createServerCache())).intValue();
     client
-        .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCacheWithNoRegion",
-            new Object[] { NetworkUtils.getServerHostName(server.getHost()),
-                new Integer(PORT1) });
+        .invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createClientCacheWithNoRegion( NetworkUtils.getServerHostName(server.getHost()),
+                new Integer(PORT1) ));
   }
   /*
    * kind of teardown for testcase without failover
    */
   public void tearDownforSimpleCase() {
     //  close the clients first
-    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
+    client.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.closeCache());
     // then close the servers
-    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
+    server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.closeCache());
   }  
   /*
    * initial setup required for testcase with failover
    */
   public void intialSetUpForFailOver() {
-    PORT1 = ((Integer)server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
-        "createServerCache")).intValue();
+    PORT1 = ((Integer)server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createServerCache())).intValue();
     // used only in failover tests
-    PORT2 = ((Integer)server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
-        "createServerCache")).intValue();
-    primary = (Integer)client2.invoke(
-        DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCache2",
-        new Object[] { NetworkUtils.getServerHostName(server.getHost()),
+    PORT2 = ((Integer)server2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createServerCache())).intValue();
+    primary = (Integer)client2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createClientCache2( NetworkUtils.getServerHostName(server.getHost()),
             NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT1),
-            new Integer(PORT2) });
+            new Integer(PORT2) ));
   }
   
   /*
    * initial setup required for testcase with failover where we don't need region on client
    */
   public void intialSetUpNoRegiononClientForFailOver() {
-    PORT1 = ((Integer)server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
-        "createServerCache")).intValue();
+    PORT1 = ((Integer)server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createServerCache())).intValue();
     // used only in failover tests
-    PORT2 = ((Integer)server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
-        "createServerCache")).intValue();
-    primary = (Integer)client2.invoke(
-        DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCache3",
-        new Object[] { NetworkUtils.getServerHostName(server.getHost()),
+    PORT2 = ((Integer)server2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createServerCache())).intValue();
+    primary = (Integer)client2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.createClientCache3( NetworkUtils.getServerHostName(server.getHost()),
             NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT1),
-            new Integer(PORT2) });
+            new Integer(PORT2) ));
   }
   
   /*
@@ -728,16 +698,16 @@ public void intialSetUpNoRegiononClientForFailOver() {
   public void validationForFailOver(){
     assertTrue(" primary server is not detected ",primary.intValue() != -1);
     if (primary.intValue() == PORT1) {
-      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
-      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "stopCacheServer");
+      server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServer());
+      server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.stopCacheServer());
       server2
-          .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+          .invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServer());
     }
     else {
       server2
-          .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
-      server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "stopCacheServer");
-      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+          .invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServer());
+      server2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.stopCacheServer());
+      server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServer());
     }
   }
   
@@ -748,16 +718,16 @@ public void validationForFailOver(){
   public void validationForCQFiredFromPoolFailOver(){
     assertTrue(" primary server is not detected ",primary.intValue() != -1);
     if (primary.intValue() == PORT1) {
-      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
-      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "stopCacheServer");
+      server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServerForCqRegistrationFromPool());
+      server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.stopCacheServer());
       server2
-          .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+          .invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServerForCqRegistrationFromPool());
     }
     else {
       server2
-          .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
-      server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "stopCacheServer");
-      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+          .invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServerForCqRegistrationFromPool());
+      server2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.stopCacheServer());
+      server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.validationOnServerForCqRegistrationFromPool());
     }
   }
   /*
@@ -765,10 +735,10 @@ public void validationForCQFiredFromPoolFailOver(){
    */
   public void tearDownForFailOver() {
     // close the clients first
-    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
+    client2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.closeCache());
     // then close the servers
-    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
-    server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
+    server.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.closeCache());
+    server2.invoke(() -> DeltaToRegionRelationCQRegistrationDUnitTest.closeCache());
   }
   /*
    * create cache with properties
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
index 753fe67482cf..dce35bf8806e 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
@@ -40,7 +40,7 @@ public void setUp() throws Exception {
   
   public void configureClientStop1()
   {
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "setClientCrash", new Object[] {new Boolean(true)});    
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.setClientCrash(new Boolean(true)));    
   }
   
   @Override
@@ -50,7 +50,7 @@ protected void preTearDownDurableClientTestCase() throws Exception {
   
   public void configureClientStop2()
   {
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "setClientCrash", new Object[] {new Boolean(false)});    
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.setClientCrash(new Boolean(false)));    
   }
   
   public void verifySimpleDurableClient() {
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
index 96781f9ef8c3..9fa4b6b2241d 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
@@ -34,7 +34,7 @@ public DurableClientNetDownDUnitTest(String name) {
   @Override
   protected final void preTearDownDurableClientTestCase() throws Exception {
     //ensure that the test flag is no longer set in this vm
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "reconnectClient");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.reconnectClient());
   }
 
   public void setPrimaryRecoveryCheck() {}
@@ -47,13 +47,13 @@ public void configureClientStop2() {}
   
   public void closeDurableClient()
   {
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "reconnectClient");
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.reconnectClient());
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   public void disconnectDurableClient()
   {
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disconnectClient");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.disconnectClient());
   }
 
   public void disconnectDurableClient(boolean keepAlive)
@@ -63,7 +63,7 @@ public void disconnectDurableClient(boolean keepAlive)
   
   public void restartDurableClient(Object[] args)
   {
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "reconnectClient");  
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.reconnectClient());  
   }
   
   public void verifyListenerUpdatesDisconnected(int numberOfEntries)
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index ed0e56521e78..766fad5234a2 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -62,15 +62,13 @@ public DurableClientSimpleDUnitTest(String name) {
    */
   public void testSimpleDurableClientUpdate() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is not kept alive on the server when it stops
     // normally
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -92,8 +90,7 @@ public void run2() throws CacheException {
     });
 
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 10;
@@ -127,13 +124,13 @@ public void run2() throws CacheException {
     });
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
 
   /**
@@ -142,8 +139,7 @@ public void run2() throws CacheException {
    */
   public void testMultipleBridgeClientsInSingleDurableVM() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client with 2 regions (and 2 BridgeClients) that is not
@@ -151,8 +147,7 @@ public void testMultipleBridgeClientsInSingleDurableVM() {
     final String durableClientId = getName() + "_client";
     final String regionName1 = regionName + "1";
     final String regionName2 = regionName + "2";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClients", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName1, regionName2, getClientDistributedSystemProperties(durableClientId)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClients(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName1, regionName2, getClientDistributedSystemProperties(durableClientId)));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -189,7 +184,7 @@ public void run2() throws CacheException {
     });
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Verify the durable client is no longer on the server
     this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
@@ -200,7 +195,7 @@ public void run2() throws CacheException {
     });
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -210,15 +205,13 @@ public void run2() throws CacheException {
    */
   public void XtestMultipleVMsWithSameDurableId() {
     // Start a server
-    final int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is not kept alive on the server when it
     // stops normally
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -273,8 +266,7 @@ public void run2() throws CacheException {
     });
     
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 10;
@@ -308,13 +300,13 @@ public void run2() throws CacheException {
     });
     
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
 
   /**
@@ -322,15 +314,13 @@ public void run2() throws CacheException {
    */
   public void testSimpleTwoDurableClients() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is not kept alive on the server when it
     // stops normally
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -343,8 +333,7 @@ public void run2() throws CacheException {
     // it stops normally. Use the 'publisherClientVM' as a durable client.
     VM durableClient2VM = this.publisherClientVM;
     final String durableClientId2 = getName() + "_client2";
-    durableClient2VM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2)});
+    durableClient2VM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2)));
     
     // Send clientReady message
     durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -380,11 +369,11 @@ public void run2() throws CacheException {
     });
     
     // Stop the durable clients
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-    durableClient2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
+    durableClient2VM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -394,25 +383,22 @@ public void run2() throws CacheException {
   @Ignore("Disabled for bug 52043")
   public void DISABLED_testDurableClientMultipleServersOneLive() {
     // Start server 1
-    final int server1Port = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int server1Port = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start server 2
-    final int server2Port = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int server2Port = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
     
     // Stop server 2
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Start a durable client that is kept alive on the server when it stops
     // normally
     final String durableClientId = getName() + "_client";
     final int durableClientTimeout = 60; // keep the client alive for 60 seconds
     //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -449,8 +435,7 @@ public void run2() throws CacheException {
     });
 
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 10;
@@ -491,7 +476,7 @@ public void run2() throws CacheException {
     }
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache(new Boolean(true)));
     
     // Verify the durable client still exists on the server
     this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
@@ -518,8 +503,7 @@ public void run2() throws CacheException {
     });
     
     // Re-start the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -558,13 +542,13 @@ public void run2() throws CacheException {
     });
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop server 1
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
     
   /**
@@ -572,8 +556,7 @@ public void run2() throws CacheException {
    */
   public void testTwoDurableClientsStartStopUpdate() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is kept alive on the server when it stops
@@ -581,8 +564,7 @@ public void testTwoDurableClientsStartStopUpdate() {
     final String durableClientId = getName() + "_client";
     final int durableClientTimeout = 60; // keep the client alive for 60 seconds
     //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -607,8 +589,7 @@ public void run2() throws CacheException {
     // it stops normally. Use the 'server2VM' as the second durable client.
     VM durableClient2VM = this.server2VM;
     final String durableClientId2 = getName() + "_client2";
-    durableClient2VM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2, durableClientTimeout), Boolean.TRUE});
+    durableClient2VM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2, durableClientTimeout), Boolean.TRUE));
     
     // Send clientReady message
     durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -656,8 +637,7 @@ public void run2() throws CacheException {
     });
     
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 10;
@@ -713,8 +693,8 @@ public void run2() throws CacheException {
     }
     
     // Stop the durable clients
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
-    durableClient2VM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache(new Boolean(true)));
+    durableClient2VM.invoke(() -> CacheServerTestUtil.closeCache(new Boolean(true)));
     
     // Verify the durable clients still exist on the server
     this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
@@ -782,8 +762,7 @@ public void run2() throws CacheException {
     });
 
     // Re-start durable client 1
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -793,8 +772,7 @@ public void run2() throws CacheException {
     });
 
     // Re-start durable client 2
-    durableClient2VM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2), Boolean.TRUE});
+    durableClient2VM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2), Boolean.TRUE));
 
     // Send clientReady message
     durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -834,16 +812,16 @@ public void run2() throws CacheException {
     });
     
     // Stop durable client 1
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop durable client 2
-    durableClient2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    durableClient2VM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -851,30 +829,26 @@ public void run2() throws CacheException {
    */
   public void testDurableClientReconnectTwoServers() {
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     
     // on test flag for periodic ack
-    this.server1VM.invoke(DurableClientTestCase.class, "setTestFlagToVerifyActForMarker",
-        new Object[] { new Boolean(true) });
+    this.server1VM.invoke(() -> DurableClientTestCase.setTestFlagToVerifyActForMarker( new Boolean(true) ));
     
     final int server1Port = ports[0].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int server2Port = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int server2Port = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
         
     // Stop server 2
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Start a durable client that is kept alive on the server when it stops
     // normally
     final String durableClientId = getName() + "_client";
     final int durableClientTimeout = 60; // keep the client alive for 60 seconds
     //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -915,7 +889,7 @@ public void run2() throws CacheException {
     Wait.pause(5000);
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache(new Boolean(true)));
     
     // Verify durable client on server 1
     this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
@@ -928,13 +902,11 @@ public void run2() throws CacheException {
     });
 
     // Re-start server2
-    this.server2VM.invoke(CacheServerTestUtil.class, "createCacheServer",
-        new Object[] { regionName, new Boolean(true),
-            new Integer(server2Port)});
+    this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true),
+            new Integer(server2Port)));
         
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 10;
@@ -973,8 +945,7 @@ public void run2() throws CacheException {
 
     // Re-start the durable client that is kept alive on the server when it stops
     // normally
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -1014,8 +985,8 @@ public void run2() throws CacheException {
     });
 
     // Verify the HA region names are the same on both servers
-    String server1HARegionQueueName= (String) this.server1VM.invoke(DurableClientTestCase.class, "getHARegionQueueName");
-    String server2HARegionQueueName= (String) this.server2VM.invoke(DurableClientTestCase.class, "getHARegionQueueName");
+    String server1HARegionQueueName= (String) this.server1VM.invoke(() -> DurableClientTestCase.getHARegionQueueName());
+    String server2HARegionQueueName= (String) this.server2VM.invoke(() -> DurableClientTestCase.getHARegionQueueName());
     assertEquals(server1HARegionQueueName, server2HARegionQueueName);
     
     // Verify the durable client received the updates
@@ -1034,34 +1005,31 @@ public void run2() throws CacheException {
     });
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // off test flag for periodic ack
-    this.server1VM.invoke(DurableClientTestCase.class, "setTestFlagToVerifyActForMarker",
-        new Object[] { new Boolean(false) });
+    this.server1VM.invoke(() -> DurableClientTestCase.setTestFlagToVerifyActForMarker( new Boolean(false) ));
     
     // Stop server 1
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop server 2
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   public void testReadyForEventsNotCalledImplicitly() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is not kept alive on the server when it
     // stops normally
     final String durableClientId = getName() + "_client";
     // make the client use ClientCacheFactory so it will have a default pool
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createClientCache", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createClientCache(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)));
 
     // verify that readyForEvents has not yet been called on the client's default pool
     this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
@@ -1102,10 +1070,10 @@ public void run2() throws CacheException {
     });
     
     // Stop the durable clients
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   //This test method is disabled because it is failing
@@ -1116,14 +1084,14 @@ public void testReadyForEventsNotCalledImplicitlyWithCacheXML() {
       setPeriodicACKObserver(durableClientVM);
       final String cqName = "cqTest";
       // Start a server
-      int serverPort = (Integer) this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServerFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-server-cache.xml")});
+      int serverPort = (Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerFromXml( DurableClientTestCase.class.getResource("durablecq-server-cache.xml")));
   
       // Start a durable client that is not kept alive on the server when it
       // stops normally
       final String durableClientId = getName() + "_client";
       
       //create client cache from xml
-      this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45, Boolean.FALSE});
+      this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClientFromXml( DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45, Boolean.FALSE));
   
       // verify that readyForEvents has not yet been called on all the client's pools
       this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
@@ -1191,8 +1159,7 @@ public void run2() throws CacheException {
       });
       
       // Start normal publisher client
-      this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-          new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+      this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName));
   
       // Publish some entries
       final int numberOfEntries = 10;
@@ -1234,7 +1201,7 @@ public void run2() throws CacheException {
       }
       
       // Stop the durable client
-      this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+      this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache(new Boolean(true)));
       
       // Verify the durable client still exists on the server
       this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
@@ -1260,10 +1227,10 @@ public void run2() throws CacheException {
         }
       });
       
-      this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
       
       // Re-start the durable client
-      this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45,  Boolean.FALSE});
+      this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClientFromXml( DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45,  Boolean.FALSE));
   
       
       //Durable client registers durable cq on server
@@ -1341,10 +1308,10 @@ public void run2() throws CacheException {
       });
       
       // Stop the durable client
-      this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
   
       // Stop the server
-      this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
     }finally{
       unsetPeriodicACKObserver(durableClientVM);
     }
@@ -1382,14 +1349,14 @@ public void testReadyForEventsNotCalledImplicitlyForRegisterInterestWithCacheXML
     final String cqName = "cqTest";
     regionName = "testReadyForEventsNotCalledImplicitlyWithCacheXML_region";
     // Start a server
-    int serverPort = (Integer) this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServerFromXmlN", new Object[]{ DurableClientTestCase.class.getResource("durablecq-server-cache.xml")});
+    int serverPort = (Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerFromXmlN( DurableClientTestCase.class.getResource("durablecq-server-cache.xml")));
 
     // Start a durable client that is not kept alive on the server when it
     // stops normally
     final String durableClientId = getName() + "_client";
     
     //create client cache from xml
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXmlN", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45, Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClientFromXmlN( DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45, Boolean.TRUE));
 
     // verify that readyForEvents has not yet been called on all the client's pools
     this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
@@ -1434,8 +1401,7 @@ public void run2() throws CacheException {
     });
     
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 10;
@@ -1474,7 +1440,7 @@ public void run2() throws CacheException {
       fail("interrupted" + e);
     }
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache(new Boolean(true)));
     
     // Verify the durable client still exists on the server
     this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
@@ -1499,10 +1465,10 @@ public void run2() throws CacheException {
         }
       }
     });
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Re-start the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXmlN", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45,  Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClientFromXmlN( DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45,  Boolean.TRUE));
 
     
     //Durable client registers durable cq on server
@@ -1554,10 +1520,10 @@ public void run2() throws CacheException {
     });
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -1573,8 +1539,7 @@ public void testHAQueueSizeStat() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     final String durableClientId = getName() + "_client";
@@ -1625,13 +1590,13 @@ public void testHAQueueSizeStat() throws Exception {
     checkHAQueueSize(server1VM, durableClientId, 0, 1);
         
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
 
@@ -1651,8 +1616,7 @@ public void testHAQueueSizeStatExpired() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     final int mcastPort = ports[1].intValue();
     
@@ -1711,13 +1675,13 @@ public void testHAQueueSizeStatExpired() throws Exception {
     checkHAQueueSize(server1VM, durableClientId, 0, 1);
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -1737,20 +1701,18 @@ public void testHAQueueSizeStatForGII() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int serverPort2 = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int serverPort2 = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
   
     //shut down server 2
     closeCache(server2VM);
     
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
   
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
   
@@ -1777,9 +1739,8 @@ public void testHAQueueSizeStatForGII() throws Exception {
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
     
     // Re-start server2, at this point it will be the first time server2 has connected to client
-    this.server2VM.invoke(CacheServerTestUtil.class, "createCacheServer",
-        new Object[] { regionName, new Boolean(true),
-            new Integer(serverPort2)});
+    this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true),
+            new Integer(serverPort2)));
     
     // Verify durable client on server2
     verifyDurableClientOnServer(server2VM, durableClientId);
@@ -1811,14 +1772,14 @@ public void testHAQueueSizeStatForGII() throws Exception {
     checkCqStatOnServer(server2VM, durableClientId, "All", 0);
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the servers
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -1830,8 +1791,7 @@ public void testHAQueuedCqStat() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     final int mcastPort = ports[1].intValue();
     
@@ -1889,13 +1849,13 @@ public void testHAQueuedCqStat() throws Exception {
     checkCqStatOnServer(server1VM, durableClientId, "All", 0);
         
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   /**
    * @throws Exception
@@ -1906,17 +1866,15 @@ public void testHAQueuedCqStatOnSecondary() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int serverPort2 = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int serverPort2 = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
     
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
   
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
   
@@ -1979,13 +1937,13 @@ public void testHAQueuedCqStatOnSecondary() throws Exception {
     checkCqStatOnServer(server2VM, durableClientId, "All", 0);
         
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   
@@ -2007,19 +1965,17 @@ public void testHAQueuedCqStatForGII() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int serverPort2 = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int serverPort2 = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
   
     // Start a durable client that is kept alive on the server when it stops
     // normally
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
   
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
   
@@ -2051,9 +2007,8 @@ public void testHAQueuedCqStatForGII() throws Exception {
     publishEntries(publisherClientVM, regionName, 10);
     
     // Re-start server2, should get events through gii
-    this.server2VM.invoke(CacheServerTestUtil.class, "createCacheServer",
-        new Object[] { regionName, new Boolean(true),
-            new Integer(serverPort2)});
+    this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true),
+            new Integer(serverPort2)));
  
     // Restart the durable client
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
@@ -2086,11 +2041,11 @@ public void testHAQueuedCqStatForGII() throws Exception {
 
    
     // Stop the durable clients
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the servers
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
 
@@ -2110,20 +2065,18 @@ public void testHAQueuedCqStatForGII2() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int serverPort2 = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int serverPort2 = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
   
     //shut down server 2
     closeCache(server2VM);
     
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
   
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
   
@@ -2150,9 +2103,8 @@ public void testHAQueuedCqStatForGII2() throws Exception {
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
     
     // Re-start server2, at this point it will be the first time server2 has connected to client
-    this.server2VM.invoke(CacheServerTestUtil.class, "createCacheServer",
-        new Object[] { regionName, new Boolean(true),
-            new Integer(serverPort2)});
+    this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true),
+            new Integer(serverPort2)));
     
     // Verify durable client on server2
     verifyDurableClientOnServer(server2VM, durableClientId);
@@ -2184,14 +2136,14 @@ public void testHAQueuedCqStatForGII2() throws Exception {
     checkCqStatOnServer(server2VM, durableClientId, "All", 0);
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the servers
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   /**
    * Server 2 comes up and goes down after client connects and registers cqs
@@ -2210,19 +2162,17 @@ public void testHAQueuedCqStatForGIINoFailover() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     // Start server 2
-    final int serverPort2 = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int serverPort2 = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
   
     // Start a durable client that is kept alive on the server when it stops
     // normally
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
   
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
   
@@ -2254,9 +2204,8 @@ public void testHAQueuedCqStatForGIINoFailover() throws Exception {
     publishEntries(publisherClientVM, regionName, 10);
     
     // Re-start server2, should get events through gii
-    this.server2VM.invoke(CacheServerTestUtil.class, "createCacheServer",
-        new Object[] { regionName, new Boolean(true),
-            new Integer(serverPort2)});
+    this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true),
+            new Integer(serverPort2)));
  
     // Restart the durable client
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
@@ -2289,12 +2238,12 @@ public void testHAQueuedCqStatForGIINoFailover() throws Exception {
     checkCqStatOnServer(server1VM, durableClientId, "All", 0);
 
     // Stop the durable clients
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the servers
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -2310,19 +2259,17 @@ public void testHAQueuedCqStatForFailover() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int serverPort2 = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int serverPort2 = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
   
     // Start a durable client that is kept alive on the server when it stops
     // normally
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
   
     startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
   
@@ -2381,13 +2328,13 @@ public void testHAQueuedCqStatForFailover() throws Exception {
     checkCqStatOnServer(server2VM, durableClientId, "All", 0);
    
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   
@@ -2401,8 +2348,7 @@ public void testHAQueuedCqStatWithTimeOut() throws Exception {
         
     int timeoutInSeconds = 20;
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     final String durableClientId = getName() + "_client";
@@ -2467,13 +2413,13 @@ public void testHAQueuedCqStatWithTimeOut() throws Exception {
     checkCqStatOnServer(server1VM, durableClientId, "All", 0);
         
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   /**
    * Test functionality to close the cq and drain all events from the ha queue from the server
@@ -2485,9 +2431,8 @@ public void testCloseCqAndDrainEvents() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(
-        CacheServerTestUtil.class, "createCacheServer", new Object[] {
-            regionName, new Boolean(true) })).intValue();
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(
+            regionName, new Boolean(true) ))).intValue();
 
     // Start a durable client that is kept alive on the server when it stops
     // normally
@@ -2549,13 +2494,13 @@ public void run2() throws CacheException {
    
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -2569,8 +2514,7 @@ public void testCloseAllCqsAndDrainEvents() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     final String durableClientId = getName() + "_client";
@@ -2635,13 +2579,13 @@ public void run2() throws CacheException {
     checkInterestEvents(durableClientVM, regionName, 10);
    
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -2656,8 +2600,7 @@ public void testCloseAllCqsAndDrainEventsNoInterestRegistered() throws Exception
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     final String durableClientId = getName() + "_client";
@@ -2746,13 +2689,13 @@ public void run2() throws CacheException {
     this.checkHAQueueSize(server1VM, durableClientId, 0, 1);
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   
@@ -2767,8 +2710,7 @@ public void testCloseCqAndDrainEvents2Client() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
     
     final String durableClientId = getName() + "_client";
@@ -2866,13 +2808,13 @@ public void run2() throws CacheException {
     checkCqListenerEvents(durableClientVM, "All", 10 /*numEventsExpected*/, 10/*numEventsToWaitFor*/, 15/*secondsToWait*/);
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -2890,12 +2832,11 @@ public void testRejectClientWhenDrainingCq() throws Exception {
       String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
           
       // Start server 1
-      Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-          "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+      Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
       final int serverPort = ports[0].intValue();
   
       final String durableClientId = getName() + "_client";
-      this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+      this.durableClientVM.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
     
       startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
     
@@ -2976,13 +2917,13 @@ public String description() {
       checkCqListenerEvents(durableClientVM, "All", 0 /*numEventsExpected*/, 1/*numEventsToWaitFor*/, 5/*secondsToWait*/);      
   
       // Stop the durable client
-      this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
   
       // Stop the publisher client
-      this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
   
       // Stop the server
-      this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
     }finally{
       this.server1VM.invoke(new CacheSerializableRunnable(
           "unset test hook") {
@@ -3006,8 +2947,7 @@ public void testCqCloseExceptionDueToActivatingClient() throws Exception {
       String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
           
       // Start server 1
-      Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-          "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+      Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
       final int serverPort = ports[0].intValue();
       
       final String durableClientId = getName() + "_client";
@@ -3079,13 +3019,13 @@ public void run2() throws CacheException {
       checkCqListenerEvents(durableClientVM, "All", 10 /*numEventsExpected*/, 10/*numEventsToWaitFor*/, 15/*secondsToWait*/);           
   
       // Stop the durable client
-      this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
   
       // Stop the publisher client
-      this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
   
       // Stop the server
-      this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
     }finally {
       this.server1VM.invoke(new CacheSerializableRunnable(
           "unset test hook") {
@@ -3106,9 +3046,8 @@ public void testCqCloseExceptionDueToActiveConnection() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(
-        CacheServerTestUtil.class, "createCacheServer", new Object[] {
-            regionName, new Boolean(true) })).intValue();
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(
+            regionName, new Boolean(true) ))).intValue();
 
     // Start a durable client that is kept alive on the server when it stops
     // normally
@@ -3161,13 +3100,13 @@ public void run2() throws CacheException {
     
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   
@@ -3182,9 +3121,8 @@ public void testCloseCacheProxy() throws Exception {
     String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
         
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(
-        CacheServerTestUtil.class, "createCacheServer", new Object[] {
-            regionName, new Boolean(true) })).intValue();
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(
+            regionName, new Boolean(true) ))).intValue();
 
     // Start a durable client that is kept alive on the server when it stops
     // normally
@@ -3256,13 +3194,13 @@ public void run2() throws CacheException {
     checkCqListenerEvents(durableClientVM, "All", 0 /*numEventsExpected*/, 1/*numEventsToWaitFor*/, 5/*secondsToWait*/);
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }  
   
   /**
@@ -3271,13 +3209,11 @@ public void run2() throws CacheException {
    */
   public void testSimpleDurableClientMultipleServers() {
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int server1Port = ports[0].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int server2Port = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int server2Port = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
     
     // Start a durable client connected to both servers that is kept alive when
@@ -3285,8 +3221,7 @@ public void testSimpleDurableClientMultipleServers() {
     final int durableClientTimeout = 60; // keep the client alive for 60 seconds
     //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -3326,7 +3261,7 @@ public void run2() throws CacheException {
     });
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache(new Boolean(true)));
     
     // Verify the durable client is still on server 1
     this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
@@ -3350,8 +3285,7 @@ public void run2() throws CacheException {
 
     // Start up the client again. This time initialize it so that it is not kept
     // alive on the servers when it stops normally.
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -3393,15 +3327,15 @@ public void run2() throws CacheException {
     });
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     this.verifySimpleDurableClientMultipleServers();
 
     // Stop server 1
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop server 2
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
 
   
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index f9d73e0660fe..3be13eceea8e 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -110,10 +110,10 @@ public void setUp() throws Exception {
   protected final void preTearDown() throws Exception {
     preTearDownDurableClientTestCase();
     
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   protected void preTearDownDurableClientTestCase() throws Exception {
@@ -124,15 +124,13 @@ protected void preTearDownDurableClientTestCase() throws Exception {
    */
   public void testSimpleDurableClient() {    
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is not kept alive on the server when it
     // stops normally
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -164,7 +162,7 @@ public void run2() throws CacheException {
     this.verifySimpleDurableClient();
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
 
     this.closeDurableClient();
     
@@ -181,14 +179,13 @@ public void testSimpleDurableClient2() {
 
     try {
       // Start a server
-      int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServer", new Object[] { regionName, new Boolean(true) })).intValue();
+      int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true) ))).intValue();
 
       // Start a durable client that is not kept alive on the server when it
       // stops normally
       final String durableClientId = getName() + "_client";
 
-      this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
-          new Object[] { getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), new Boolean(false), jp });
+      this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient( getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), new Boolean(false), jp ));
 
       // Send clientReady message
       this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -228,13 +225,12 @@ public void run2() throws CacheException {
       this.verifySimpleDurableClient();
 
       // Stop the server
-      this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+      this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
 
       this.closeDurableClient();
     } finally {
  
-      this.durableClientVM.invoke(CacheServerTestUtil.class, "unsetJavaSystemProperties", 
-        new Object[] {jp});
+      this.durableClientVM.invoke(() -> CacheServerTestUtil.unsetJavaSystemProperties(jp));
     }
     
   }
@@ -251,7 +247,7 @@ public void disconnectDurableClient()
   public void disconnectDurableClient(boolean keepAlive)
   {
     printClientProxyState("Before");
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache",new Object[] {new Boolean(keepAlive)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache(new Boolean(keepAlive)));
     Wait.pause(1000);
     printClientProxyState("after");
   }
@@ -311,8 +307,7 @@ public void run2() throws CacheException {
    */
   public void testStartStopStartDurableClient() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is kept alive on the server when it stops
@@ -320,8 +315,7 @@ public void testStartStopStartDurableClient() {
     final String durableClientId = getName() + "_client";
     final int durableClientTimeout = 60; // keep the client alive for 60 seconds
     //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -381,10 +375,10 @@ public void run2() throws CacheException {
     });
         
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
 
   /**
@@ -394,8 +388,7 @@ public void run2() throws CacheException {
    */
   public void test39630() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is kept alive on the server when it stops
@@ -403,8 +396,7 @@ public void test39630() {
     final String durableClientId = getName() + "_client";
     final int durableClientTimeout = 60; // keep the client alive for 60 seconds
     //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)));
 
 //    // Send clientReady message
 //    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -459,10 +451,10 @@ public void run2() throws CacheException {
             durableClientTimeout) });
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   public void restartDurableClient(Object[] args)
@@ -483,8 +475,7 @@ public void run2() throws CacheException {
    */
   public void testStartStopTimeoutDurableClient() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is kept alive on the server when it stops
@@ -492,8 +483,7 @@ public void testStartStopTimeoutDurableClient() {
     final String durableClientId = getName() + "_client";
     final int durableClientTimeout = 5; // keep the client alive for 5 seconds
     //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -555,10 +545,10 @@ public void run2() throws CacheException {
             durableClientTimeout) });
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
 
   /**
@@ -566,8 +556,7 @@ public void run2() throws CacheException {
    */
   public void testDurableClientPrimaryUpdate() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is kept alive on the server when it stops
@@ -575,8 +564,7 @@ public void testDurableClientPrimaryUpdate() {
     final String durableClientId = getName() + "_client";
     final int durableClientTimeout = 120; // keep the client alive for 60 seconds
     //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -598,8 +586,7 @@ public void run2() throws CacheException {
     });
 
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 1;
@@ -723,13 +710,13 @@ public void run2() throws CacheException {
     this.verifyListenerUpdates(numberOfEntries, numberOfEntries);
     
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the durable client VM
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   /**
@@ -737,8 +724,7 @@ public void run2() throws CacheException {
    */
   public void testStartStopStartDurableClientUpdate() {
     // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
 
     // Start a durable client that is kept alive on the server when it stops
@@ -746,8 +732,7 @@ public void testStartStopStartDurableClientUpdate() {
     final String durableClientId = getName() + "_client";
     final int durableClientTimeout = 60; // keep the client alive for 60 seconds
     //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -769,8 +754,7 @@ public void run2() throws CacheException {
     });
 
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 1;
@@ -879,13 +863,13 @@ public void run2() throws CacheException {
     this.verifyListenerUpdates(numberOfEntries, numberOfEntries);
     
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the durable client VM
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
 
   public void verifyListenerUpdates(int numEntries)
@@ -954,15 +938,13 @@ public void run2() throws CacheException {
   public void testDurableClientConnectServerStopStart() {
     // Start a server
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int serverPort = ports[0].intValue();
 
     // Start a durable client that is not kept alive on the server when it
     // stops normally
     final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -999,12 +981,11 @@ public void run2() throws CacheException {
     });
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Re-start the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServer",
-        new Object[] {regionName, new Boolean(true),
-            new Integer(serverPort)});
+    this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true),
+            new Integer(serverPort)));
     
     // Pause 10 seconds to allow client to reconnect to server
     // no need for the explicit pause since checkNumberOfClientProxies
@@ -1027,8 +1008,7 @@ public void run2() throws CacheException {
     });
     
     // Start a publisher
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName));
 
     // Publish some messages
     // Publish some entries
@@ -1063,13 +1043,13 @@ public void run2() throws CacheException {
     });
 
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
     
     // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
 
   @Ignore("This test is failing inconsistently, see bug 51258")
@@ -1096,17 +1076,15 @@ public void DISABLED_testDurableHAFailover() throws InterruptedException
   public void durableFailover(int redundancyLevel) throws InterruptedException {
     
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int server1Port = ports[0].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int server2Port = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+    final int server2Port = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
         .intValue();
         
     // Stop server 2
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Start a durable client
     final String durableClientId = getName() + "_client";
@@ -1119,10 +1097,9 @@ public void durableFailover(int redundancyLevel) throws InterruptedException {
       clientPool = getClientPool(NetworkUtils.getServerHostName(Host.getHost(0)), server1Port, server2Port, true, 0);
     }
     
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {clientPool, regionName,
-        getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(clientPool, regionName,
+        getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -1144,13 +1121,11 @@ public void run2() throws CacheException {
     });
     
     // Re-start server2
-    this.server2VM.invoke(CacheServerTestUtil.class, "createCacheServer",
-        new Object[] { regionName, new Boolean(true),
-            new Integer(server2Port)});
+    this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true),
+            new Integer(server2Port)));
         
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 1;
@@ -1245,7 +1220,7 @@ public void run2() throws CacheException {
     setPrimaryRecoveryCheck();
     
     // Stop server 1 - publisher will put 10 entries during shutdown/primary identification
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
 
     this.durableClientVM.invoke(new CacheSerializableRunnable("Get") {
       public void run2() throws CacheException {
@@ -1277,13 +1252,13 @@ public void run2() throws CacheException {
     this.verifyListenerUpdates(numberOfEntries+2, numberOfEntries);
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop server 2
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
 
@@ -1292,14 +1267,12 @@ public void durableFailoverAfterReconnect(int redundancyLevel)
 
     
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
     final int server1Port = ports[0].intValue();
     final int mcastPort = ports[1].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int server2Port = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true), new Integer(mcastPort)}))
+    final int server2Port = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true), new Integer(mcastPort))))
         .intValue();
     
     // Start a durable client
@@ -1313,10 +1286,9 @@ public void durableFailoverAfterReconnect(int redundancyLevel)
       clientPool = getClientPool(NetworkUtils.getServerHostName(Host.getHost(0)), server1Port, server2Port, true, 0);
     }
     
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {clientPool, regionName,
-        getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(clientPool, regionName,
+        getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE));
 
     // Send clientReady message
     this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
@@ -1338,8 +1310,7 @@ public void run2() throws CacheException {
     });
     
     // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName});
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(getClientPool(NetworkUtils.getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName));
 
     // Publish some entries
     final int numberOfEntries = 1;
@@ -1383,7 +1354,7 @@ public void run2() throws CacheException {
     this.disconnectDurableClient(true);
 
     // Stop server 1 - publisher will put 10 entries during shutdown/primary identification
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Publish updates during client downtime
     this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries") {
@@ -1477,13 +1448,13 @@ public void run2() throws CacheException {
     }
     
     // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(() -> CacheServerTestUtil.closeCache());
 
     // Stop server 2
-    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
   }
   
   
@@ -2012,54 +1983,39 @@ public void run2() throws CacheException {
   }
   
   protected void startDurableClient(VM vm, String durableClientId, int serverPort1, String regionName, int durableTimeoutInSeconds) {
-    vm.invoke(
-        CacheServerTestUtil.class,
-        "createCacheClient",
-        new Object[] {
+    vm.invoke(() -> CacheServerTestUtil.createCacheClient(
             getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()),
                 serverPort1, true), regionName,
             getClientDistributedSystemProperties(durableClientId, durableTimeoutInSeconds),
-            Boolean.TRUE });
+            Boolean.TRUE ));
   }
   
   protected void startDurableClient(VM vm, String durableClientId, int serverPort1, String regionName) {
-    vm.invoke(
-        CacheServerTestUtil.class,
-        "createCacheClient",
-        new Object[] {
+    vm.invoke(() -> CacheServerTestUtil.createCacheClient(
             getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()),
                 serverPort1, true), regionName,
             getClientDistributedSystemProperties(durableClientId),
-            Boolean.TRUE });
+            Boolean.TRUE ));
   }
   
   protected void startDurableClient(VM vm, String durableClientId, int serverPort1, int serverPort2, String regionName) {
-    vm.invoke(
-        CacheServerTestUtil.class,
-        "createCacheClient",
-        new Object[] {
+    vm.invoke(() -> CacheServerTestUtil.createCacheClient(
             getClientPool(NetworkUtils.getServerHostName(vm.getHost()),
                 serverPort1, serverPort2, true), regionName,
             getClientDistributedSystemProperties(durableClientId),
-            Boolean.TRUE });
+            Boolean.TRUE ));
   }
   
   protected void startClient(VM vm, int serverPort1, String regionName) {
-    vm.invoke(
-        CacheServerTestUtil.class,
-        "createCacheClient",
-        new Object[] {
+    vm.invoke(() -> CacheServerTestUtil.createCacheClient(
             getClientPool(NetworkUtils.getServerHostName(vm.getHost()),
-                serverPort1, false), regionName });
+                serverPort1, false), regionName ));
   }
   
   protected void startClient(VM vm, int serverPort1, int serverPort2, String regionName) {
-    vm.invoke(
-        CacheServerTestUtil.class,
-        "createCacheClient",
-        new Object[] {
+    vm.invoke(() -> CacheServerTestUtil.createCacheClient(
             getClientPool(NetworkUtils.getServerHostName(vm.getHost()),
-                serverPort1, serverPort2, false), regionName });
+                serverPort1, serverPort2, false), regionName ));
   }
   
   protected void verifyDurableClientOnServer(VM server, final String durableClientId) {
@@ -2095,6 +2051,6 @@ public String description() {
   }
   
   protected void closeCache(VM vm) {
-    vm.invoke(CacheServerTestUtil.class, "closeCache");
+    vm.invoke(() -> CacheServerTestUtil.closeCache());
   }
 }
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
index b4e589f095ca..64bbe0cf13fa 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -120,8 +120,7 @@ public void testCacheServerMBean() throws Exception {
     
     verifyCacheServer(server,serverPort);
 
-    final int port = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
 
     // Create client.
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index c77ab2b5a182..12b11e3870aa 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -1438,9 +1438,9 @@ public void run2() throws CacheException {
   
   @Override
   protected final void postTearDownCacheTestCase() throws Exception {
-    Host.getHost(0).getVM(0).invoke(CacheServerTestUtil.class, "closeCache");
-    Host.getHost(0).getVM(1).invoke(CacheServerTestUtil.class, "closeCache");
-    Host.getHost(0).getVM(2).invoke(CacheServerTestUtil.class, "closeCache");
-    Host.getHost(0).getVM(3).invoke(CacheServerTestUtil.class, "closeCache");
+    Host.getHost(0).getVM(0).invoke(() -> CacheServerTestUtil.closeCache());
+    Host.getHost(0).getVM(1).invoke(() -> CacheServerTestUtil.closeCache());
+    Host.getHost(0).getVM(2).invoke(() -> CacheServerTestUtil.closeCache());
+    Host.getHost(0).getVM(3).invoke(() -> CacheServerTestUtil.closeCache());
   }
 }
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index d8e65d9d7adc..bb97cf3cde51 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -429,8 +429,8 @@ protected Properties getServerProperties() {
   
   @Override
   protected final void postTearDownCacheTestCase() throws Exception {
-    Host.getHost(0).getVM(0).invoke(CacheServerTestUtil.class, "closeCache");
-    Host.getHost(0).getVM(1).invoke(CacheServerTestUtil.class, "closeCache");
-    Host.getHost(0).getVM(2).invoke(CacheServerTestUtil.class, "closeCache");
+    Host.getHost(0).getVM(0).invoke(() -> CacheServerTestUtil.closeCache());
+    Host.getHost(0).getVM(1).invoke(() -> CacheServerTestUtil.closeCache());
+    Host.getHost(0).getVM(2).invoke(() -> CacheServerTestUtil.closeCache());
   }
 }
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
index 4ba48dfca829..a8dcf59ed618 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
@@ -89,8 +89,7 @@ public void testNumOfCQ() throws Exception {
     int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();
     cqDUnitTest.createServer(server, serverPort);
 
-    final int port = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
 
     cqDUnitTest.createClient(client, port, host0);    
     cqDUnitTest.createCQ(client, queryName, cqDUnitTest.cqs[0]);    
@@ -125,8 +124,7 @@ public void testNumOfCQ() throws Exception {
         /* queryDeletes: */0,
         /* totalEvents: */size);   
     
-    long numOfCQ = ((Number) managingNode.invoke(TestCQDUnitTest.class,
-        "getNumOfCQ")).intValue();
+    long numOfCQ = ((Number) managingNode.invoke(() -> TestCQDUnitTest.getNumOfCQ())).intValue();
 
     LogWriterUtils.getLogWriter().info("testNumOfCQ numOfCQ= " + numOfCQ);
 
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
index 165973167a83..5decf7da0584 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
@@ -85,12 +85,10 @@ public void testNumOfClients() throws Exception {
     VM client = managedNodeList.get(2);
     int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();
     cqDUnitTest.createServer(server, serverPort);
-    final int port = server.invokeInt(CqQueryDUnitTest.class,
-        "getCacheServerPort");
+    final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
     cqDUnitTest.createClient(client, port, host0);
-    Integer numOfClients = (Integer) managingNode.invoke(
-        TestClientsDUnitTest.class, "getNumOfClients");
+    Integer numOfClients = (Integer) managingNode.invoke(() -> TestClientsDUnitTest.getNumOfClients());
     LogWriterUtils.getLogWriter().info("testNumOfClients numOfClients = " + numOfClients);
     cqDUnitTest.closeClient(client);
     cqDUnitTest.closeServer(server);
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
index 8fa29a79f0c4..e6329937840e 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
@@ -80,8 +80,7 @@ public void testNumOfServersDUnitTest() throws Exception {
     VM server = managedNodeList.get(1);    
     int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();
     cqDUnitTest.createServer(server, serverPort);    
-    int serverCount = ((Number) managingNode.invoke(TestServerDUnitTest.class,
-        "getNumOfServersFromMBean")).intValue();
+    int serverCount = ((Number) managingNode.invoke(() -> TestServerDUnitTest.getNumOfServersFromMBean())).intValue();
     LogWriterUtils.getLogWriter().info("TestServerDUnitTest serverCount =" + serverCount);
     cqDUnitTest.closeServer(server);
     assertEquals(1, serverCount);
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
index 86e38f357341..9910c8a1bb92 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
@@ -51,14 +51,10 @@ public void setUp() throws Exception {
     client1 = host.getVM(2);
     client2 = host.getVM(3);
 
-    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    client1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { clientExpectedExceptions });
-    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { clientExpectedExceptions });
+    server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    client1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions ));
+    client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions ));
     SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
   }
 
@@ -233,11 +229,11 @@ public void testAllOpsWithFailover2() {
   @Override
   protected final void preTearDown() throws Exception {
     // close the clients first
-    client1.invoke(SecurityTestUtil.class, "closeCache");
-    client2.invoke(SecurityTestUtil.class, "closeCache");
+    client1.invoke(() -> SecurityTestUtil.closeCache());
+    client2.invoke(() -> SecurityTestUtil.closeCache());
     SecurityTestUtil.closeCache();
     // then close the servers
-    server1.invoke(SecurityTestUtil.class, "closeCache");
-    server2.invoke(SecurityTestUtil.class, "closeCache");
+    server1.invoke(() -> SecurityTestUtil.closeCache());
+    server2.invoke(() -> SecurityTestUtil.closeCache());
   }
 }
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index e26db307614e..344c977f026a 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -119,12 +119,9 @@ public void setUp() throws Exception {
     client1 = host.getVM(2);
     client2 = host.getVM(3);
 
-    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { clientExpectedExceptions });
+    server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions ));
     SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
 
     //required by FilterPreAuthorization and FilterPostAuthorization. Normally,
@@ -373,20 +370,18 @@ public void testAllOpsObjectModWithFailover() {
         // on the servers with failover
         if (opBlock.size() > 0) {
           // Start the first server and execute the operation block
-          server1.invoke(ClientAuthorizationTestBase.class,
-              "createCacheServer", new Object[] {
+          server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
                   SecurityTestUtil.getLocatorPort(), port1, serverProps,
-                  javaProps });
-          server2.invoke(SecurityTestUtil.class, "closeCache");
+                  javaProps ));
+          server2.invoke(() -> SecurityTestUtil.closeCache());
           executeOpBlock(opBlock, port1, port2, authInit, extraProps, null,
               tgen, rnd);
           if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
             // Failover to the second server and run the block again
-            server2.invoke(ClientAuthorizationTestBase.class,
-                "createCacheServer", new Object[] {
+            server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
                     SecurityTestUtil.getLocatorPort(), port2, serverProps,
-                    javaProps });
-            server1.invoke(SecurityTestUtil.class, "closeCache");
+                    javaProps ));
+            server1.invoke(() -> SecurityTestUtil.closeCache());
             executeOpBlock(opBlock, port1, port2, authInit, extraProps, null,
                 tgen, rnd);
           }
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
index e17acc074b6f..0cb125feb244 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
@@ -86,21 +86,18 @@ public void run() {
     client1 = host.getVM(2);
     client2 = host.getVM(3);
 
-    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { clientExpectedExceptions });
+    server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions ));
     SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
   }
 
   @Override
   protected final void preTearDown() throws Exception {
-    client1.invoke(SecurityTestUtil.class, "closeCache");
-    client2.invoke(SecurityTestUtil.class, "closeCache");
-    server1.invoke(SecurityTestUtil.class, "closeCache");
-    server2.invoke(SecurityTestUtil.class, "closeCache");
+    client1.invoke(() -> SecurityTestUtil.closeCache());
+    client2.invoke(() -> SecurityTestUtil.closeCache());
+    server1.invoke(() -> SecurityTestUtil.closeCache());
+    server2.invoke(() -> SecurityTestUtil.closeCache());
   }
 
   public void testAllowCQForAllMultiusers() throws Exception {
@@ -218,11 +215,10 @@ public void doStartUp(Integer numOfUsers, Integer numOfPuts,
       Integer locatorPort = Integer.valueOf(AvailablePort
           .getRandomAvailablePort(AvailablePort.SOCKET));
       // Close down any running servers
-      server1.invoke(SecurityTestUtil.class, "closeCache");
-      server2.invoke(SecurityTestUtil.class, "closeCache");
+      server1.invoke(() -> SecurityTestUtil.closeCache());
+      server2.invoke(() -> SecurityTestUtil.closeCache());
 
-      server1.invoke(ClientCQPostAuthorizationDUnitTest.class,
-          "createServerCache", new Object[] {serverProps, javaProps, locatorPort, port1});
+      server1.invoke(() -> ClientCQPostAuthorizationDUnitTest.createServerCache(serverProps, javaProps, locatorPort, port1));
       client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
           "createClientCache", new Object[] {javaProps2, authInit, authProps,
               new Integer[] {port1, port2}, numOfUsers, postAuthzAllowed});
@@ -230,45 +226,35 @@ public void doStartUp(Integer numOfUsers, Integer numOfPuts,
           "createClientCache", new Object[] {javaProps2, authInit, authProps,
               new Integer[] {port1, port2}, numOfUsers, postAuthzAllowed});
 
-      client1.invoke(ClientCQPostAuthorizationDUnitTest.class, "createCQ",
-          new Object[] {numOfUsers});
+      client1.invoke(() -> ClientCQPostAuthorizationDUnitTest.createCQ(numOfUsers));
       client1.invoke(ClientCQPostAuthorizationDUnitTest.class, "executeCQ",
           new Object[] {numOfUsers, new Boolean[] {false, false}, numOfPuts,
               new String[numOfUsers], postAuthzAllowed});
 
-      client2.invoke(ClientCQPostAuthorizationDUnitTest.class, "doPuts",
-          new Object[] {numOfPuts, Boolean.TRUE/* put last key */});
+      client2.invoke(() -> ClientCQPostAuthorizationDUnitTest.doPuts(numOfPuts, Boolean.TRUE/* put last key */));
       if (!postAuthzAllowed[0]) {
         // There is no point waiting as no user is authorized to receive cq events.
         try {Thread.sleep(1000);} catch (InterruptedException ie) {}
       } else {
-        client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
-            "waitForLastKey", new Object[] {Integer.valueOf(0)});
+        client1.invoke(() -> ClientCQPostAuthorizationDUnitTest.waitForLastKey(Integer.valueOf(0)));
         if (postAuthzAllowed[1]) {
-          client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
-              "waitForLastKey", new Object[] {Integer.valueOf(1)});
+          client1.invoke(() -> ClientCQPostAuthorizationDUnitTest.waitForLastKey(Integer.valueOf(1)));
         }
       }
-      client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
-          "checkCQListeners", new Object[] {numOfUsers, postAuthzAllowed,
-              numOfPuts + 1/* last key */, 0, !failover});
+      client1.invoke(() -> ClientCQPostAuthorizationDUnitTest.checkCQListeners(numOfUsers, postAuthzAllowed,
+              numOfPuts + 1/* last key */, 0, !failover));
       if (failover) {
-        server2.invoke(ClientCQPostAuthorizationDUnitTest.class,
-            "createServerCache", new Object[] {serverProps, javaProps, locatorPort, port2});
-        server1.invoke(SecurityTestUtil.class, "closeCache");
+        server2.invoke(() -> ClientCQPostAuthorizationDUnitTest.createServerCache(serverProps, javaProps, locatorPort, port2));
+        server1.invoke(() -> SecurityTestUtil.closeCache());
 
         // Allow time for client1 to register its CQs on server2
-        server2.invoke(ClientCQPostAuthorizationDUnitTest.class,
-            "allowCQsToRegister", new Object[] {Integer.valueOf(2)});
-
-        client2.invoke(ClientCQPostAuthorizationDUnitTest.class, "doPuts",
-            new Object[] {numOfPuts, Boolean.TRUE/* put last key */});
-        client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
-            "waitForLastKeyUpdate", new Object[] {Integer.valueOf(0)});
-        client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
-            "checkCQListeners", new Object[] {numOfUsers, postAuthzAllowed,
+        server2.invoke(() -> ClientCQPostAuthorizationDUnitTest.allowCQsToRegister(Integer.valueOf(2)));
+
+        client2.invoke(() -> ClientCQPostAuthorizationDUnitTest.doPuts(numOfPuts, Boolean.TRUE/* put last key */));
+        client1.invoke(() -> ClientCQPostAuthorizationDUnitTest.waitForLastKeyUpdate(Integer.valueOf(0)));
+        client1.invoke(() -> ClientCQPostAuthorizationDUnitTest.checkCQListeners(numOfUsers, postAuthzAllowed,
                 numOfPuts + 1/* last key */, numOfPuts + 1/* last key */,
-                Boolean.TRUE});
+                Boolean.TRUE));
       }
   }
 
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
index 78a45b1d365f..62bff2b9beda 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
@@ -55,12 +55,9 @@ public void setUp() throws Exception {
     client1 = host.getVM(2);
     client2 = host.getVM(3);
 
-    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { clientExpectedExceptions });
+    server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions ));
     SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
   }
 
@@ -142,8 +139,8 @@ public void testAllPostOps() {
           .getRandomAvailablePort(AvailablePort.SOCKET));
 
       // Close down any running servers
-      server1.invoke(SecurityTestUtil.class, "closeCache");
-      server2.invoke(SecurityTestUtil.class, "closeCache");
+      server1.invoke(() -> SecurityTestUtil.closeCache());
+      server2.invoke(() -> SecurityTestUtil.closeCache());
 
       // Perform all the ops on the clients
       List opBlock = new ArrayList();
@@ -158,20 +155,18 @@ public void testAllPostOps() {
           // on the servers with failover
           if (opBlock.size() > 0) {
             // Start the first server and execute the operation block
-            server1.invoke(ClientAuthorizationTestBase.class,
-                "createCacheServer", new Object[] {
+            server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
                     SecurityTestUtil.getLocatorPort(), port1, serverProps,
-                    javaProps });
-            server2.invoke(SecurityTestUtil.class, "closeCache");
+                    javaProps ));
+            server2.invoke(() -> SecurityTestUtil.closeCache());
             executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
                 extraAuthzProps, tgen, rnd);
             if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
               // Failover to the second server and run the block again
-              server2.invoke(ClientAuthorizationTestBase.class,
-                  "createCacheServer", new Object[] {
+              server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
                       SecurityTestUtil.getLocatorPort(), port2, serverProps,
-                      javaProps });
-              server1.invoke(SecurityTestUtil.class, "closeCache");
+                      javaProps ));
+              server1.invoke(() -> SecurityTestUtil.closeCache());
               executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
                   extraAuthzProps, tgen, rnd);
             }
@@ -355,20 +350,18 @@ public void testAllOpsNotifications() {
           // on the servers with failover
           if (opBlock.size() > 0) {
             // Start the first server and execute the operation block
-            server1.invoke(ClientAuthorizationTestBase.class,
-                "createCacheServer", new Object[] {
+            server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
                     SecurityTestUtil.getLocatorPort(), port1, serverProps,
-                    javaProps });
-            server2.invoke(SecurityTestUtil.class, "closeCache");
+                    javaProps ));
+            server2.invoke(() -> SecurityTestUtil.closeCache());
             executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
                 extraAuthzProps, tgen, rnd);
             if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
               // Failover to the second server and run the block again
-              server2.invoke(ClientAuthorizationTestBase.class,
-                  "createCacheServer", new Object[] {
+              server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
                       SecurityTestUtil.getLocatorPort(), port2, serverProps,
-                      javaProps });
-              server1.invoke(SecurityTestUtil.class, "closeCache");
+                      javaProps ));
+              server1.invoke(() -> SecurityTestUtil.closeCache());
               executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
                   extraAuthzProps, tgen, rnd);
             }
@@ -387,11 +380,11 @@ public void testAllOpsNotifications() {
   @Override
   protected final void preTearDown() throws Exception {
     // close the clients first
-    client1.invoke(SecurityTestUtil.class, "closeCache");
-    client2.invoke(SecurityTestUtil.class, "closeCache");
+    client1.invoke(() -> SecurityTestUtil.closeCache());
+    client2.invoke(() -> SecurityTestUtil.closeCache());
     SecurityTestUtil.closeCache();
     // then close the servers
-    server1.invoke(SecurityTestUtil.class, "closeCache");
-    server2.invoke(SecurityTestUtil.class, "closeCache");
+    server1.invoke(() -> SecurityTestUtil.closeCache());
+    server2.invoke(() -> SecurityTestUtil.closeCache());
   }
 }
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
index e3931b04a6a9..7161830be732 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
@@ -78,14 +78,10 @@ public void setUp() throws Exception {
     client1 = host.getVM(2);
     client2 = host.getVM(3);
 
-    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] {serverExpectedExceptions});
-    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] {serverExpectedExceptions});
-    client1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] {clientExpectedExceptions});
-    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] {clientExpectedExceptions});
+    server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions(serverExpectedExceptions));
+    server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions(serverExpectedExceptions));
+    client1.invoke(() -> SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions));
+    client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions));
   }
 
   public static Integer createCacheServer(Object dsPort, Object locatorString,
@@ -148,12 +144,10 @@ private void setUpVMs(CredentialGenerator gen, Boolean multiUser) {
     Integer locPort1 = SecurityTestUtil.getLocatorPort();
     Integer locPort2 = SecurityTestUtil.getLocatorPort();
     String locString = SecurityTestUtil.getLocatorString();
-    Integer port1 = (Integer)server1.invoke(MultiuserAPIDUnitTest.class,
-        "createCacheServer", new Object[] {locPort1, locString, authenticator,
-            extraProps, javaProps});
-    Integer port2 = (Integer)server2.invoke(MultiuserAPIDUnitTest.class,
-        "createCacheServer", new Object[] {locPort2, locString, authenticator,
-            extraProps, javaProps});
+    Integer port1 = (Integer)server1.invoke(() -> MultiuserAPIDUnitTest.createCacheServer(locPort1, locString, authenticator,
+            extraProps, javaProps));
+    Integer port2 = (Integer)server2.invoke(() -> MultiuserAPIDUnitTest.createCacheServer(locPort2, locString, authenticator,
+            extraProps, javaProps));
 
     // Start the clients with valid credentials
     Properties credentials1 = gen.getValidCredentials(1);
@@ -166,25 +160,22 @@ private void setUpVMs(CredentialGenerator gen, Boolean multiUser) {
     LogWriterUtils.getLogWriter().info(
         "testValidCredentials: For second client credentials: " + credentials2
             + " : " + javaProps2);
-    client1.invoke(MultiuserAPIDUnitTest.class, "createCacheClient",
-        new Object[] {authInit, credentials1, javaProps1, port1, port2, null,
-            multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION)});
+    client1.invoke(() -> MultiuserAPIDUnitTest.createCacheClient(authInit, credentials1, javaProps1, port1, port2, null,
+            multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION)));
   }
 
   public void testSingleUserUnsupportedAPIs() {
       // Start servers
       // Start clients with multiuser-authentication set to false
       setUpVMs(new DummyCredentialGenerator(), Boolean.FALSE);
-      client1.invoke(MultiuserAPIDUnitTest.class, "verifyDisallowedOps",
-          new Object[] {Boolean.FALSE});
+      client1.invoke(() -> MultiuserAPIDUnitTest.verifyDisallowedOps(Boolean.FALSE));
   }
 
   public void testMultiUserUnsupportedAPIs() {
       // Start servers.
       // Start clients with multiuser-authentication set to true.
       setUpVMs(new DummyCredentialGenerator(), Boolean.TRUE);
-      client1.invoke(MultiuserAPIDUnitTest.class, "verifyDisallowedOps",
-          new Object[] {Boolean.TRUE});
+      client1.invoke(() -> MultiuserAPIDUnitTest.verifyDisallowedOps(Boolean.TRUE));
   }
 
   public static void verifyDisallowedOps(Boolean multiuserMode) {
@@ -383,10 +374,10 @@ public static void verifyDisallowedOps(Boolean multiuserMode) {
   @Override
   protected final void preTearDown() throws Exception {
     // close the clients first
-    client1.invoke(SecurityTestUtil.class, "closeCache");
-    client2.invoke(SecurityTestUtil.class, "closeCache");
+    client1.invoke(() -> SecurityTestUtil.closeCache());
+    client2.invoke(() -> SecurityTestUtil.closeCache());
     // then close the servers
-    server1.invoke(SecurityTestUtil.class, "closeCache");
-    server2.invoke(SecurityTestUtil.class, "closeCache");
+    server1.invoke(() -> SecurityTestUtil.closeCache());
+    server2.invoke(() -> SecurityTestUtil.closeCache());
   }
 }
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
index 23f496d5853e..9f9d4c0c4cd3 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
@@ -76,12 +76,9 @@ public void run() {
     client1 = host.getVM(2);
     client2 = host.getVM(3);
 
-    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { serverExpectedExceptions });
-    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
-        new Object[] { clientExpectedExceptions });
+    server1.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    server2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( serverExpectedExceptions ));
+    client2.invoke(() -> SecurityTestUtil.registerExpectedExceptions( clientExpectedExceptions ));
     SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
   }
 
@@ -202,11 +199,10 @@ private void doTest(Integer numOfUsers, Integer numOfPuts,
     Integer locatorPort = new Integer(AvailablePort
         .getRandomAvailablePort(AvailablePort.SOCKET));
     // Close down any running servers
-    server1.invoke(SecurityTestUtil.class, "closeCache");
-    server2.invoke(SecurityTestUtil.class, "closeCache");
+    server1.invoke(() -> SecurityTestUtil.closeCache());
+    server2.invoke(() -> SecurityTestUtil.closeCache());
 
-    server1.invoke(MultiuserDurableCQAuthzDUnitTest.class,
-        "createServerCache", new Object[] {serverProps, javaProps, locatorPort, port1});
+    server1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.createServerCache(serverProps, javaProps, locatorPort, port1));
     client1.invoke(MultiuserDurableCQAuthzDUnitTest.class,
         "createClientCache", new Object[] {javaProps2, authInit, authProps,
             new Integer[] {port1, port2}, numOfUsers, durableClientId, postAuthzAllowed});
@@ -215,44 +211,38 @@ private void doTest(Integer numOfUsers, Integer numOfPuts,
 //        new Object[] {authInit, client2Credentials, javaProps2,
 //            new Integer[] {port1, port2}, null, SecurityTestUtil.NO_EXCEPTION});
 
-    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "createCQ",
-        new Object[] {numOfUsers, Boolean.TRUE});
+    client1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.createCQ(numOfUsers, Boolean.TRUE));
     client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "executeCQ",
         new Object[] {numOfUsers, new Boolean[] {false, false}, numOfPuts,
             new String[numOfUsers]});
-    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "readyForEvents");
+    client1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.readyForEvents());
 
     if (keepAlive == null) {
-      client1.invoke(SecurityTestUtil.class, "closeCache");
+      client1.invoke(() -> SecurityTestUtil.closeCache());
     } else {
-      client1.invoke(SecurityTestUtil.class, "closeCache",
-          new Object[] {keepAlive});
+      client1.invoke(() -> SecurityTestUtil.closeCache(keepAlive));
     }
 
-    server1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "doPuts",
-        new Object[] {numOfPuts, Boolean.TRUE/* put last key */});
+    server1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.doPuts(numOfPuts, Boolean.TRUE/* put last key */));
 
     client1.invoke(MultiuserDurableCQAuthzDUnitTest.class,
         "createClientCache", new Object[] {javaProps2, authInit, authProps,
             new Integer[] {port1, port2}, numOfUsers, durableClientId, postAuthzAllowed});
-    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "createCQ",
-        new Object[] {numOfUsers, Boolean.TRUE});
+    client1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.createCQ(numOfUsers, Boolean.TRUE));
     client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "executeCQ",
         new Object[] {numOfUsers, new Boolean[] {false, false}, numOfPuts,
             new String[numOfUsers]});
-    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "readyForEvents");
+    client1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.readyForEvents());
 
     if (!postAuthzAllowed[0] || keepAlive == null || !keepAlive) {
       // Don't wait as no user is authorized to receive cq events.
       Thread.sleep(1000);
     } else {
-      client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "waitForLastKey",
-          new Object[] {Integer.valueOf(0), Boolean.TRUE});
+      client1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.waitForLastKey(Integer.valueOf(0), Boolean.TRUE));
     }
     Integer numOfCreates = (keepAlive == null) ? 0
         : (keepAlive) ? (numOfPuts + 1/* last key */) : 0;
-    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "checkCQListeners",
-        new Object[] {numOfUsers, postAuthzAllowed, numOfCreates, 0});
+    client1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.checkCQListeners(numOfUsers, postAuthzAllowed, numOfCreates, 0));
 
     client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "proxyCacheClose",
         new Object[] {new Integer[] {0, 1}, keepAlive});
@@ -260,25 +250,21 @@ private void doTest(Integer numOfUsers, Integer numOfPuts,
     client1.invoke(SecurityTestUtil.class, "createProxyCache",
         new Object[] {new Integer[] {0, 1}, authProps});
 
-    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "createCQ",
-        new Object[] {numOfUsers, Boolean.TRUE});
+    client1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.createCQ(numOfUsers, Boolean.TRUE));
     client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "executeCQ",
         new Object[] {numOfUsers, new Boolean[] {false, false}, numOfPuts,
             new String[numOfUsers]});
 
-    server1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "doPuts",
-        new Object[] {numOfPuts, Boolean.TRUE/* put last key */});
+    server1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.doPuts(numOfPuts, Boolean.TRUE/* put last key */));
 
     if (!postAuthzAllowed[0] || keepAlive == null || !keepAlive) {
       // Don't wait as no user is authorized to receive cq events.
       Thread.sleep(1000);
     } else {
-      client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "waitForLastKey",
-          new Object[] {Integer.valueOf(0), Boolean.FALSE});
+      client1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.waitForLastKey(Integer.valueOf(0), Boolean.FALSE));
     }
     Integer numOfUpdates = numOfPuts + 1;
-    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "checkCQListeners",
-        new Object[] {numOfUsers, postAuthzAllowed, 0, numOfUpdates});
+    client1.invoke(() -> MultiuserDurableCQAuthzDUnitTest.checkCQListeners(numOfUsers, postAuthzAllowed, 0, numOfUpdates));
   }
 
   public static void createServerCache(Properties serverProps,
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index 2d1e2cdc4556..cae30d2f52a5 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -100,22 +100,22 @@ public void testUpdateVersionAfterCreateWithSerialSender() {
     final String key = "key-1";
 
     // Site 1
-    Integer lnPort = (Integer)vm0.invoke(UpdateVersionDUnitTest.class, "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> UpdateVersionDUnitTest.createFirstLocatorWithDSId( 1 ));
 
-    vm0.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { lnPort});
-    vm0.invoke(UpdateVersionDUnitTest.class, "createSender", new Object[] { "ln1", 2, false, 10, 1, false, false, null, true });
+    vm0.invoke(() -> UpdateVersionDUnitTest.createCache( lnPort));
+    vm0.invoke(() -> UpdateVersionDUnitTest.createSender( "ln1", 2, false, 10, 1, false, false, null, true ));
     
-    vm0.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "ln1", 1, 1});
-    vm0.invoke(UpdateVersionDUnitTest.class, "startSender", new Object[] { "ln1" });
-    vm0.invoke(UpdateVersionDUnitTest.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    vm0.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "ln1", 1, 1));
+    vm0.invoke(() -> UpdateVersionDUnitTest.startSender( "ln1" ));
+    vm0.invoke(() -> UpdateVersionDUnitTest.waitForSenderRunningState( "ln1" ));
 
     //Site 2
-    Integer nyPort = (Integer)vm2.invoke(UpdateVersionDUnitTest.class, "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer nyRecPort = (Integer) vm2.invoke(UpdateVersionDUnitTest.class, "createReceiver", new Object[] { nyPort });
+    Integer nyPort = (Integer)vm2.invoke(() -> UpdateVersionDUnitTest.createFirstRemoteLocator( 2, lnPort ));
+    Integer nyRecPort = (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createReceiver( nyPort ));
 
-    vm2.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});
-    vm3.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { nyPort});
-    vm3.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});    
+    vm2.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
+    vm3.invoke(() -> UpdateVersionDUnitTest.createCache( nyPort));
+    vm3.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));    
     
     final VersionTag tag = (VersionTag) vm0.invoke(new SerializableCallable("Update a single entry and get its version") {
       
@@ -238,22 +238,22 @@ public void testUpdateVersionAfterCreateWithSerialSenderOnDR() {
     final String key = "key-1";
 
     // Site 1
-    Integer lnPort = (Integer)vm0.invoke(UpdateVersionDUnitTest.class, "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> UpdateVersionDUnitTest.createFirstLocatorWithDSId( 1 ));
 
-    vm0.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { lnPort});
-    vm0.invoke(UpdateVersionDUnitTest.class, "createSender", new Object[] { "ln1", 2, false, 10, 1, false, false, null, true });
+    vm0.invoke(() -> UpdateVersionDUnitTest.createCache( lnPort));
+    vm0.invoke(() -> UpdateVersionDUnitTest.createSender( "ln1", 2, false, 10, 1, false, false, null, true ));
     
-    vm0.invoke(UpdateVersionDUnitTest.class, "createReplicatedRegion", new Object[] {regionName, "ln1"});
-    vm0.invoke(UpdateVersionDUnitTest.class, "startSender", new Object[] { "ln1" });
-    vm0.invoke(UpdateVersionDUnitTest.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    vm0.invoke(() -> UpdateVersionDUnitTest.createReplicatedRegion(regionName, "ln1"));
+    vm0.invoke(() -> UpdateVersionDUnitTest.startSender( "ln1" ));
+    vm0.invoke(() -> UpdateVersionDUnitTest.waitForSenderRunningState( "ln1" ));
 
     //Site 2
-    Integer nyPort = (Integer)vm2.invoke(UpdateVersionDUnitTest.class, "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer nyRecPort = (Integer) vm2.invoke(UpdateVersionDUnitTest.class, "createReceiver", new Object[] { nyPort });
+    Integer nyPort = (Integer)vm2.invoke(() -> UpdateVersionDUnitTest.createFirstRemoteLocator( 2, lnPort ));
+    Integer nyRecPort = (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createReceiver( nyPort ));
 
-    vm2.invoke(UpdateVersionDUnitTest.class, "createReplicatedRegion", new Object[] {regionName, ""});
-    vm3.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { nyPort });
-    vm3.invoke(UpdateVersionDUnitTest.class, "createReplicatedRegion", new Object[] {regionName, ""});    
+    vm2.invoke(() -> UpdateVersionDUnitTest.createReplicatedRegion(regionName, ""));
+    vm3.invoke(() -> UpdateVersionDUnitTest.createCache( nyPort ));
+    vm3.invoke(() -> UpdateVersionDUnitTest.createReplicatedRegion(regionName, ""));    
     
     final VersionTag tag = (VersionTag) vm0.invoke(new SerializableCallable("Update a single entry and get its version") {
       
@@ -361,25 +361,25 @@ public void testUpdateVersionAfterCreateWithParallelSender() {
     VM vm3 = host.getVM(3); // server2 site2
 
     // Site 1
-    Integer lnPort = (Integer)vm0.invoke(UpdateVersionDUnitTest.class, "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> UpdateVersionDUnitTest.createFirstLocatorWithDSId( 1 ));
 
     final String key = "key-1";
 
-    vm0.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { lnPort});
-    vm0.invoke(UpdateVersionDUnitTest.class, "createSender", new Object[] { "ln1", 2, true, 10, 1, false, false, null, true });
+    vm0.invoke(() -> UpdateVersionDUnitTest.createCache( lnPort));
+    vm0.invoke(() -> UpdateVersionDUnitTest.createSender( "ln1", 2, true, 10, 1, false, false, null, true ));
     
-    vm0.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "ln1", 1, 1});
-    vm0.invoke(UpdateVersionDUnitTest.class, "startSender", new Object[] { "ln1" });
-    vm0.invoke(UpdateVersionDUnitTest.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    vm0.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "ln1", 1, 1));
+    vm0.invoke(() -> UpdateVersionDUnitTest.startSender( "ln1" ));
+    vm0.invoke(() -> UpdateVersionDUnitTest.waitForSenderRunningState( "ln1" ));
     
     //Site 2
-    Integer nyPort = (Integer)vm2.invoke(UpdateVersionDUnitTest.class, "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer nyRecPort = (Integer) vm2.invoke(UpdateVersionDUnitTest.class, "createReceiver", new Object[] { nyPort });
+    Integer nyPort = (Integer)vm2.invoke(() -> UpdateVersionDUnitTest.createFirstRemoteLocator( 2, lnPort ));
+    Integer nyRecPort = (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createReceiver( nyPort ));
 
-    vm2.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});
+    vm2.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
 
-    vm3.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { nyPort});
-    vm3.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});
+    vm3.invoke(() -> UpdateVersionDUnitTest.createCache( nyPort));
+    vm3.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
     
     final VersionTag tag = (VersionTag) vm0.invoke(new SerializableCallable("Put a single entry and get its version") {
       
@@ -500,25 +500,25 @@ public void testUpdateVersionAfterCreateWithConcurrentSerialSender() {
     VM vm3 = host.getVM(3); // server2 site2
 
     // Site 1
-    Integer lnPort = (Integer)vm0.invoke(UpdateVersionDUnitTest.class, "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> UpdateVersionDUnitTest.createFirstLocatorWithDSId( 1 ));
 
     final String key = "key-1";
 
-    vm0.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { lnPort });
-    vm0.invoke(UpdateVersionDUnitTest.class, "createConcurrentSender", new Object[] { "ln1", 2, false, 10, 2, false, false, null, true, 2 });
+    vm0.invoke(() -> UpdateVersionDUnitTest.createCache( lnPort ));
+    vm0.invoke(() -> UpdateVersionDUnitTest.createConcurrentSender( "ln1", 2, false, 10, 2, false, false, null, true, 2 ));
     
-    vm0.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "ln1", 1, 1});
-    vm0.invoke(UpdateVersionDUnitTest.class, "startSender", new Object[] { "ln1" });
-    vm0.invoke(UpdateVersionDUnitTest.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    vm0.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "ln1", 1, 1));
+    vm0.invoke(() -> UpdateVersionDUnitTest.startSender( "ln1" ));
+    vm0.invoke(() -> UpdateVersionDUnitTest.waitForSenderRunningState( "ln1" ));
     
     //Site 2
-    Integer nyPort = (Integer)vm2.invoke(UpdateVersionDUnitTest.class, "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer nyRecPort = (Integer) vm2.invoke(UpdateVersionDUnitTest.class, "createReceiver", new Object[] { nyPort });
+    Integer nyPort = (Integer)vm2.invoke(() -> UpdateVersionDUnitTest.createFirstRemoteLocator( 2, lnPort ));
+    Integer nyRecPort = (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createReceiver( nyPort ));
 
-    vm2.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});
+    vm2.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
 
-    vm3.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { nyPort });
-    vm3.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});    
+    vm3.invoke(() -> UpdateVersionDUnitTest.createCache( nyPort ));
+    vm3.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));    
     
     final VersionTag tag = (VersionTag) vm0.invoke(new SerializableCallable("Put a single entry and get its version") {
       
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 17afcbbbcda4..374d9294f764 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -5121,14 +5121,14 @@ public boolean equals(Object obj){
  @Override
  protected final void preTearDown() throws Exception {
     cleanupVM();
-    vm0.invoke(WANTestBase.class, "cleanupVM");
-    vm1.invoke(WANTestBase.class, "cleanupVM");
-    vm2.invoke(WANTestBase.class, "cleanupVM");
-    vm3.invoke(WANTestBase.class, "cleanupVM");
-    vm4.invoke(WANTestBase.class, "cleanupVM");
-    vm5.invoke(WANTestBase.class, "cleanupVM");
-    vm6.invoke(WANTestBase.class, "cleanupVM");
-    vm7.invoke(WANTestBase.class, "cleanupVM");
+    vm0.invoke(() -> WANTestBase.cleanupVM());
+    vm1.invoke(() -> WANTestBase.cleanupVM());
+    vm2.invoke(() -> WANTestBase.cleanupVM());
+    vm3.invoke(() -> WANTestBase.cleanupVM());
+    vm4.invoke(() -> WANTestBase.cleanupVM());
+    vm5.invoke(() -> WANTestBase.cleanupVM());
+    vm6.invoke(() -> WANTestBase.cleanupVM());
+    vm7.invoke(() -> WANTestBase.cleanupVM());
   }
   
   public static void cleanupVM() throws IOException {
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 dbdff58cdde7..54b64311dfe3 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
@@ -55,102 +55,84 @@ public void setUp() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationConcurrentArtifacts() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+
+    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" ));
     
     try {
       // set the test hook to find out dispacthed events by each of the
       // concurrent dispatcher
-      vm4.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook",
-          new Object[] {"ln", Boolean.TRUE });
-      vm5.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook",
-          new Object[] {"ln", Boolean.TRUE });
-      vm6.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook",
-          new Object[] {"ln", Boolean.TRUE });
-      vm7.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook",
-          new Object[] {"ln", Boolean.TRUE });
-
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-          1000 });
+      vm4.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.TRUE ));
+      vm5.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.TRUE ));
+      vm6.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.TRUE ));
+      vm7.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.TRUE ));
+
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+          1000 ));
 
       // 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" });
-
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_PR", 1000 });
-
-      int dispatched1 = (Integer)vm4.invoke(WANTestBase.class,
-          "verifyAndGetEventsDispatchedByConcurrentDispatchers",
-          new Object[] { "ln" });
-      int dispatched2 = (Integer)vm5.invoke(WANTestBase.class,
-          "verifyAndGetEventsDispatchedByConcurrentDispatchers",
-          new Object[] { "ln" });
-      int dispatched3 = (Integer)vm6.invoke(WANTestBase.class,
-          "verifyAndGetEventsDispatchedByConcurrentDispatchers",
-          new Object[] { "ln" });
-      int dispatched4 = (Integer)vm7.invoke(WANTestBase.class,
-          "verifyAndGetEventsDispatchedByConcurrentDispatchers",
-          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.validateRegionSize(
+          getTestMethodName() + "_PR", 1000 ));
+
+      int dispatched1 = (Integer)vm4.invoke(() -> WANTestBase.verifyAndGetEventsDispatchedByConcurrentDispatchers( "ln" ));
+      int dispatched2 = (Integer)vm5.invoke(() -> WANTestBase.verifyAndGetEventsDispatchedByConcurrentDispatchers( "ln" ));
+      int dispatched3 = (Integer)vm6.invoke(() -> WANTestBase.verifyAndGetEventsDispatchedByConcurrentDispatchers( "ln" ));
+      int dispatched4 = (Integer)vm7.invoke(() -> WANTestBase.verifyAndGetEventsDispatchedByConcurrentDispatchers( "ln" ));
 
       assertEquals(1000, dispatched1 + dispatched2 + dispatched3 + dispatched4);
     }
     finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook", new Object[] {"ln", Boolean.FALSE });
-      vm5.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook", new Object[] {"ln", Boolean.FALSE });
-      vm6.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook", new Object[] {"ln", Boolean.FALSE });
-      vm7.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook", new Object[] {"ln", Boolean.FALSE });
+      vm4.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.FALSE ));
+      vm5.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.FALSE ));
+      vm6.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.FALSE ));
+      vm7.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.FALSE ));
     }
   }
   
@@ -159,65 +141,63 @@ public void testParallelPropagationConcurrentArtifacts() throws Exception {
    * @throws Exception
    */
   public void 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 });
-
-    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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+
+    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, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
     
     //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", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
   
   
@@ -226,65 +206,63 @@ public void testParallelPropagation() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationWithUnEqualBucketDivison() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION ));
+
+    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, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
     
     //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", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
   
   
@@ -294,151 +272,141 @@ public void testParallelPropagationWithUnEqualBucketDivison() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagation_withoutRemoteSite() 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 ));
     
-    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 ));
 
     //keep a larger batch to minimize number of exception occurrences in the log
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION });
-
-    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" });
-
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
-    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
-    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION ));
+
+    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" ));
+
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false ));
+    vm6.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false ));
+    vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false ));
     
     //make sure all the senders are running before doing any puts
-    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() + "_PR",
-      1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      1000 ));
 
     
-    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 ));
     
-    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() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
     
     //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"));
     
     // Just making sure that though the remote site is started later,
     // remote site is still able to get the data. Since the receivers are
     // 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[] {
-        getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
   
   /**
    * Testing for colocated region with orderpolicy Partition
    */
   public void testParallelPropogationColocatedPartitionedRegions() {
-    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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
-
-
-    vm4.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-            "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-            "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-            "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-            "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,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-            "ln", 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-            "ln", 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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
+
+
+    vm4.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
+            "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
+            "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
+            "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
+            "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.createCustomerOrderShipmentPartitionedRegion( null,
+            "ln", 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
+            "ln", 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, "putcolocatedPartitionedRegion", new Object[] { 1000 });
+    vm4.invoke(() -> WANTestBase.putcolocatedPartitionedRegion( 1000 ));
     
     //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"});
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      customerRegionName, 1000 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      orderRegionName, 1000 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      shipmentRegionName, 1000 });
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      customerRegionName, 1000 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      orderRegionName, 1000 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      shipmentRegionName, 1000 ));
   }
   
   /**
@@ -451,124 +419,122 @@ public void testParallelPropogationColocatedPartitionedRegions() {
    * @throws Exception
    */
   public void testParallelPropagationWithLocalCacheClosedAndRebuilt() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION});
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION ));
+
+    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.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      1000 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-              getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      1000 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+              getTestMethodName() + "_PR", 1000 ));
     //-------------------Close and rebuild local site ---------------------------------
 
-    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());
     
     Integer regionSize = 
-      (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_PR" });
+      (Integer) vm2.invoke(() -> WANTestBase.getRegionSize(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 });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
-
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", 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" });
-
-    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.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION ));
+
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm6.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", 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" ));
+
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     //------------------------------------------------------------------------------------
     
     IgnoredException.addIgnoredException(EntryExistsException.class.getName());
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 10000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 10000 ));
     
     //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"});
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 10000 });
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 10000 ));
   }
   
   /**
@@ -577,57 +543,49 @@ public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws Excep
    * @throws Exception
    */
   public void testParallelColocatedPropagation() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-
-    vm4.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "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, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
+    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+
+    vm4.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "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.createColocatedPartitionedRegions( getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
     
     //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(), 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
   }
   
   
@@ -637,198 +595,182 @@ public void testParallelColocatedPropagation() throws Exception {
    * @throws Exception
    */
   public void testParallelColocatedPropagationOrderPolicyPartition() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
-
-    vm4.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "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, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), null, 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
+    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION ));
+
+    vm4.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "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.createColocatedPartitionedRegions( getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
     
     //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(), 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
   }
   
   public void testPartitionedParallelPropagationHA() throws Exception {
     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,
-        "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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 2, 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() });
-
-    AsyncInvocation inv1 = vm7.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_PR", 5000 });
+    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY ));
+
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm6.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 2, 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() ));
+
+    AsyncInvocation inv1 = vm7.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 5000 ));
     Wait.pause(500);
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_PR", 10000 });
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 10000 ));
     Wait.pause(1500);
-    AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender");
+    AsyncInvocation inv4 = vm5.invokeAsync(() -> WANTestBase.killSender());
     inv1.join();
     inv2.join();
     inv3.join();
     inv4.join();
     
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 10000 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 10000 });
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 10000 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+      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"});
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10000 ));
   }
   
   public void testWANPDX_PR_MultipleVM_ConcurrentParallelSender() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm3.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 2, isOffHeap()});
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 2, isOffHeap()));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()});
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()});
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      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.startSender( "ln" ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        10 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 10 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 10 ));
   }
   
   public void testWANPDX_PR_MultipleVM_ConcurrentParallelSender_StartedLater() {
-    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_PDX", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver_PDX( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
+    vm4.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm3.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 2, isOffHeap()});
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 2, isOffHeap()));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()});
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()});
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap()));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        10 ));
 
-    AsyncInvocation inv1 = vm3.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation inv1 = vm3.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
     
     try{
       inv1.join();
@@ -838,11 +780,11 @@ public void testWANPDX_PR_MultipleVM_ConcurrentParallelSender_StartedLater() {
       fail("Caught interrupted exception");
     }
     
-    vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-      40 });
+    vm4.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+      40 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 40 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 40 ));
   }
 
   public static void setTestHook(String senderId, boolean hook) {
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 1ed4d1b3e5ad..ed48b15a507d 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
@@ -42,111 +42,107 @@ public void setUp() throws Exception {
   }
   
   public void testParallelGatewaySenderWithoutStarting() {
-    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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-
-    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() });
-
-    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, "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[] {getTestMethodName() + "_PR", 0 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 0 });
+    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY ));
+
+    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() ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
+    
+    vm4.invoke(() -> WANTestBase.verifySenderStoppedState( "ln" ));
+    vm5.invoke(() -> WANTestBase.verifySenderStoppedState( "ln" ));
+    vm6.invoke(() -> WANTestBase.verifySenderStoppedState( "ln" ));
+    vm7.invoke(() -> WANTestBase.verifySenderStoppedState( "ln" ));
+    
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 0 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 0 ));
   }
   
   /**
    * Defect 44323 (ParallelGatewaySender should not be started on Accessor node)
    */
   public void testParallelGatewaySenderStartOnAccessorNode() {
-    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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-
-    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, "createPartitionedRegionAsAccessor", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 100 });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 100 });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegionAsAccessor(
+        getTestMethodName() + "_PR", "ln", 1, 100 ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegionAsAccessor(
+        getTestMethodName() + "_PR", "ln", 1, 100 ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
     
     //start the senders
-    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.pause(2000);
     
-    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
 
-    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
-    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 1000 ));
   }
 
   
@@ -155,67 +151,65 @@ public void testParallelGatewaySenderStartOnAccessorNode() {
    * @throws Exception
    */
   public void testParallelPropagationSenderPause() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
+
+    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() ));
 
     //make sure all the senders are running before doing any puts
-    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" ));
     
     //FIRST RUN: now, the senders are started. So, start the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     Wait.pause(2000);
     //SECOND RUN: keep one thread doing puts to the region
-    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invokeAsync(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 100 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 100 ));
   }
 
   /**
@@ -223,80 +217,78 @@ public void testParallelPropagationSenderPause() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationSenderResume() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY ));
+
+    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() ));
 
     //make sure all the senders are running before doing any puts
-    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" ));
     
     //now, the senders are started. So, start the puts
-    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     
     //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" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     //sleep for a second or two
     Wait.pause(2000);
     
     //resume the senders
-    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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
     Wait.pause(2000);
     
-    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"));
     
     //find the region size on remote vm
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 1000 ));
  
   }
   
@@ -308,59 +300,57 @@ public void testParallelPropagationSenderResume() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationSenderResumeNegativeScenario() 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 });
-
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-
-    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() });
-
-    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 ));
+
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
   
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //wait till the senders are running
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 
     //start the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 100 ));
 
     //let the queue drain completely
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln", 0 ));
     
     //stop the senders
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
     
     //now, try to resume a stopped sender
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
     //do more puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 100 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 100 ));
   }
 
   /**
@@ -368,142 +358,138 @@ public void testParallelPropagationSenderResumeNegativeScenario() throws Excepti
    * @throws Exception
    */
   public void testParallelPropagationSenderStop() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY ));
+
+    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() ));
 
     //make sure all the senders are running before doing any puts
-    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" ));
     
     //FIRST RUN: now, the senders are started. So, do some of the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 100 ));
     
     //now, stop all of the senders
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.stopSender( "ln" ));
     
     //SECOND RUN: keep one thread doing puts
-    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invokeAsync(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 100 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 100 ));
   }
 
   /**
    * Normal scenario in which a sender is stopped and then started again.
    */
   public void testParallelPropagationSenderStartAfterStop() throws Throwable {
-    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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+
+    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() ));
 
     //make sure all the senders are running before doing any puts
-    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" ));
     
     //FIRST RUN: now, the senders are started. So, do some of the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 200 ));
     
     //now, stop all of the senders
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.stopSender( "ln" ));
     
     Wait.pause(2000);
 
     //SECOND RUN: do some of the puts after the senders are stopped
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
     
     //start the senders again
-    AsyncInvocation vm4start = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation vm5start = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation vm6start = vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation vm7start = vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm4start = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation vm5start = vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation vm6start = vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation vm7start = vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
     int START_TIMEOUT = 30000;
     vm4start.getResult(START_TIMEOUT);
     vm5start.getResult(START_TIMEOUT);
@@ -511,25 +497,25 @@ public void testParallelPropagationSenderStartAfterStop() throws Throwable {
     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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
 
     //SECOND RUN: do some more puts
-    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    AsyncInvocation async = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     async.join();
     
     //verify all the buckets on all the sender nodes are drained
-    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"));
     
     //verify the events propagate to remote site
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 1000 ));
     
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm6.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm7.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+    vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+    vm6.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+    vm7.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
   }
 
   /**
@@ -539,86 +525,84 @@ public void testParallelPropagationSenderStartAfterStop() throws Throwable {
    * @throws Exception
    */
   public void Bug47553_testParallelPropagationSenderStartAfterStop_Scenario2() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY ));
+
+    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() ));
 
     //make sure all the senders are running before doing any puts
-    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 started");
     
     //FIRST RUN: now, the senders are started. So, do some of the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 200 ));
     
     LogWriterUtils.getLogWriter().info("Done few puts");
     
     //now, stop all of the senders
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.stopSender( "ln" ));
     
     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[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
     
     //SECOND RUN: start async puts on region
-    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 });
+    AsyncInvocation async = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 5000 ));
     LogWriterUtils.getLogWriter().info("Started high number of puts by async thread");
 
     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" });
+    vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
 
     LogWriterUtils.getLogWriter().info("All the senders are started");
     
@@ -627,13 +611,13 @@ public void Bug47553_testParallelPropagationSenderStartAfterStop_Scenario2() thr
     Wait.pause(2000);
     
     //verify all the buckets on all the sender nodes are drained
-    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"));
     
     //verify that the queue size ultimately becomes zero. That means all the events propagate to remote site.
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln", 0 ));
   }
   
   /**
@@ -641,76 +625,74 @@ public void Bug47553_testParallelPropagationSenderStartAfterStop_Scenario2() thr
    * @throws Exception
    */
   public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws Throwable {
-    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, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-
-    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, "createPartitionedRegionAsAccessor", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 100});
-    vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 100});
-
-    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.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegionAsAccessor(
+        getTestMethodName() + "_PR", "ln", 1, 100));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegionAsAccessor(
+        getTestMethodName() + "_PR", "ln", 1, 100));
+
+    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() ));
 
     //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" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
-    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
     //FIRST RUN: now, the senders are started. So, do some of the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 200 ));
     
     //now, stop all of the senders
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.stopSender( "ln" ));
     
     Wait.pause(2000);
     
     //SECOND RUN: do some of the puts after the senders are stopped
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
     
     //start the senders again
-    AsyncInvocation vm4start = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation vm5start = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation vm6start = vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation vm7start = vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm4start = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation vm5start = vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation vm6start = vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation vm7start = vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
     int START_TIMEOUT = 30000;
     vm4start.getResult(START_TIMEOUT);
     vm5start.getResult(START_TIMEOUT);
@@ -718,19 +700,19 @@ public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws T
     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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
 
     //SECOND RUN: do some more puts
-    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    AsyncInvocation async = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     async.join();
     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"});
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
     
     //verify the events propagate to remote site
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 1000 ));
   }
 
   
@@ -739,96 +721,93 @@ public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws T
    * is tested
    */
   public void testStartPauseResumeParallelGatewaySender() 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 ));
 
     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 });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
     
     LogWriterUtils.getLogWriter().info("Created senders on local site");
     
-    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.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() ));
 
     LogWriterUtils.getLogWriter().info("Created PRs on local site");
     
-    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() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
     LogWriterUtils.getLogWriter().info("Created PRs on remote site");
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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.
     //Start the senders in async threads, so colocation of shadowPR will be complete and 
     //missing buckets will be created in PRHARedundancyProvider.createMissingBuckets().
-    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" ));
     
-    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("Started senders on local site");
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Paused senders on local site");
     
-    vm4.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.verifySenderPausedState( "ln" ));
+    vm5.invoke(() -> WANTestBase.verifySenderPausedState( "ln" ));
+    vm6.invoke(() -> WANTestBase.verifySenderPausedState( "ln" ));
+    vm7.invoke(() -> WANTestBase.verifySenderPausedState( "ln" ));
     
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_PR", 1000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( 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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Resumed senders on local site");
 
-    vm4.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.verifySenderResumedState( "ln" ));
+    vm5.invoke(() -> WANTestBase.verifySenderResumedState( "ln" ));
+    vm6.invoke(() -> WANTestBase.verifySenderResumedState( "ln" ));
+    vm7.invoke(() -> WANTestBase.verifySenderResumedState( "ln" ));
 
     try {
       inv1.join();
@@ -838,14 +817,14 @@ public void testStartPauseResumeParallelGatewaySender() throws Exception {
     }
     
     //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"});
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 5000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 5000 });
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 5000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 5000 ));
   }
 }
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 4e748224ed54..a387e2969908 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
@@ -125,8 +125,7 @@ public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultenuousPut_
 
       vm4.invoke(() -> resumeSender("ln"));
 
-      AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
-          "doPutsFrom", new Object[] { getTestMethodName() + "_PR", 10, 101 });
+      AsyncInvocation putAsync = vm4.invokeAsync(() -> WANTestBase.doPutsFrom( getTestMethodName() + "_PR", 10, 101 ));
       try {
         putAsync.join();
       } catch (InterruptedException e) {
@@ -172,16 +171,14 @@ public void testParallelGatewaySender_SingleNode_UserPR_Destroy_NodeDown()
 
       createReceiverAndDoPutsInPausedSender(nyPort);
 
-      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-      vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-      vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+      vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+      vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+      vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
 
       Wait.pause(200);
-      AsyncInvocation localDestroyAsync = vm4.invokeAsync(WANTestBase.class,
-          "destroyRegion", new Object[] { getTestMethodName() + "_PR" });
+      AsyncInvocation localDestroyAsync = vm4.invokeAsync(() -> WANTestBase.destroyRegion( getTestMethodName() + "_PR" ));
 
-      AsyncInvocation closeAsync = vm4.invokeAsync(WANTestBase.class,
-          "closeCache");
+      AsyncInvocation closeAsync = vm4.invokeAsync(() -> WANTestBase.closeCache());
       try {
         localDestroyAsync.join();
         closeAsync.join();
@@ -209,11 +206,8 @@ public void testParallelGatewaySender_SingleNode_UserPR_Close_SimultenuousPut_Re
 
       createReceiverAndDoPutsInPausedSender(nyPort);
 
-      AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
-          "doPutsFrom", new Object[] { getTestMethodName() + "_PR", 10, 2000 });
-      AsyncInvocation localDestroyAsync = vm4.invokeAsync(
-          ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "closeRegion", new Object[] { getTestMethodName() + "_PR" });
+      AsyncInvocation putAsync = vm4.invokeAsync(() -> WANTestBase.doPutsFrom( getTestMethodName() + "_PR", 10, 2000 ));
+      AsyncInvocation localDestroyAsync = vm4.invokeAsync(() -> ConcurrentParallelGatewaySenderOperation_2_DUnitTest.closeRegion( getTestMethodName() + "_PR" ));
       try {
         putAsync.join();
         localDestroyAsync.join();
@@ -295,8 +289,7 @@ public void testParallelGatewaySender_MultipleNode_UserPR_localDestroy_Recreate(
       String regionName = getTestMethodName() + "_PR";
       vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
 
-      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-          new Object[] { regionName, 10 });
+      AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( regionName, 10 ));
       Wait.pause(1000);
       vm5.invoke(() -> localDestroyRegion(regionName));
 
@@ -335,17 +328,15 @@ public void testParallelGatewaySenders_MultiplNode_UserPR_localDestroy_Recreate(
       createAndStartTwoSenders(vm5, lnPort, 4);
 
       String regionName = getTestMethodName() + "_PR";
-      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          regionName, null, 1, 100, isOffHeap() });
-      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          regionName, null, 1, 100, isOffHeap() });
+      vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+          regionName, null, 1, 100, isOffHeap() ));
+      vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+          regionName, null, 1, 100, isOffHeap() ));
 
-      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-          new Object[] { regionName, 10 });
+      AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( regionName, 10 ));
 
       Wait.pause(1000);
-      vm5.invoke(WANTestBase.class, "localDestroyRegion",
-          new Object[] { regionName });
+      vm5.invoke(() -> WANTestBase.localDestroyRegion( regionName ));
 
       try {
         inv1.join();
@@ -356,11 +347,11 @@ public void testParallelGatewaySenders_MultiplNode_UserPR_localDestroy_Recreate(
 
       validateRegionSizes(regionName, 10, vm4, vm6, vm7);
 
-      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          regionName, "ln1,ln2", 1, 100, isOffHeap() });
+      vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+          regionName, "ln1,ln2", 1, 100, isOffHeap() ));
 
-      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
-          regionName, 10, 20 });
+      vm4.invoke(() -> WANTestBase.doPutsFrom(
+          regionName, 10, 20 ));
 
       validateRegionSizes(regionName, 20, vm4, vm6, vm7);
     } finally {
@@ -384,8 +375,7 @@ public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy()
 
       vm2.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, null, 1, 100, isOffHeap()));
 
-      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
-          "putcolocatedPartitionedRegion", new Object[] { 10 });
+      AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.putcolocatedPartitionedRegion( 10 ));
       Wait.pause(1000);
 
       try {
@@ -412,7 +402,7 @@ public void testParallelGatewaySender_ColocatedPartitionedRegions_destroy() thro
     Integer lnPort = locatorPorts[0];
     Integer nyPort = locatorPorts[1];
 
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     try {
       createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 6, true);
@@ -420,17 +410,14 @@ public void testParallelGatewaySender_ColocatedPartitionedRegions_destroy() thro
 
       LogWriterUtils.getLogWriter().info("Created PRs on local site");
 
-      vm2.invoke(WANTestBase.class,
-          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-              null, 1, 100, isOffHeap() });
+      vm2.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
+              null, 1, 100, isOffHeap() ));
 
-      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
-          "putcolocatedPartitionedRegion", new Object[] { 2000 });
+      AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.putcolocatedPartitionedRegion( 2000 ));
       Wait.pause(1000);
 
       try {
-        vm5.invoke(WANTestBase.class, "destroyRegion",
-            new Object[] { customerRegionName });
+        vm5.invoke(() -> WANTestBase.destroyRegion( customerRegionName ));
       } catch (Exception ex) {
         assertTrue(ex.getCause() instanceof IllegalStateException);
         return;
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 c6123be17ebf..000ddf0571a0 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
@@ -49,106 +49,100 @@ public ConcurrentWANPropogation_1_DUnitTest(String name) {
    * @throws Exception
    */
   public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     
-    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 ));
 
     //keep the batch size high enough to reduce the number of exceptions in the log
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 400, false, false, null, true, 4, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 400, false, false, null, true, 4, OrderPolicy.KEY });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 400, false, false, null, true, 4, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 400, false, false, null, true, 4, OrderPolicy.KEY ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-      1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+      1000 ));
     
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
   
-    vm2.invoke(WANTestBase.class, "createReceiver2",
-        new Object[] {nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver2",
-        new Object[] {nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver2(nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver2(nyPort ));
     
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
   
   public void testReplicatedSerialPropagation() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
   
   
@@ -156,95 +150,93 @@ public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throw
     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,
-        "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, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", 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.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
     
     //---------close local site and build again-----------------------------------------
-    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( ));
     
     Integer regionSize = 
-      (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_RR" });
+      (Integer) vm2.invoke(() -> WANTestBase.getRegionSize(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 });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-      false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-      false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+      false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+      false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
   
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
     
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
     IgnoredException.addIgnoredException(EntryExistsException.class.getName());
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-      1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+      1000 ));
     //----------------------------------------------------------------------------------
 
     //verify remote site receives all the events
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
   
   /**
@@ -255,69 +247,67 @@ public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throw
    * @throws Exception
    */
   public void testReplicatedSerialPropagationWithLocalRegionDestroy() 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 ));
 
     //these are part of 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 ));
 
     //these are part of 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 ));
 
     //senders are created on local site
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 20, false, false, null, true, 3, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 20, false, false, null, true ,3, OrderPolicy.THREAD});
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 20, false, false, null, true, 3, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 20, false, false, null, true ,3, OrderPolicy.THREAD));
 
     //create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
 
     //create another RR (RR_2) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
     
     //start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
 
     //create another RR (RR_2) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
     
     //start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1", 1000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
     //do puts in RR_2 in main thread
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_2", 500 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_2", 500 ));
     //destroy RR_2 after above puts are complete
-    vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_2"});
+    vm4.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_2"));
     
     try {
       inv1.join();
@@ -327,11 +317,11 @@ public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Excep
     }
     //sleep for some time to let all the events propagate to remote site
     Thread.sleep(20);
-    //vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_2", 500 });
+    //vm4.invoke(() -> WANTestBase.verifyQueueSize( "ln", 0 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_2", 500 ));
   }
 
   /**
@@ -342,54 +332,52 @@ public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Excep
    * @throws Exception
    */
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy() 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 ));
 
     //these are part of 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 ));
 
     //these are part of 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 ));
 
     //senders are created on local site
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY });
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY ));
 
     //create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
 
     //start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
 
     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[] { getTestMethodName() + "_RR_1", 10000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 10000 ));
     //destroy RR_1 in remote site
-    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_1"});
+    vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_1"));
     
     try {
       inv1.join();
@@ -399,13 +387,13 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exce
     }
 
     //verify that all is well in local site. All the events should be present in local region
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 10000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        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 
     //more in depth validations.
-    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmptyForConcurrentSender", new Object[] {"ln" });
+    vm4.invoke(() -> WANTestBase.verifyRegionQueueNotEmptyForConcurrentSender("ln" ));
   }
   
   /**
@@ -416,74 +404,72 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exce
    * @throws Exception
    */
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() 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 ));
 
     //these are part of 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 ));
 
     //these are part of 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 ));
 
     //senders are created on local site
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD ));
 
     //create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
 
     //create another RR (RR_2) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
     
     //start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
 
     //create another RR (RR_2) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
     //destroy RR_2 on remote site in the middle
-    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_2"});
+    vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_2"));
     
     //expected exceptions in the logs
     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[] { getTestMethodName() + "_RR_2", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_2", 1000 ));
     
     //start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1", 1000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
    
     try {
       inv1.join();
@@ -493,87 +479,81 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() throws Exc
     }
     //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[] {
-        getTestMethodName() + "_RR_1", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 1000 ));
 
   }
 
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
       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 ));
     // these are part of 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 ));
 
     // these are part of 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 ));
 
     // senders are created on local site
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD ));
 
     // create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
 
     // create another RR (RR_2) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
 
     // start the senders on local site
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException",
-        new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException",
-        new Object[] { "ln", true });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
 
     // start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     // create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
 
     // create another RR (RR_2) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
 
     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[] { getTestMethodName() + "_RR_1", 1000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
     // start puts in RR_2 in another thread
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_2", 1000 });
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_2", 1000 ));
     // destroy RR_2 on remote site in the middle
-    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName()
-        + "_RR_2" });
+    vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName()
+        + "_RR_2" ));
 
     try {
       inv1.join();
@@ -586,8 +566,8 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
     // in it
     // in local site
     try {
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR_1", 1000 });
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR_1", 1000 ));
     } finally {
       System.setProperty(
           "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
index 63ab79ed6275..c534b6690081 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
@@ -46,153 +46,145 @@ public ConcurrentWANPropogation_2_DUnitTest(String name) {
   
   public void testSerialReplicatedWanWithOverflow() {
 
-    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 ));
 
     //keep the maxQueueMemory low enough to trigger eviction
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 50, 5, false, false, null, true, 5, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 50, 5, false, false, null, true, 5, OrderPolicy.KEY });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] {
-        getTestMethodName() + "_RR", 150 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 150 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 150 });
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 50, 5, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 50, 5, false, false, null, true, 5, OrderPolicy.KEY ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doHeavyPuts(
+        getTestMethodName() + "_RR", 150 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 150 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 150 ));
   }
 
   public void Bug46921_testSerialReplicatedWanWithPersistence() {
 
-    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, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 5, OrderPolicy.THREAD });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, true, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, true, null, true, 5, OrderPolicy.THREAD ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
   }
 
   public void testReplicatedSerialPropagationToTwoWanSites() throws Exception {
 
     Integer lnPort = createFirstLocatorWithDSId(1);
-    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
-
-    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, "createConcurrentSender", new Object[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "lnSerial2",
-        3, false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "lnSerial2",
-        3, false, 100, 10, false, false, null, true, 5 , OrderPolicy.THREAD});
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    Integer nyPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver( tkPort ));
+
+    vm4.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache(lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "lnSerial1",
+        2, false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "lnSerial1",
+        2, false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "lnSerial2",
+        3, false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "lnSerial2",
+        3, false, 100, 10, false, false, null, true, 5 , OrderPolicy.THREAD));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
 
   public void testReplicatedSerialPropagationHA() throws Exception {
@@ -200,287 +192,274 @@ public void testReplicatedSerialPropagationHA() throws Exception {
     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,
-        "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, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR", 10000 });
+    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.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 10000 ));
     Wait.pause(2000);
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
     
     inv1.join();
     inv2.join();
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
   }
 
   public void testReplicatedSerialPropagationWithConflation() 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, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 1000, true, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 1000, true, false, null, true, 5, OrderPolicy.THREAD });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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.createConcurrentSender( "ln", 2,
+        false, 100, 1000, true, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 1000, true, false, null, true, 5, OrderPolicy.THREAD ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
 
   public void testReplicatedSerialPropagationWithParallelThreads()
       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, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 4, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 4, OrderPolicy.THREAD });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doMultiThreadedPuts", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 4, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 4, OrderPolicy.THREAD ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doMultiThreadedPuts(
+        getTestMethodName() + "_RR", 1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
 
   public void testSerialPropogationWithFilter() 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, "createConcurrentSender", new Object[] { "ln", 2,
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD });
+        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD ));
 
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 800 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 800 ));
   }
 
   public void testReplicatedSerialPropagationWithFilter() 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, "createConcurrentSender", new Object[] { "ln", 2,
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), 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[] {
-        getTestMethodName(), "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 800 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 800 });
+        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 800 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 800 ));
   }
   
   public void testNormalRegionSerialPropagation() 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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     Wait.pause(500);
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "createNormalRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln" });
-    vm5.invoke(WANTestBase.class, "createNormalRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln" });
+    vm4.invoke(() -> WANTestBase.createNormalRegion(
+        getTestMethodName() + "_RR", "ln" ));
+    vm5.invoke(() -> WANTestBase.createNormalRegion(
+        getTestMethodName() + "_RR", "ln" ));
 
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] { "ln", 0,
-        0, 0, 0});
+    vm4.invoke(() -> WANTestBase.checkQueueStats( "ln", 0,
+        0, 0, 0));
 
-    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] { "ln", 0,
-        1000, 0, 0 });
+    vm5.invoke(() -> WANTestBase.checkQueueStats( "ln", 0,
+        1000, 0, 0 ));
     
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 1000});
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 1000));
 
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 0});
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 0));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 0 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 0 ));
     
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {0, 0, 0});
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(0, 0, 0));
     
   }
 
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 86018c6ed8a1..529ad4769047 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 Object call() throws Exception {
   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() {
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 6be5b978b109..009bbf7a19ac 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 CommonParallelGatewaySenderDUnitTest(String name ){
   
   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 void testSameSenderWithNonColocatedRegions() throws Exception {
      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 void DISABLED_testParallelPropagation() throws Exception {
      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 void DISABLED_testParallelPropagationPersistenceEnabled() throws Exceptio
    */
   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 void DISABLED_testPRWithGatewaySenderPersistenceEnabled_Restart() {
       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 void DISABLED_testPRWithGatewaySenderPersistenceEnabled_Restart() {
     
     //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) {
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 4b5fb009e137..598becef68d5 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 void testVersionTagTimestampForDestroy() {
     // 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 void run2() throws CacheException {
     //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 void testPutAllEventSequenceOnSerialGatewaySenderWithRR() {
     // 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 void run2() throws CacheException {
     //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 run2() throws CacheException {
     //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 testConflicChecksBasedOnDsidAndTimeStamp() {
     // 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 run2() throws CacheException {
     });
 
     // 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);
   }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index d359e529d5d5..a7e17b68171e 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -46,31 +46,29 @@ public void setUp() throws Exception {
    *   7> Validate whether other sites member receive this put operation.    
    */
   public void testWANPDX_RR_SerialSender() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_RR",
-        1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR",
+        1 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_RR", 1 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_RR", 1 ));
   }
   
   /**
@@ -87,48 +85,46 @@ public void testWANPDX_RR_SerialSender() {
    *   and can deserialize entries.     
    */
   public void testWANPDX_RemoveRomoteData() {
-    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_PDX", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver_PDX( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_RR",
-        1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR",
+        1 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_RR", 1 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_RR", 1 ));
     
     
     //bounce vm2
-    vm2.invoke(WANTestBase.class, "closeCache");
+    vm2.invoke(() -> WANTestBase.closeCache());
     
-    vm2.invoke(WANTestBase.class, "deletePDXDir");
+    vm2.invoke(() -> WANTestBase.deletePDXDir());
     
-    vm2.invoke(WANTestBase.class, "createReceiver_PDX", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver_PDX( nyPort ));
     
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_RR",
-      2 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR",
+      2 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-      getTestMethodName() + "_RR", 2 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+      getTestMethodName() + "_RR", 2 ));
   }
   
   /**
@@ -145,34 +141,32 @@ public void testWANPDX_RemoveRomoteData() {
    *   10> Make sure we flag a warning about the conflicting updates.     
    */
   public void testWANPDX_ConflictingData() {
-    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_PDX", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver_PDX( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_RR",
-        1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR",
+        1 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_RR", 1 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_RR", 1 ));
     
     //bounce vm3
-    vm3.invoke(WANTestBase.class, "closeCache");
+    vm3.invoke(() -> WANTestBase.closeCache());
     
     IgnoredException ex1 = IgnoredException.addIgnoredException("Trying to add a PDXType with the same id");
     IgnoredException ex2 = IgnoredException.addIgnoredException("CacheWriterException");
@@ -182,29 +176,29 @@ public void testWANPDX_ConflictingData() {
     
     try {
     //blow away vm3's PDX data
-    vm3.invoke(WANTestBase.class, "deletePDXDir");
+    vm3.invoke(() -> WANTestBase.deletePDXDir());
     
-    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
     //Define a different type from vm3
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable2", new Object[] { getTestMethodName() + "_RR",
-      2 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable2( getTestMethodName() + "_RR",
+      2 ));
     
     //Give the updates some time to make it over the WAN
     Wait.pause(10000);
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-      getTestMethodName() + "_RR", 1 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+      getTestMethodName() + "_RR", 1 ));
     
-    vm3.invoke(WANTestBase.class, "closeCache");
+    vm3.invoke(() -> WANTestBase.closeCache());
     } finally {
       ex1.remove();
       ex2.remove();
@@ -226,108 +220,103 @@ public void testWANPDX_ConflictingData() {
    *   7> Validate whether other sites member receive this put operation.    
    */
   public void testWANPDX_RR_SerialSender3Sites() {
-    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 ));
     
-    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    vm3.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    vm4.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm5.invoke(() -> WANTestBase.createReceiver( tkPort ));
 
 
     //Create all of our gateway senders
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 2,
-        false, 100, 10, false, false, null, true });
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "tk", 3,
-      false, 100, 10, false, false, null, true });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 1,
-      false, 100, 10, false, false, null, true });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "tk", 3,
-    false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 1,
-      false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 2,
-    false, 100, 10, false, false, null, true });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ny,tk", isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln,tk", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln,ny", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createSender( "ny", 2,
+        false, 100, 10, false, false, null, true ));
+    vm3.invoke(() -> WANTestBase.createSender( "tk", 3,
+      false, 100, 10, false, false, null, true ));
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 1,
+      false, 100, 10, false, false, null, true ));
+    vm4.invoke(() -> WANTestBase.createSender( "tk", 3,
+    false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 1,
+      false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ny", 2,
+    false, 100, 10, false, false, null, true ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ny,tk", isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln,tk", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln,ny", isOffHeap() ));
     
     //Start all of the senders
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "tk" });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "tk" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm3.invoke(() -> WANTestBase.startSender( "ny" ));
+    vm3.invoke(() -> WANTestBase.startSender( "tk" ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANTestBase.startSender( "tk" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ny" ));
     
     //Pause ln to ny. This means the PDX type will not be dispatched
     //to ny from ln
-    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny" });
+    vm3.invoke(() -> WANTestBase.pauseSender( "ny" ));
     
     Wait.pause(5000);
     
     //Do some puts that define a PDX type in ln
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_RR",
-      1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR",
+      1 ));
     
     //Make sure that tk received the update
-    vm5.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-      getTestMethodName() + "_RR", 1 });
+    vm5.invoke(() -> WANTestBase.validateRegionSize_PDX(
+      getTestMethodName() + "_RR", 1 ));
     
     //Make ny didn't receive the update because the sender is paused 
-    vm4.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-      getTestMethodName() + "_RR", 0 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize_PDX(
+      getTestMethodName() + "_RR", 0 ));
     
     //Now, do a put from tk. This serialized object will be distributed
     //to ny from tk, using the type defined by ln.
-    vm5.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_RR",
-      2 });
+    vm5.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR",
+      2 ));
     
     //Verify the ny can read the object
-    vm4.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-      getTestMethodName() + "_RR", 2 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize_PDX(
+      getTestMethodName() + "_RR", 2 ));
     
     //Wait for vm3 to receive the update (prevents a broken pipe suspect string) 
-    vm3.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-      getTestMethodName() + "_RR", 2 });
+    vm3.invoke(() -> WANTestBase.validateRegionSize_PDX(
+      getTestMethodName() + "_RR", 2 ));
   }
   
   public void testWANPDX_RR_SerialSender_StartedLater() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_RR",
-        10 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR",
+        10 ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_RR",
-      40 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR",
+      40 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_RR", 40 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_RR", 40 ));
   }
   
   /**
@@ -342,62 +331,58 @@ public void testWANPDX_RR_SerialSender_StartedLater() {
    */
   
   public void testWANPDX_PR_SerialSender() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        1 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 1 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 1 ));
   }
   
   public void testWANPDX_PR_SerialSender_StartedLater() {
-    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_PDX", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver_PDX( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        20 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        20 ));
     
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-      40 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+      40 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 40 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 40 ));
   }
   
   /**
@@ -412,68 +397,64 @@ public void testWANPDX_PR_SerialSender_StartedLater() {
    */
   
   public void testWANPDX_PR_MultipleVM_SerialSender() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
     
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null,1, 5, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null,1, 5, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 5, isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 1, 5, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 5, isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 1, 5, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        10 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 10 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 10 ));
   }
   
   public void testWANPDX_PR_MultipleVM_SerialSender_StartedLater() {
-    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_PDX", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver_PDX( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
+    vm4.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
     
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 5, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 5, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 5, isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 1, 5, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 5, isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 1, 5, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        10 ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-      40 });
+    vm4.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+      40 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 40 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 40 ));
   }
   
   /**
@@ -488,159 +469,148 @@ public void testWANPDX_PR_MultipleVM_SerialSender_StartedLater() {
    */
   
   public void testWANPDX_PR_ParallelSender() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 0, 1, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 0, 1, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 1, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 1, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        1 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 1});
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 1));
   }
   
   public void testWANPDX_PR_ParallelSender_47826() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
-        100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2, true,
+        100, 10, false, false, null, true ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 0, 1, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 0, 1, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException",
-        new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.unsetRemoveFromQueueOnException( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] {
-        getTestMethodName() + "_PR", 1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable(
+        getTestMethodName() + "_PR", 1 ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 1, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 1, isOffHeap() ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 1 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 1 ));
   }
   
   public void testWANPDX_PR_ParallelSender_StartedLater() {
-    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_PDX", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver_PDX( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        10 ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-      40 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+      40 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 40 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 40 ));
   }
   
   
   public void testWANPDX_PR_MultipleVM_ParallelSender() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, false, false, null, true ));
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+      true, 100, 10, false, false, null, true ));
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      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.startSender( "ln" ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        10 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 10 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 10 ));
   }
   
   public void testWANPDX_PR_MultipleVM_ParallelSender_StartedLater() {
-    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_PDX", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver_PDX( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
+    vm4.invoke(() -> WANTestBase.createCache_PDX( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true });
-   vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, false, false, null, true ));
+   vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+      true, 100, 10, false, false, null, true ));
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        10 ));
 
-    AsyncInvocation inv1 = vm3.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation inv1 = vm3.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
     
     try{
       inv1.join();
@@ -650,80 +620,76 @@ public void testWANPDX_PR_MultipleVM_ParallelSender_StartedLater() {
       fail("Caught interrupted exception");
     }
     
-    vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-      40 });
+    vm4.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+      40 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 40 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 40 ));
   }
   
   
   public void testWANPDX_RR_SerialSenderWithFilter() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, new PDXGatewayEventFilter(), true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, new PDXGatewayEventFilter(), true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_RR",
-        1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR",
+        1 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_RR", 1 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_RR", 1 ));
     
-    vm3.invoke(PDXNewWanDUnitTest.class, "verifyFilterInvocation", new Object[] { 1});
+    vm3.invoke(() -> PDXNewWanDUnitTest.verifyFilterInvocation( 1));
   }
   
   
   public void testWANPDX_PR_MultipleVM_ParallelSenderWithFilter() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, new PDXGatewayEventFilter(), true });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, new PDXGatewayEventFilter(), true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, false, false, new PDXGatewayEventFilter(), true ));
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+      true, 100, 10, false, false, new PDXGatewayEventFilter(), true ));
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      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.startSender( "ln" ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        10 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 10 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 10 ));
     
-    vm3.invoke(PDXNewWanDUnitTest.class, "verifyFilterInvocation", new Object[] { 5});
-    vm4.invoke(PDXNewWanDUnitTest.class, "verifyFilterInvocation", new Object[] { 5});
+    vm3.invoke(() -> PDXNewWanDUnitTest.verifyFilterInvocation( 5));
+    vm4.invoke(() -> PDXNewWanDUnitTest.verifyFilterInvocation( 5));
   }
   
   
@@ -732,47 +698,45 @@ public void testWANPDX_PR_MultipleVM_ParallelSenderWithFilter() {
    */
   
   public void Bug_testWANPDX_PR_SerialSender_RemoteSite_Bounce() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 2, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 0, 2, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-        1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+        1 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-        getTestMethodName() + "_PR", 1 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+        getTestMethodName() + "_PR", 1 ));
     
-    vm2.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm2.invoke(() -> WANTestBase.killSender());
     
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm4.invoke(() -> WANTestBase.createReceiver( nyPort ));
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 2, isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 2, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 2, isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 2, isOffHeap() ));
     
-    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { getTestMethodName() + "_PR",
-      1 });
+    vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_PR",
+      1 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
-      getTestMethodName() + "_PR", 1 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(
+      getTestMethodName() + "_PR", 1 ));
   }
   
 
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
index b990a22e5124..8ad8a46d5afa 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
@@ -46,65 +46,59 @@ public void testNothing() {
      and version prior to 8.0*/
   public void DISABLED_test_DR_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() {
     //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 ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
     
     //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);
     
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", 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.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.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.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "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() + "_RR", 3000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 3000 ));
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
     
     //--------------------close and rebuild local site -------------------------------------------------
@@ -112,10 +106,10 @@ public void DISABLED_test_DR_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Recei
 /*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
         .getName());
     try {
-*/      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());
 /*    }
     finally {
       exp1.remove();
@@ -124,34 +118,30 @@ public void DISABLED_test_DR_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Recei
     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, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
     try {
       inv1.join();
       inv2.join();
@@ -164,33 +154,33 @@ public void DISABLED_test_DR_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Recei
     
     //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() + "_RR", 3000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
     
     //----------------------------------------------------------------------------------------------------
     
-    vm4.invoke(WANTestBase.class, "doNextPuts", new Object[] { getTestMethodName() + "_RR", 3000, 10000 });
+    vm4.invoke(() -> WANTestBase.doNextPuts( getTestMethodName() + "_RR", 3000, 10000 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 10000 ));
     
   }
   
@@ -203,69 +193,59 @@ public void DISABLED_test_DR_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Recei
      and version prior to 8.0*/
   public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() {
     //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 ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
     
     //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);
     
-    vm4.invoke(WANTestBase.class,
-        "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln",
-            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    vm5.invoke(WANTestBase.class,
-        "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln",
-            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    vm6.invoke(WANTestBase.class,
-        "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln",
-            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    vm7.invoke(WANTestBase.class,
-        "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln",
-            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, 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.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.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.createReplicatedRegion( getTestMethodName() + "_RR", "ln",
+            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion( getTestMethodName() + "_RR", "ln",
+            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion( getTestMethodName() + "_RR", "ln",
+            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion( getTestMethodName() + "_RR", "ln",
+            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "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() + "_RR", 3000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 3000 ));
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
     
     //--------------------close and rebuild local site -------------------------------------------------
@@ -273,44 +253,40 @@ public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Val
 /*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
         .getName());
     try {*/
-      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());
 /*    }
     finally {
       exp1.remove();
     }*/
     
     //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, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
     
     try {
       inv1.join();
@@ -324,45 +300,45 @@ public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Val
     
     //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...");
     
     //----------------------------------------------------------------------------------------------------
     
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
     
 /*    exp1 = addExpectedException(CacheClosedException.class.getName());
     try {
-*/      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR", 3000 });
-      vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR", 3000 });
-
-      vm4.invoke(WANTestBase.class, "doNextPuts", new Object[] {
-          getTestMethodName() + "_RR", 3000, 10000 });
-
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR", 10000 });
-      vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR", 10000 });
+*/      vm2.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR", 3000 ));
+      vm3.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR", 3000 ));
+
+      vm4.invoke(() -> WANTestBase.doNextPuts(
+          getTestMethodName() + "_RR", 3000, 10000 ));
+
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR", 10000 ));
+      vm3.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR", 10000 ));
 /*    }
     finally {
       exp1.remove();
@@ -378,84 +354,74 @@ public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Val
      and version prior to 8.0*/
   public void DISABLED_test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() {
     //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 ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
     
-    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() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
     
     //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);
     
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        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" });
-    
-    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.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" });
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion( 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" ));
+    
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "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() + "_RR", 3000 });
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 3000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 3000 ));
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 3000 ));
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
     
     //--------------------close and rebuild local site -------------------------------------------------
@@ -463,10 +429,10 @@ public void DISABLED_test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUE
 /*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
         .getName());
     try {
-*/      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());
 /*    }
     finally {
       exp1.remove();
@@ -475,34 +441,30 @@ public void DISABLED_test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUE
     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, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
     
     try {
       inv1.join();
@@ -514,18 +476,14 @@ public void DISABLED_test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUE
       fail();
     }
     
-    inv1 = vm4.invokeAsync(WANTestBase.class,
-        "createPersistentPartitionedRegion", new Object[] { getTestMethodName() + "_PR", "ln", 1,
-            100, isOffHeap() });
-    inv2 = vm5.invokeAsync(WANTestBase.class,
-        "createPersistentPartitionedRegion", new Object[] { getTestMethodName() + "_PR", "ln", 1,
-            100, isOffHeap() });
-    inv3 = vm6.invokeAsync(WANTestBase.class,
-        "createPersistentPartitionedRegion", new Object[] { getTestMethodName() + "_PR", "ln", 1,
-            100, isOffHeap() });
-    inv4 = vm7.invokeAsync(WANTestBase.class,
-        "createPersistentPartitionedRegion", new Object[] { getTestMethodName() + "_PR", "ln", 1,
-            100, isOffHeap() });
+    inv1 = vm4.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1,
+            100, isOffHeap() ));
+    inv2 = vm5.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1,
+            100, isOffHeap() ));
+    inv3 = vm6.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1,
+            100, isOffHeap() ));
+    inv4 = vm7.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1,
+            100, isOffHeap() ));
 
     try {
       inv1.join();
@@ -540,64 +498,64 @@ public void DISABLED_test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUE
     
     //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...");
     
     //----------------------------------------------------------------------------------------------------
     
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
-    
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 3000 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 3000 });
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 3000 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 3000 });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 3000 });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 3000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 3000 });
-    
-    vm4.invoke(WANTestBase.class, "doNextPuts", new Object[] { getTestMethodName() + "_RR", 3000, 10000 });
-    vm4.invoke(WANTestBase.class, "doNextPuts", new Object[] { getTestMethodName() + "_PR", 3000, 10000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 3000 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 3000 ));
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 3000 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 3000 ));
+    
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 3000 ));
+    
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 3000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 3000 ));
+    
+    vm4.invoke(() -> WANTestBase.doNextPuts( getTestMethodName() + "_RR", 3000, 10000 ));
+    vm4.invoke(() -> WANTestBase.doNextPuts( getTestMethodName() + "_PR", 3000, 10000 ));
     
 /*    exp1 = addExpectedException(CacheClosedException.class.getName());
     try {*/
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR", 10000 });
-      vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR", 10000 });
-
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_PR", 10000 });
-      vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_PR", 10000 });
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR", 10000 ));
+      vm3.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR", 10000 ));
+
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_PR", 10000 ));
+      vm3.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_PR", 10000 ));
 /*    }
     finally {
       exp1.remove();
@@ -615,82 +573,68 @@ public void DISABLED_test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUE
   public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_4NODES_2NODESDOWN_Validate_Receiver()
       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 ));
 
     // 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);
 
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-        DataPolicy.PERSISTENT_REPLICATE, 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, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    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" });
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 
     pauseWaitCriteria(60000);
     {
-      AsyncInvocation inv1 = vm7.invokeAsync(
-          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts0",
-          new Object[] { getTestMethodName() + "_RR", 10000 });
+      AsyncInvocation inv1 = vm7.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts0( getTestMethodName() + "_RR", 10000 ));
       pauseWaitCriteria(1000);
-      AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+      AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
       pauseWaitCriteria(2000);
-      AsyncInvocation inv3 = vm6.invokeAsync(
-          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts1",
-          new Object[] { getTestMethodName() + "_RR", 10000 });
+      AsyncInvocation inv3 = vm6.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts1( getTestMethodName() + "_RR", 10000 ));
       pauseWaitCriteria(1500);
-      AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender");
+      AsyncInvocation inv4 = vm5.invokeAsync(() -> WANTestBase.killSender());
       try {
         inv1.join();
         inv2.join();
@@ -701,30 +645,24 @@ public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_4NODES_2NODESDOWN_Validat
       }
     }
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.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 });
+    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 ));
 
     LogWriterUtils.getLogWriter().info("Created the senders back from the disk store.");
 
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
-        "createReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-            DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class,
-        "createReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
-            DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(
-        ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts2",
-        new Object[] { getTestMethodName() + "_RR", 15000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createReplicatedRegion( getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+            DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createReplicatedRegion( getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+            DataPolicy.PERSISTENT_REPLICATE, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts2( getTestMethodName() + "_RR", 15000 ));
     try {
       inv1.join();
       inv2.join();
@@ -734,20 +672,17 @@ public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_4NODES_2NODESDOWN_Validat
       fail();
     }
 
-    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
 
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
     // wait for senders running
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 
-    vm6.invoke(WANTestBase.class,
-        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class,
-        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained( "ln" ));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained( "ln" ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 15000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 15000 ));
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
index 6c451a31ad38..83bf1e586515 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
@@ -64,24 +64,22 @@ public ReplicatedRegion_ParallelWANPropogationDUnitTest(String name) {
 
   public void test_DR_PGS_1Nodes_Put_Receiver() throws Exception {
     try {
-      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 });
-      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", null, isOffHeap() });
+      vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", null, isOffHeap() ));
 
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
 
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap() });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap() ));
 
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-          true, 10, 100, false, false, null, true });
+      vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+          true, 10, 100, false, false, null, true ));
 
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+      vm4.invoke(() -> WANTestBase.startSender( "ln1" ));
       fail("Expected GatewaySenderConfigException where parallel gateway sender can not be used with replicated region");
     }
     catch (Exception e) {
@@ -129,25 +127,23 @@ public void test_DR_PGS_1Nodes_Put_Receiver() throws Exception {
    */
   public void DISABLED_test_PGS_Started_DR_CREATED_NO_RECEIVER() throws Exception {
     try {
-      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 ));
 
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
 /*      ExpectedException exp1 = addExpectedException(GatewaySenderException.class
           .getName(), vm4);
       ExpectedException exp2 = addExpectedException(InterruptedException.class
           .getName(), vm4);
       try {
-*/        vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-            true, 10, 100, false, false, null, false });
-        vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-            getTestMethodName() + "_RR", "ln1", isOffHeap()  });
-        vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
-            getTestMethodName() + "_RR", 1000 });
-        vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
-            "ln1", 1000 });
+*/        vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+            true, 10, 100, false, false, null, false ));
+        vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+            getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
+        vm4.invoke(() -> WANTestBase.doPuts(
+            getTestMethodName() + "_RR", 1000 ));
+        vm4.invoke(() -> WANTestBase.validateQueueContents(
+            "ln1", 1000 ));
 
 /*      }
       finally {
@@ -174,25 +170,23 @@ public void DISABLED_test_PGS_Started_DR_CREATED_NO_RECEIVER() throws Exception
    */
   public void DISABLED_test_DR_CREATED_PGS_STARTED_NO_RECEIVER() throws Exception {
     try {
-      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-          "createFirstLocatorWithDSId", new Object[] { 1 });
-      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-          "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln1", isOffHeap()  });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
 /*      ExpectedException exp1 = addExpectedException(GatewaySenderException.class
           .getName(), vm4);
       ExpectedException exp2 = addExpectedException(InterruptedException.class
           .getName(), vm4);
       try {*/
-        vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-            true, 10, 100, false, false, null, false });
-        vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
-            getTestMethodName() + "_RR", 1000 });
-        vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
-            "ln1", 1000 });
+        vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+            true, 10, 100, false, false, null, false ));
+        vm4.invoke(() -> WANTestBase.doPuts(
+            getTestMethodName() + "_RR", 1000 ));
+        vm4.invoke(() -> WANTestBase.validateQueueContents(
+            "ln1", 1000 ));
 /*      }
       finally {
         exp1.remove();
@@ -213,32 +207,30 @@ public void DISABLED_test_DR_CREATED_PGS_STARTED_NO_RECEIVER() throws Exception
      and version prior to 8.0*/
   public void DISABLED_test_DR_PGS_1Node_Put_ValidateQueue_No_Receiver() throws Exception {
     try {
-      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 ));
 
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
       
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
       
 /*      ExpectedException exp1 = addExpectedException(GatewaySenderException.class
           .getName(), vm4);
       ExpectedException exp2 = addExpectedException(InterruptedException.class
           .getName(), vm4);
       try {*/
-        vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-            true, 10, 100, false, false, null, true });
-        vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+        vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+            true, 10, 100, false, false, null, true ));
+        vm4.invoke(() -> WANTestBase.startSender( "ln1" ));
 
-        vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
-            getTestMethodName() + "_RR", 10000 });
+        vm4.invoke(() -> WANTestBase.doPuts(
+            getTestMethodName() + "_RR", 10000 ));
 
-        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_RR", 10000 });
-        vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
-            "ln1", 10000 });
+        vm4.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_RR", 10000 ));
+        vm4.invoke(() -> WANTestBase.validateQueueContents(
+            "ln1", 10000 ));
 /*      }
     finally {
       exp1.remove();
@@ -260,18 +252,16 @@ public void DISABLED_test_DR_PGS_1Node_Put_ValidateQueue_No_Receiver() throws Ex
      and version prior to 8.0*/
   public void DISABLED_test_DR_PGS_2Nodes_Put_ValidateQueue_No_Receiver() throws Exception {
     try {
-      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 ));
 
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
       
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
-      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln1", isOffHeap()  });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
       
 /*      ExpectedException exp1 = addExpectedException(
           GatewaySenderException.class.getName());
@@ -280,26 +270,26 @@ public void DISABLED_test_DR_PGS_2Nodes_Put_ValidateQueue_No_Receiver() throws E
       ExpectedException exp3 = addExpectedException(
           CacheClosedException.class.getName());
       try {
-*/        vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-            true, 10, 100, false, false, null, true });
-        vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-            true, 10, 100, false, false, null, true });
+*/        vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+            true, 10, 100, false, false, null, true ));
+        vm5.invoke(() -> WANTestBase.createSender( "ln1", 2,
+            true, 10, 100, false, false, null, true ));
 
-        vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
-        vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+        vm4.invoke(() -> WANTestBase.startSender( "ln1" ));
+        vm5.invoke(() -> WANTestBase.startSender( "ln1" ));
 
-        vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
-            getTestMethodName() + "_RR", 1000 });
+        vm4.invoke(() -> WANTestBase.doPuts(
+            getTestMethodName() + "_RR", 1000 ));
 
-        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_RR", 1000 });
-        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_RR", 1000 });
+        vm4.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_RR", 1000 ));
+        vm5.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_RR", 1000 ));
 
-        vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
-            "ln1", 1000 });
-        vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
-            "ln1", 1000 });
+        vm4.invoke(() -> WANTestBase.validateQueueContents(
+            "ln1", 1000 ));
+        vm5.invoke(() -> WANTestBase.validateQueueContents(
+            "ln1", 1000 ));
 
 /*      }
       finally {
@@ -349,36 +339,34 @@ public void DISABLED_test_DR_PGS_2Nodes_Put_ValidateQueue_No_Receiver() throws E
      and version prior to 8.0*/
   public void DISABLED_test_DR_PGS_1Nodes_Put_Receiver() throws Exception {
     try {
-      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 });
-      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+      vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
       
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
       
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
       
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-        true, 10, 100, false, false, null, true});
+      vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+        true, 10, 100, false, false, null, true));
 
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      vm4.invoke(() -> WANTestBase.startSender( "ln1"));
       
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000});
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000));
      
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000});
+      vm4.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000));
       
-      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
+      vm4.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
       
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000});
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000));
     }
     catch (Exception e) {
       Assert.fail("Unexpected exception", e);
@@ -394,46 +382,44 @@ public void DISABLED_test_DR_PGS_1Nodes_Put_Receiver() throws Exception {
      and version prior to 8.0*/
   public void DISABLED_test_DR_PGS_2Nodes_Put_Receiver() throws Exception {
     try {
-      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 });
-      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+      vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
       
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
       
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
-      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln1", isOffHeap()  });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
       
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-        true, 10, 100, false, false, null, true});
-      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-      true, 10, 100, false, false, null, true});
+      vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+        true, 10, 100, false, false, null, true));
+      vm5.invoke(() -> WANTestBase.createSender( "ln1", 2,
+      true, 10, 100, false, false, null, true));
 
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
-      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      vm4.invoke(() -> WANTestBase.startSender( "ln1"));
+      vm5.invoke(() -> WANTestBase.startSender( "ln1"));
       
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
      
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
+      vm5.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
       
-      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
-      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
+      vm4.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
+      vm5.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
       
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
     }
     catch (Exception e) {
       Assert.fail("Unexpected exception", e);
@@ -449,46 +435,44 @@ public void DISABLED_test_DR_PGS_2Nodes_Put_Receiver() throws Exception {
      and version prior to 8.0*/
   public void DISABLED_test_DR_PGS_2Nodes_EMPTY_Put_Receiver() throws Exception {
     try {
-      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 });
-      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+      vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
       
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
       
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", Scope.DISTRIBUTED_ACK, DataPolicy.EMPTY, isOffHeap()  });
-      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln1", Scope.DISTRIBUTED_ACK, DataPolicy.REPLICATE, isOffHeap()  });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", Scope.DISTRIBUTED_ACK, DataPolicy.EMPTY, isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln1", Scope.DISTRIBUTED_ACK, DataPolicy.REPLICATE, isOffHeap()  ));
       
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-        true, 10, 100, false, false, null, true});
-      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-      true, 10, 100, false, false, null, true});
+      vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+        true, 10, 100, false, false, null, true));
+      vm5.invoke(() -> WANTestBase.createSender( "ln1", 2,
+      true, 10, 100, false, false, null, true));
 
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
-      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      vm4.invoke(() -> WANTestBase.startSender( "ln1"));
+      vm5.invoke(() -> WANTestBase.startSender( "ln1"));
       
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
      
-//      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
-//        1000 });
-      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+//      vm4.invoke(() -> WANTestBase.validateRegionSize( testName + "_RR",
+//        1000 ));
+      vm5.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
       
-      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
-      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
+      vm4.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
+      vm5.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
       
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
     }
     catch (Exception e) {
       Assert.fail("Unexpected exception", e);
@@ -504,96 +488,90 @@ public void DISABLED_test_DR_PGS_2Nodes_EMPTY_Put_Receiver() throws Exception {
      and version prior to 8.0*/
   public void DISABLED_test_DR_PR_PGS_4Nodes_Put_Receiver_2Nodes() throws Exception {
     try {
-      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 ));
       
-      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-      vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+      vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
       
-      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()  });
+      vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+      vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
       
-      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, "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, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-      vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-      vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-          true, 10, 100, false, false, null, true });
-      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-          true, 10, 100, false, false, null, true });
-      vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-          true, 10, 100, false, false, null, true });
-      vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-          true, 10, 100, false, false, null, true });
-
-      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.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.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+      vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+      vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+      vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+          true, 10, 100, false, false, null, true ));
+      vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+          true, 10, 100, false, false, null, true ));
+      vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+          true, 10, 100, false, false, null, true ));
+      vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+          true, 10, 100, false, false, null, true ));
+
+      vm4.invoke(() -> WANTestBase.startSender( "ln"));
+      vm5.invoke(() -> WANTestBase.startSender( "ln"));
+      vm6.invoke(() -> WANTestBase.startSender( "ln"));
+      vm7.invoke(() -> WANTestBase.startSender( "ln"));
       
-      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.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-      vm5.invoke(WANTestBase.class, "doNextPuts", new Object[] { getTestMethodName() + "_PR",
-        1000, 2000 });
+      vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+      vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+      vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+      vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+      vm5.invoke(() -> WANTestBase.doNextPuts( getTestMethodName() + "_PR",
+        1000, 2000 ));
       
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_PR",
-        1000 });
-      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_PR",
+        1000 ));
+      vm5.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
       
-      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
-      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
+      vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
+      vm5.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
       
 /*      ExpectedException exp1 = addExpectedException(CacheClosedException.class
           .getName());
       try {*/
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_RR", 1000 });
-        vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_RR", 1000 });
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_PR", 1000 });
-        vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_PR", 1000 });
+        vm2.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_RR", 1000 ));
+        vm3.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_RR", 1000 ));
+        vm2.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_PR", 1000 ));
+        vm3.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_PR", 1000 ));
 /*      }
       finally {
         exp1.remove();
@@ -613,65 +591,63 @@ public void DISABLED_test_DR_PR_PGS_4Nodes_Put_Receiver_2Nodes() throws Exceptio
      and version prior to 8.0*/
   public void DISABLED_test_DR_PGS_NOMANUALSTART_4Nodes_Put_ValidateReceiver() throws Exception {
     try {
-      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 });
-      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+      vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
       
-      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[] { "ln1", 2,
-          true, 10, 100, false, false, null, false });
-      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-          true, 10, 100, false, false, null, false });
-      vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-          true, 10, 100, false, false, null, false });
-      vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-          true, 10, 100, false, false, null, false });
+      vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+          true, 10, 100, false, false, null, false ));
+      vm5.invoke(() -> WANTestBase.createSender( "ln1", 2,
+          true, 10, 100, false, false, null, false ));
+      vm6.invoke(() -> WANTestBase.createSender( "ln1", 2,
+          true, 10, 100, false, false, null, false ));
+      vm7.invoke(() -> WANTestBase.createSender( "ln1", 2,
+          true, 10, 100, false, false, null, false ));
     
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
-      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
-      vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
-      vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
-
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
+      vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
+      vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
+
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
      
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
+      vm5.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
+      vm6.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
+      vm7.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
 
       
-      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
-      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
-      vm6.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
-      vm7.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
+      vm4.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
+      vm5.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
+      vm6.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
+      vm7.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
       
 /*      ExpectedException exp1 = addExpectedException(CacheClosedException.class
           .getName());
       try {*/
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_RR", 1000 });
+        vm2.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_RR", 1000 ));
 /*      }
       finally {
         exp1.remove();
@@ -692,133 +668,119 @@ public void DISABLED_test_DR_PGS_NOMANUALSTART_4Nodes_Put_ValidateReceiver() thr
   public void DISABLED_test_DR_PGS_4Nodes_Put_CLOSE4NODESCACHE_RECREATE_PUT_ValidateReceiver()
       throws Exception {
     try {
-      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, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-      vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-      vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", 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, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", null, isOffHeap()  });
-      vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", null, 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.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+      vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+      vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+      vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+      vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+      vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+      vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", null, isOffHeap()  ));
+      vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", null, 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.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-          1000 });
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR", 1000 });
+      vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+      vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+      vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+      vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+          1000 ));
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR", 1000 ));
 
 /*      ExpectedException exp1 = addExpectedException(CacheClosedException.class
           .getName());
       try {*/
-        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());
 /*      }
       finally {
         exp1.remove();
       }*/
 
-      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, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-      vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap()  });
-      vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", 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.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.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.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+      vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+      vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+      vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+      vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+      vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+      vm7.invoke(() -> WANTestBase.startSender( "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, "doNextPuts", new Object[] {
-          getTestMethodName() + "_RR", 1000, 2000 });
+      vm4.invoke(() -> WANTestBase.doNextPuts(
+          getTestMethodName() + "_RR", 1000, 2000 ));
 
       // 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" ));
 
 /*      exp1 = addExpectedException(CacheClosedException.class.getName());
       try {*/
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_RR", 2000 });
-        vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-            getTestMethodName() + "_RR", 2000 });
+        vm2.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_RR", 2000 ));
+        vm3.invoke(() -> WANTestBase.validateRegionSize(
+            getTestMethodName() + "_RR", 2000 ));
 /*      }
       finally {
         exp1.remove();
@@ -839,48 +801,44 @@ public void DISABLED_test_DR_PGS_4Nodes_Put_CLOSE4NODESCACHE_RECREATE_PUT_Valida
      and version prior to 8.0*/
   public void DISABLED_test_DR_NO_ACK_PGS_2Nodes_Put_ValidateQueue_Receiver() throws Exception {
     try {
-      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 });
-      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+      vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
       
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
       
-      vm4.invoke(WANTestBase.class,
-          "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln1",
-              Scope.DISTRIBUTED_NO_ACK, DataPolicy.REPLICATE, isOffHeap()  });
-      vm5.invoke(WANTestBase.class,
-          "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln1",
-              Scope.DISTRIBUTED_NO_ACK, DataPolicy.REPLICATE, isOffHeap()   });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion( getTestMethodName() + "_RR", "ln1",
+              Scope.DISTRIBUTED_NO_ACK, DataPolicy.REPLICATE, isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion( getTestMethodName() + "_RR", "ln1",
+              Scope.DISTRIBUTED_NO_ACK, DataPolicy.REPLICATE, isOffHeap()   ));
       
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-        true, 10, 100, false, false, null, true});
-      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-      true, 10, 100, false, false, null, true});
+      vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+        true, 10, 100, false, false, null, true));
+      vm5.invoke(() -> WANTestBase.createSender( "ln1", 2,
+      true, 10, 100, false, false, null, true));
 
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
-      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      vm4.invoke(() -> WANTestBase.startSender( "ln1"));
+      vm5.invoke(() -> WANTestBase.startSender( "ln1"));
       
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
      
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
+      vm5.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName() + "_RR",
+        1000 ));
       
-      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
-      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
-        0 });
+      vm4.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
+      vm5.invoke(() -> WANTestBase.validateQueueContents( "ln1",
+        0 ));
       
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
     }
     catch (Exception e) {
       Assert.fail("Unexpected exception", e);
@@ -896,50 +854,45 @@ public void DISABLED_test_DR_NO_ACK_PGS_2Nodes_Put_ValidateQueue_Receiver() thro
      and version prior to 8.0*/
   public void DISABLED_test_DR_PGS_2NODES_1NODESDOWN_Validate_Receiver() 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 });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.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 });
+    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 ));
 
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 
     pauseWaitCriteria(60000);
     
 /*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
         .getName());
     try {*/
-      AsyncInvocation inv1 = vm4.invokeAsync(
-          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts0", new Object[] {
-              getTestMethodName() + "_RR", 1000 });
+      AsyncInvocation inv1 = vm4.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts0(
+              getTestMethodName() + "_RR", 1000 ));
       Wait.pause(1000);
-      AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "killSender");
+      AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.killSender());
       try {
         inv1.join();
         inv2.join();
@@ -952,20 +905,17 @@ public void DISABLED_test_DR_PGS_2NODES_1NODESDOWN_Validate_Receiver() throws Ex
       exp1.remove();
     }*/
 
-    Integer size = (Integer)vm4.invoke(WANTestBase.class,
-        "getQueueContentSize", new Object[] { "ln" });
+    Integer size = (Integer)vm4.invoke(() -> WANTestBase.getQueueContentSize( "ln" ));
     LogWriterUtils.getLogWriter().info("The size of the queue is in vm4 " + size);
     
 
-    vm4.invoke(WANTestBase.class,
-        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained( "ln" ));
     
-    size = (Integer)vm4.invoke(WANTestBase.class,
-        "getQueueContentSize", new Object[] { "ln" });
+    size = (Integer)vm4.invoke(() -> WANTestBase.getQueueContentSize( "ln" ));
     LogWriterUtils.getLogWriter().info("The size of the queue is in vm4 " + size);
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
   
   /**Below test is disabled intentionally
@@ -977,71 +927,63 @@ public void DISABLED_test_DR_PGS_2NODES_1NODESDOWN_Validate_Receiver() throws Ex
      and version prior to 8.0*/
   public void DISABLED_test_DR_PGS_4NODES_2NODESDOWN_Validate_Receiver() 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, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", 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, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-
-    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" });
+    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.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 
     pauseWaitCriteria(60000);
 /*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
         .getName());
     try */{
-      AsyncInvocation inv1 = vm7.invokeAsync(
-          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts0", new Object[] {
-              getTestMethodName() + "_RR", 10000 });
+      AsyncInvocation inv1 = vm7.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts0(
+              getTestMethodName() + "_RR", 10000 ));
       pauseWaitCriteria(1000);
-      AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+      AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
       pauseWaitCriteria(2000);
-      AsyncInvocation inv3 = vm6.invokeAsync(
-          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts1", new Object[] {
-              getTestMethodName() + "_RR", 10000 });
+      AsyncInvocation inv3 = vm6.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts1(
+              getTestMethodName() + "_RR", 10000 ));
       pauseWaitCriteria(1500);
-      AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender");
+      AsyncInvocation inv4 = vm5.invokeAsync(() -> WANTestBase.killSender());
       try {
         inv1.join();
         inv2.join();
@@ -1056,13 +998,11 @@ public void DISABLED_test_DR_PGS_4NODES_2NODESDOWN_Validate_Receiver() throws Ex
       exp1.remove();
     }*/
 
-    vm6.invoke(WANTestBase.class,
-        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class,
-        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained( "ln" ));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained( "ln" ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
     
   }
   
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index 193d360b5d31..a01975124886 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -53,63 +53,53 @@ public void setUp() throws Exception {
   }
 
   public void testSerialSenderWithTansportFilter() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm2.invoke(SenderWithTransportFilterDUnitTest.class,
-        "createReceiverWithTransportFilters", new Object[] { nyPort });
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> SenderWithTransportFilterDUnitTest.createReceiverWithTransportFilters( nyPort ));
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(SenderWithTransportFilterDUnitTest.class,
-        "createSenderWithTransportFilter", new Object[] { "ln", 2, false, 100,
-            1, false, false, true });
+    vm3.invoke(() -> SenderWithTransportFilterDUnitTest.createSenderWithTransportFilter( "ln", 2, false, 100,
+            1, false, false, true ));
 
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR", 100 });
+    vm3.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 100 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 100 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 100 ));
   }
 
   public void testParallelSenderWithTansportFilter() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm2.invoke(SenderWithTransportFilterDUnitTest.class,
-        "createReceiverWithTransportFilters", new Object[] { nyPort });
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 0, 10, isOffHeap() });
+    vm2.invoke(() -> SenderWithTransportFilterDUnitTest.createReceiverWithTransportFilters( nyPort ));
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 0, 10, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm3.invoke(SenderWithTransportFilterDUnitTest.class,
-        "createSenderWithTransportFilter", new Object[] { "ln", 2, true, 100,
-            1, false, false, true });
+    vm3.invoke(() -> SenderWithTransportFilterDUnitTest.createSenderWithTransportFilter( "ln", 2, true, 100,
+            1, false, false, true ));
 
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 0, 10, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 0, 10, isOffHeap() ));
 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_PR", 100 });
+    vm3.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 100 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 100 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 100 ));
   }
   
   public static int createReceiverWithTransportFilters(int locPort) {
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
index c5100f99b21b..9028531d6c46 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
@@ -56,31 +56,25 @@ public void setUp() throws Exception {
   public void testGatewaySender() throws Exception {
     IgnoredException.addIgnoredException("Cache is shutting down");
 
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
-    vm2.invoke(WANTestBase.class, "createReceiverAfterCache",
-        new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm2.invoke(() -> WANTestBase.createReceiverAfterCache( nyPort ));
 
-    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 400, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 400, false, false, null, true ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
 
     // set the CacheObserver to block the ShutdownAll
     SerializableRunnable waitAtShutdownAll = new SerializableRunnable() {
@@ -109,8 +103,7 @@ public String description() {
     vm2.invoke(waitAtShutdownAll);
     vm3.invoke(waitAtShutdownAll);
     
-    AsyncInvocation vm4_future = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_PR", NUM_KEYS });
+    AsyncInvocation vm4_future = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", NUM_KEYS ));
 
     // ShutdownAll will be suspended at observer, so puts will continue
     AsyncInvocation future = shutDownAllMembers(vm2, 2, MAX_WAIT);
@@ -118,13 +111,11 @@ public String description() {
 
     // now restart vm1 with gatewayHub
     LogWriterUtils.getLogWriter().info("restart in VM2");
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
-    AsyncInvocation vm3_future = vm3.invokeAsync(WANTestBase.class,
-        "createPersistentPartitionedRegion", new Object[] { getTestMethodName() + "_PR",
-            "ln", 1, 100, isOffHeap() });
-    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
+    AsyncInvocation vm3_future = vm3.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR",
+            "ln", 1, 100, isOffHeap() ));
+    vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
     vm3_future.join(MAX_WAIT);
 
     vm3.invoke(new SerializableRunnable() {
@@ -134,8 +125,7 @@ public void run() {
             "vm1's region size before restart gatewayhub is " + region.size());
       }
     });
-    vm2.invoke(WANTestBase.class, "createReceiverAfterCache",
-        new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiverAfterCache( nyPort ));
 
     // wait for vm0 to finish its work
     vm4_future.join(MAX_WAIT);
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index d239cf4ce3a7..54773ad1a4c0 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -61,34 +61,34 @@ public void test_3Locators_2Servers() {
 
     int port3 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
 
-    vm0.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
-        port1, port2, port3, port1 });
+    vm0.invoke(() -> WANLocatorServerDUnitTest.createLocator(
+        port1, port2, port3, port1 ));
 
-    vm1.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
-        port1, port2, port3, port2 });
+    vm1.invoke(() -> WANLocatorServerDUnitTest.createLocator(
+        port1, port2, port3, port2 ));
 
-    vm2.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
-        port1, port2, port3, port3 });
+    vm2.invoke(() -> WANLocatorServerDUnitTest.createLocator(
+        port1, port2, port3, port3 ));
 
-    vm3.invoke(WANLocatorServerDUnitTest.class, "createReceiver", new Object[] {
-        port1, port2, port3 });
-    vm5.invoke(WANLocatorServerDUnitTest.class, "createClient", new Object[] {
-        port1, port2, port3 });
+    vm3.invoke(() -> WANLocatorServerDUnitTest.createReceiver(
+        port1, port2, port3 ));
+    vm5.invoke(() -> WANLocatorServerDUnitTest.createClient(
+        port1, port2, port3 ));
 
-    vm0.invoke(WANLocatorServerDUnitTest.class, "disconnect");
-    vm1.invoke(WANLocatorServerDUnitTest.class, "disconnect");
-    vm2.invoke(WANLocatorServerDUnitTest.class, "disconnect");
+    vm0.invoke(() -> WANLocatorServerDUnitTest.disconnect());
+    vm1.invoke(() -> WANLocatorServerDUnitTest.disconnect());
+    vm2.invoke(() -> WANLocatorServerDUnitTest.disconnect());
 
-    vm0.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
-        port1, port2, port3, port1 });
+    vm0.invoke(() -> WANLocatorServerDUnitTest.createLocator(
+        port1, port2, port3, port1 ));
 
-    vm1.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
-        port1, port2, port3, port2 });
+    vm1.invoke(() -> WANLocatorServerDUnitTest.createLocator(
+        port1, port2, port3, port2 ));
 
-    vm2.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
-        port1, port2, port3, port3 });
+    vm2.invoke(() -> WANLocatorServerDUnitTest.createLocator(
+        port1, port2, port3, port3 ));
 
-    vm5.invoke(WANLocatorServerDUnitTest.class, "tryNewConnection");
+    vm5.invoke(() -> WANLocatorServerDUnitTest.tryNewConnection());
 
   }
 
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
index fba8b2e224fa..36f1226892b3 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -33,31 +33,29 @@ public void setUp() throws Exception {
   }
  
   public void testSenderSSLReceiverSSL(){
-    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, "createReceiverWithSSL", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiverWithSSL( nyPort ));
 
-    vm4.invoke(WANTestBase.class, "createCacheWithSSL", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCacheWithSSL( lnPort ));
 
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
   
   public void testSenderNoSSLReceiverSSL() {
@@ -65,32 +63,29 @@ public void testSenderNoSSLReceiverSSL() {
     IgnoredException.addIgnoredException("SSL Error");
     IgnoredException.addIgnoredException("Unrecognized SSL message");
     try {
-      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, "createReceiverWithSSL",
-          new Object[] { nyPort });
+      vm2.invoke(() -> WANTestBase.createReceiverWithSSL( nyPort ));
 
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
 
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-          false, 100, 10, false, false, null, true });
+      vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+          false, 100, 10, false, false, null, true ));
 
-      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", null, isOffHeap() });
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", null, isOffHeap() ));
 
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap() });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-          1000 });
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+          1000 ));
 
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR", 1000 });
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR", 1000 ));
       fail("Expected exception as only Receiver is SSL enabled. Not Sender");
     }
     catch (Exception e) {
@@ -101,32 +96,29 @@ public void testSenderNoSSLReceiverSSL() {
   public void testSenderSSLReceiverNoSSL(){
     IgnoredException.addIgnoredException("Acceptor received unknown");
     IgnoredException.addIgnoredException("failed accepting client");
-      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 });
+      vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-      vm4.invoke(WANTestBase.class, "createCacheWithSSL",
-          new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCacheWithSSL( lnPort ));
 
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-          false, 100, 10, false, false, null, true });
+      vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+          false, 100, 10, false, false, null, true ));
 
-      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", null, isOffHeap() });
+      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", null, isOffHeap() ));
 
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln", isOffHeap() });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-          1 });
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+          1 ));
 
-      Boolean doesSizeMatch = (Boolean)vm2.invoke(WANSSLDUnitTest.class, "ValidateSSLRegionSize", new Object[] {
-          getTestMethodName() + "_RR", 1 });
+      Boolean doesSizeMatch = (Boolean)vm2.invoke(() -> WANSSLDUnitTest.ValidateSSLRegionSize(
+          getTestMethodName() + "_RR", 1 ));
       
       assertFalse(doesSizeMatch);
   }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index 459b718c245d..b92de53861c3 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -52,8 +52,8 @@ public void setUp() throws Exception {
   public void test_GatewaySender_Started_Before_Locator() {
     try {
       int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
-      vm0.invoke(WANTestBase.class, "createCache", new Object[]{port});      
-      vm0.invoke(WANTestBase.class, "createSender", new Object[]{"ln",2,false,100,10,false,false, null, false});
+      vm0.invoke(() -> WANTestBase.createCache(port));      
+      vm0.invoke(() -> WANTestBase.createSender("ln",2,false,100,10,false,false, null, false));
       fail("Expected GemFireConfigException but not thrown");
     }
     catch (Exception e) {
@@ -74,13 +74,10 @@ public void test_GatewaySender_Started_Before_Locator() {
    */
   public void __test_AllLocatorsinDSShouldHaveDistributedSystemId() throws Exception {
     try {
-      Integer lnLocPort1 = (Integer)vm0.invoke(
-          WANTestBase.class, "createFirstLocatorWithDSId",
-          new Object[] {1});
+      Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
 
-      Integer lnLocPort2 = (Integer)vm1.invoke(
-          WANTestBase.class, "createSecondLocator", new Object[] { 2,
-              lnLocPort1 });
+      Integer lnLocPort2 = (Integer)vm1.invoke(() -> WANTestBase.createSecondLocator( 2,
+              lnLocPort1 ));
       fail("Expected IncompatibleSystemException but not thrown");
     }
     catch (Exception e) {
@@ -100,34 +97,25 @@ public void test_NY_Recognises_ALL_LN_Locators() throws Exception {
     Map> dsVsPort = new HashMap>();
     dsVsPort.put(1, locatorPorts);
 
-    Integer lnLocPort1 = (Integer)vm0.invoke(
-        WANTestBase.class, "createFirstLocatorWithDSId",
-        new Object[] {1});
+    Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
     locatorPorts.add(lnLocPort1);
 
-    Integer lnLocPort2 = (Integer)vm1.invoke(WANTestBase.class,
-        "createSecondLocator", new Object[] { 1, lnLocPort1 });
+    Integer lnLocPort2 = (Integer)vm1.invoke(() -> WANTestBase.createSecondLocator( 1, lnLocPort1 ));
     locatorPorts.add(lnLocPort2);
     
     locatorPorts = new ArrayList();
     dsVsPort.put(2, locatorPorts);
-    Integer nyLocPort1 = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    Integer nyLocPort1 = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnLocPort1 ));
     locatorPorts.add(nyLocPort1);
     
-    Integer nyLocPort2 = (Integer)vm3.invoke(
-        WANTestBase.class, "createSecondRemoteLocator", new Object[] {
-            2, nyLocPort1, lnLocPort1});
+    Integer nyLocPort2 = (Integer)vm3.invoke(() -> WANTestBase.createSecondRemoteLocator(
+            2, nyLocPort1, lnLocPort1));
     locatorPorts.add(nyLocPort2);
     
-    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm3.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
+    vm0.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm1.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm2.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm3.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
   }
  
   /**
@@ -141,36 +129,28 @@ public void test_NY_Recognises_TK_AND_HK_Through_LN_Locator() {
     ArrayList locatorPorts = new ArrayList();
     dsVsPort.put(1, locatorPorts);
     
-    Integer lnLocPort1 = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     locatorPorts.add(lnLocPort1);
 
     locatorPorts = new ArrayList();
     dsVsPort.put(2, locatorPorts);
-    Integer nyLocPort1 = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    Integer nyLocPort1 = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnLocPort1 ));
     locatorPorts.add(nyLocPort1);
 
     locatorPorts = new ArrayList();
     dsVsPort.put(3, locatorPorts);
-    Integer tkLocPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnLocPort1 });
+    Integer tkLocPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnLocPort1 ));
     locatorPorts.add(tkLocPort);
 
     locatorPorts = new ArrayList();
     dsVsPort.put(4, locatorPorts);
-    Integer hkLocPort = (Integer)vm3.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 4, lnLocPort1 });
+    Integer hkLocPort = (Integer)vm3.invoke(() -> WANTestBase.createFirstRemoteLocator( 4, lnLocPort1 ));
     locatorPorts.add(hkLocPort);
 
-    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm3.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
+    vm0.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm1.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm2.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm3.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
   }
 
   public void test_TK_Recognises_LN_AND_NY() {
@@ -180,29 +160,23 @@ public void test_TK_Recognises_LN_AND_NY() {
     ArrayList locatorPorts = new ArrayList();
     dsVsPort.put(1, locatorPorts);
     
-    Integer lnLocPort1 = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     locatorPorts.add(lnLocPort1);
 
     locatorPorts = new ArrayList();
     dsVsPort.put(2, locatorPorts);
-    Integer nyLocPort1 = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    Integer nyLocPort1 = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnLocPort1 ));
     locatorPorts.add(nyLocPort1);
 
     locatorPorts = new ArrayList();
     dsVsPort.put(3, locatorPorts);
-    Integer tkLocPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, nyLocPort1 });
+    Integer tkLocPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, nyLocPort1 ));
     locatorPorts.add(tkLocPort);
 
 
-    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
+    vm0.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm1.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm2.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
   }
   
   public void test_NY_Recognises_TK_AND_HK_Simeltenously() {
@@ -210,14 +184,12 @@ public void test_NY_Recognises_TK_AND_HK_Simeltenously() {
 
     ArrayList locatorPortsln = new ArrayList();
     dsVsPort.put(1, locatorPortsln);
-    Integer lnLocPort1 = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     locatorPortsln.add(lnLocPort1);
 
     ArrayList locatorPortsny = new ArrayList();
     dsVsPort.put(2, locatorPortsny);
-    Integer nyLocPort1 = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    Integer nyLocPort1 = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnLocPort1 ));
     locatorPortsny.add(nyLocPort1);
 
     int AsyncInvocationArrSize = 4;
@@ -225,21 +197,17 @@ public void test_NY_Recognises_TK_AND_HK_Simeltenously() {
 
     ArrayList locatorPortstk = new ArrayList();
     dsVsPort.put(3, locatorPortstk);
-    async[0] = vm2.invokeAsync(WANTestBase.class, "createFirstRemoteLocator",
-        new Object[] { 3, lnLocPort1 });
+    async[0] = vm2.invokeAsync(() -> WANTestBase.createFirstRemoteLocator( 3, lnLocPort1 ));
 
     ArrayList locatorPortshk = new ArrayList();
     dsVsPort.put(4, locatorPortshk);
-    async[1] = vm3.invokeAsync(
-        WANTestBase.class, "createFirstRemoteLocator", new Object[] {4, nyLocPort1});
+    async[1] = vm3.invokeAsync(() -> WANTestBase.createFirstRemoteLocator(4, nyLocPort1));
 
     ArrayList locatorPortsln2 = new ArrayList();
-    async[2] = vm4.invokeAsync(WANTestBase.class,
-        "createSecondLocator", new Object[] { 1, lnLocPort1 });
+    async[2] = vm4.invokeAsync(() -> WANTestBase.createSecondLocator( 1, lnLocPort1 ));
     
     ArrayList locatorPortsny2 = new ArrayList();
-    async[3] = vm5.invokeAsync(WANTestBase.class,
-        "createSecondLocator", new Object[] { 2, nyLocPort1 });
+    async[3] = vm5.invokeAsync(() -> WANTestBase.createSecondLocator( 2, nyLocPort1 ));
 
     
     try {
@@ -257,61 +225,50 @@ public void test_NY_Recognises_TK_AND_HK_Simeltenously() {
     locatorPortsln.add((Integer)async[2].getReturnValue());
     locatorPortsny.add((Integer)async[3].getReturnValue());
     
-    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm3.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
+    vm0.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm1.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm2.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm3.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
   }
   
   
   public void test_LN_Sender_recogises_ALL_NY_Locators() {
     
-    Integer lnLocPort1 = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     
-    Integer lnLocPort2 = (Integer)vm5.invoke(WANTestBase.class,
-        "createSecondLocator", new Object[] { 1, lnLocPort1 });
+    Integer lnLocPort2 = (Integer)vm5.invoke(() -> WANTestBase.createSecondLocator( 1, lnLocPort1 ));
     
-    vm2.invoke(WANTestBase.class, "createCache", new Object[]{lnLocPort1, lnLocPort2});
+    vm2.invoke(() -> WANTestBase.createCache(lnLocPort1, lnLocPort2));
     
-    vm2.invoke(WANTestBase.class, "createSender",
-        new Object[] {"ln",2,false,100,10,false,false, null, true});
+    vm2.invoke(() -> WANTestBase.createSender("ln",2,false,100,10,false,false, null, true));
     
-    Integer nyLocPort1 = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    Integer nyLocPort1 = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnLocPort1 ));
     
-    vm2.invoke(WANTestBase.class, "startSender",new Object[]{"ln"});
+    vm2.invoke(() -> WANTestBase.startSender("ln"));
 
     //Since to fix Bug#46289, we have moved call to initProxy in getConnection which will be called only when batch is getting dispatched.
     //So for locator discovery callback to work, its now expected that atleast try to send a batch so that proxy will be initialized
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
   
-     vm2.invoke(WANTestBase.class, "doPuts",
-      new Object[] { getTestMethodName() + "_RR", 10});
+     vm2.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 10));
 
     Integer nyLocPort2 = (Integer)vm3
-        .invoke(WANTestBase.class, "createSecondRemoteLocator", new Object[] {
-            2, nyLocPort1, lnLocPort1 });
+        .invoke(() -> WANTestBase.createSecondRemoteLocator(
+            2, nyLocPort1, lnLocPort1 ));
 
     InetSocketAddress locatorToWaitFor = new InetSocketAddress("localhost",
         nyLocPort2);
 
-    vm2.invoke(WANTestBase.class, "checkLocatorsinSender",
-        new Object[] {"ln", locatorToWaitFor });
+    vm2.invoke(() -> WANTestBase.checkLocatorsinSender("ln", locatorToWaitFor ));
 
     Integer nyLocPort3 = (Integer)vm4
-        .invoke(WANTestBase.class, "createSecondRemoteLocator", new Object[] {
-            2, nyLocPort1, lnLocPort1 });
+        .invoke(() -> WANTestBase.createSecondRemoteLocator(
+            2, nyLocPort1, lnLocPort1 ));
     
     locatorToWaitFor = new InetSocketAddress("localhost", nyLocPort3);
 
-    vm2.invoke(WANTestBase.class, "checkLocatorsinSender",
-        new Object[] {"ln", locatorToWaitFor });
+    vm2.invoke(() -> WANTestBase.checkLocatorsinSender("ln", locatorToWaitFor ));
 
   }
   
@@ -343,17 +300,13 @@ public void test_RingTopology() {
     int AsyncInvocationArrSize = 9;
     AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize];
    
-    async[0] = vm0.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 1, site1Port1, site1LocatorsPort, site2LocatorsPort});
+    async[0] = vm0.invokeAsync(() -> WANTestBase.createLocator( 1, site1Port1, site1LocatorsPort, site2LocatorsPort));
    
-    async[1] = vm1.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 2, site2Port1, site2LocatorsPort, site3LocatorsPort});
+    async[1] = vm1.invokeAsync(() -> WANTestBase.createLocator( 2, site2Port1, site2LocatorsPort, site3LocatorsPort));
    
-    async[2] = vm2.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 3, site3Port1, site3LocatorsPort, site4LocatorsPort});
+    async[2] = vm2.invokeAsync(() -> WANTestBase.createLocator( 3, site3Port1, site3LocatorsPort, site4LocatorsPort));
    
-    async[3] = vm3.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 4, site4Port1, site4LocatorsPort, site1LocatorsPort});
+    async[3] = vm3.invokeAsync(() -> WANTestBase.createLocator( 4, site4Port1, site4LocatorsPort, site1LocatorsPort));
    
    // pause(5000);
     try {
@@ -366,14 +319,10 @@ public void test_RingTopology() {
       fail("Could not join async operations");
     }
    
-    vm0.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm1.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm2.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm3.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
+    vm0.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm1.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm2.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm3.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
   }
   
   public void ___test_3Sites3Locators() {
@@ -409,28 +358,19 @@ public void ___test_3Sites3Locators() {
     int AsyncInvocationArrSize = 9;
     AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize];
     
-    async[0] = vm0.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 1, site1Port1, site1LocatorsPort, site2LocatorsPort});
+    async[0] = vm0.invokeAsync(() -> WANTestBase.createLocator( 1, site1Port1, site1LocatorsPort, site2LocatorsPort));
     
-    async[8] = vm0.invokeAsync(WANTestBase.class,
-        "checkAllSiteMetaDataFor3Sites", new Object[] {dsVsPort});
+    async[8] = vm0.invokeAsync(() -> WANTestBase.checkAllSiteMetaDataFor3Sites(dsVsPort));
     
-    async[1] = vm1.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 1, site1Port2, site1LocatorsPort, site2LocatorsPort});
-    async[2] = vm2.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 1, site1Port3, site1LocatorsPort, site2LocatorsPort});
+    async[1] = vm1.invokeAsync(() -> WANTestBase.createLocator( 1, site1Port2, site1LocatorsPort, site2LocatorsPort));
+    async[2] = vm2.invokeAsync(() -> WANTestBase.createLocator( 1, site1Port3, site1LocatorsPort, site2LocatorsPort));
     
-    async[3] = vm3.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 2, site2Port1, site2LocatorsPort, site3LocatorsPort});
-    async[4] = vm4.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 2, site2Port2, site2LocatorsPort, site3LocatorsPort});
-    async[5] = vm5.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 2, site2Port3, site2LocatorsPort, site3LocatorsPort});
+    async[3] = vm3.invokeAsync(() -> WANTestBase.createLocator( 2, site2Port1, site2LocatorsPort, site3LocatorsPort));
+    async[4] = vm4.invokeAsync(() -> WANTestBase.createLocator( 2, site2Port2, site2LocatorsPort, site3LocatorsPort));
+    async[5] = vm5.invokeAsync(() -> WANTestBase.createLocator( 2, site2Port3, site2LocatorsPort, site3LocatorsPort));
     
-    async[6] = vm6.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 3, site3Port1, site3LocatorsPort, site1LocatorsPort});
-    async[7] = vm7.invokeAsync(WANTestBase.class,
-        "createLocator", new Object[] { 3, site3Port2, site3LocatorsPort, site1LocatorsPort});
+    async[6] = vm6.invokeAsync(() -> WANTestBase.createLocator( 3, site3Port1, site3LocatorsPort, site1LocatorsPort));
+    async[7] = vm7.invokeAsync(() -> WANTestBase.createLocator( 3, site3Port2, site3LocatorsPort, site1LocatorsPort));
     
     WANTestBase.createLocator(3, site3Port3, site3LocatorsPort, site1LocatorsPort);
     long startTime = System.currentTimeMillis();
@@ -460,22 +400,14 @@ public void ___test_3Sites3Locators() {
     
     LogWriterUtils.getLogWriter().info("Time taken for all 9 locators discovery in 3 sites: " + (endTime.longValue() - startTime));
     
-    vm0.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm1.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm2.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm3.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm4.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm5.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm6.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
-    vm7.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
-        new Object[] { dsVsPort });
+    vm0.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm1.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm2.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm3.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm4.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm5.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm6.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
+    vm7.invoke(() -> WANTestBase.checkAllSiteMetaDataFor3Sites( dsVsPort ));
     WANTestBase.checkAllSiteMetaDataFor3Sites(dsVsPort);
   }
   
@@ -485,19 +417,14 @@ public void test_LN_Peer_Locators_Exchange_Information() {
     Map> dsVsPort = new HashMap>();
     dsVsPort.put(1, locatorPorts);
 
-    Integer lnLocPort1 = (Integer)vm0.invoke(
-        WANTestBase.class, "createFirstPeerLocator",
-        new Object[] {1});
+    Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstPeerLocator(1));
     locatorPorts.add(lnLocPort1);
 
-    Integer lnLocPort2 = (Integer)vm1.invoke(WANTestBase.class,
-        "createSecondPeerLocator", new Object[] { 1, lnLocPort1 });
+    Integer lnLocPort2 = (Integer)vm1.invoke(() -> WANTestBase.createSecondPeerLocator( 1, lnLocPort1 ));
     locatorPorts.add(lnLocPort2);
     
-    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
+    vm0.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm1.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
   }
   
   public void test_LN_NY_TK_5_PeerLocators_1_ServerLocator() {
@@ -506,53 +433,36 @@ public void test_LN_NY_TK_5_PeerLocators_1_ServerLocator() {
     
     ArrayList locatorPorts = new ArrayList();
     dsVsPort.put(1, locatorPorts);
-    Integer lnLocPort1 = (Integer)vm0.invoke(
-        WANTestBase.class, "createFirstPeerLocator",
-        new Object[] {1});
+    Integer lnLocPort1 = (Integer)vm0.invoke(() -> WANTestBase.createFirstPeerLocator(1));
     locatorPorts.add(lnLocPort1);
-    Integer lnLocPort2 = (Integer)vm1.invoke(WANTestBase.class,
-        "createSecondPeerLocator", new Object[] { 1, lnLocPort1 });
+    Integer lnLocPort2 = (Integer)vm1.invoke(() -> WANTestBase.createSecondPeerLocator( 1, lnLocPort1 ));
     locatorPorts.add(lnLocPort2);
     
     locatorPorts = new ArrayList();
     dsVsPort.put(2, locatorPorts);
-    Integer nyLocPort1 = (Integer)vm2.invoke(
-        WANTestBase.class, "createFirstRemotePeerLocator",
-        new Object[] {2, lnLocPort1});
+    Integer nyLocPort1 = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemotePeerLocator(2, lnLocPort1));
     locatorPorts.add(nyLocPort1);
-    Integer nyLocPort2 = (Integer)vm3.invoke(WANTestBase.class,
-        "createSecondRemotePeerLocator", new Object[] { 2, nyLocPort1, lnLocPort2});
+    Integer nyLocPort2 = (Integer)vm3.invoke(() -> WANTestBase.createSecondRemotePeerLocator( 2, nyLocPort1, lnLocPort2));
     locatorPorts.add(nyLocPort2);
     
     locatorPorts = new ArrayList();
     dsVsPort.put(3, locatorPorts);
-    Integer tkLocPort1 = (Integer)vm4.invoke(
-        WANTestBase.class, "createFirstRemotePeerLocator",
-        new Object[] {3, nyLocPort1});
+    Integer tkLocPort1 = (Integer)vm4.invoke(() -> WANTestBase.createFirstRemotePeerLocator(3, nyLocPort1));
     locatorPorts.add(tkLocPort1);
-    Integer tkLocPort2 = (Integer)vm5.invoke(WANTestBase.class,
-        "createSecondRemotePeerLocator", new Object[] { 3, tkLocPort1, nyLocPort1});
+    Integer tkLocPort2 = (Integer)vm5.invoke(() -> WANTestBase.createSecondRemotePeerLocator( 3, tkLocPort1, nyLocPort1));
     locatorPorts.add(tkLocPort2);
-    Integer tkLocPort3 = (Integer)vm6.invoke(WANTestBase.class,
-        "createSecondRemoteLocator", new Object[] { 3, tkLocPort1, nyLocPort2});
+    Integer tkLocPort3 = (Integer)vm6.invoke(() -> WANTestBase.createSecondRemoteLocator( 3, tkLocPort1, nyLocPort2));
     locatorPorts.add(tkLocPort3);
     
    // pause(5000);
     
-    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm3.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm4.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm5.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
-    vm6.invoke(WANTestBase.class, "checkAllSiteMetaData",
-        new Object[] { dsVsPort });
+    vm0.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm1.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm2.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm3.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm4.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm5.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
+    vm6.invoke(() -> WANTestBase.checkAllSiteMetaData( dsVsPort ));
         
   }
   
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
index 80514d9064b2..2fef83a5c012 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -59,31 +59,23 @@ public void testSameSerialGatewaySenderIdAcrossSameDistributedRegion()
       throws Exception {
     IgnoredException.addIgnoredException("another cache has the same region defined");
     try {
-      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));
       
-      vm4.invoke(WANTestBase.class, "createCache",
-          new Object[] {lnPort });
-      vm5.invoke(WANTestBase.class, "createCache",
-          new Object[] {lnPort });
-
-      vm4.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln1", 2, false, 10, 100, false, false, null, true});
-      vm4.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2", 2, false, 10, 100, false, false, null, true});
+      vm4.invoke(() -> WANTestBase.createCache(lnPort ));
+      vm5.invoke(() -> WANTestBase.createCache(lnPort ));
+
+      vm4.invoke(() -> WANTestBase.createSender("ln1", 2, false, 10, 100, false, false, null, true));
+      vm4.invoke(() -> WANTestBase.createSender("ln2", 2, false, 10, 100, false, false, null, true));
       
-      vm5.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2", 2, false, 10, 100, false, false, null, true});
-      vm5.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln3", 2, false, 10, 100, false, false, null, true});
+      vm5.invoke(() -> WANTestBase.createSender("ln2", 2, false, 10, 100, false, false, null, true));
+      vm5.invoke(() -> WANTestBase.createSender("ln3", 2, false, 10, 100, false, false, null, true));
       
-     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() });
+     vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() ));
       
-      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln2,ln3", isOffHeap() });
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln2,ln3", isOffHeap() ));
       fail("Expected IllegalStateException with incompatible gateway sender ids message");
     }
     catch (Exception e) {
@@ -111,25 +103,23 @@ public void testSameSerialGatewaySenderIdAcrossSameDistributedRegion()
 
   public void DISABLED_DUETO_BUG51491_testParallelGatewaySenderForDistributedRegion() throws Exception {
     try {
-      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 ));
 
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
 
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-          true, 10, 100, false, false, null, false });
+      vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+          true, 10, 100, false, false, null, false ));
 
-      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 2,
-          true, 10, 100, false, false, null, false });
+      vm5.invoke(() -> WANTestBase.createSender( "ln2", 2,
+          true, 10, 100, false, false, null, false ));
 
-      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
+      vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
 
-      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-          getTestMethodName() + "_RR", "ln1", isOffHeap()  });
+      vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
 
     }
     catch (Exception e) {
@@ -145,28 +135,21 @@ public void testSameSerialGatewaySenderIdAcrossSamePartitionedRegion()
       throws Exception {
     IgnoredException.addIgnoredException("another cache has the same region defined");
     try {
-      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
-          new Object[] {1});
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
 
-      vm4.invoke(WANTestBase.class, "createCache",
-          new Object[] {lnPort });
-      vm5.invoke(WANTestBase.class, "createCache",
-          new Object[] {lnPort });
+      vm4.invoke(() -> WANTestBase.createCache(lnPort ));
+      vm5.invoke(() -> WANTestBase.createCache(lnPort ));
       
-      vm4.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln1", 2, false, 10, 100, false, false, null, true});
-      vm4.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2", 2, false, 10, 100, false, false, null, true});
+      vm4.invoke(() -> WANTestBase.createSender("ln1", 2, false, 10, 100, false, false, null, true));
+      vm4.invoke(() -> WANTestBase.createSender("ln2", 2, false, 10, 100, false, false, null, true));
       
-      vm5.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2", 2, false, 10, 100, false, false, null, true});
-      vm5.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln3", 2, false, 10, 100, false, false, null, true});
+      vm5.invoke(() -> WANTestBase.createSender("ln2", 2, false, 10, 100, false, false, null, true));
+      vm5.invoke(() -> WANTestBase.createSender("ln3", 2, false, 10, 100, false, false, null, true));
       
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          getTestMethodName() + "_PR", "ln1,ln2", 1, 100, isOffHeap()  });
-      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          getTestMethodName() + "_PR", "ln2,ln3", 1, 100, isOffHeap()  });
+      vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+          getTestMethodName() + "_PR", "ln1,ln2", 1, 100, isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+          getTestMethodName() + "_PR", "ln2,ln3", 1, 100, isOffHeap()  ));
       fail("Expected IllegalStateException with incompatible gateway sender ids message");
     }
     catch (Exception e) {
@@ -183,18 +166,15 @@ public void testSameSerialGatewaySenderIdAcrossSamePartitionedRegion()
   public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() {
     IgnoredException.addIgnoredException("another cache has the same region defined");
     try {
-      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-          "createFirstLocatorWithDSId", new Object[] { 1 });
-
-      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-      vm4.invoke(WANTestBase.class,
-          "createReplicatedRegionWithAsyncEventQueue", new Object[] {
-              getTestMethodName() + "_RR", "ln1", isOffHeap()  });
-      vm5.invoke(WANTestBase.class,
-          "createReplicatedRegionWithAsyncEventQueue", new Object[] {
-              getTestMethodName() + "_RR", "ln2", isOffHeap()  });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+
+      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+
+      vm4.invoke(() -> WANTestBase.createReplicatedRegionWithAsyncEventQueue(
+              getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createReplicatedRegionWithAsyncEventQueue(
+              getTestMethodName() + "_RR", "ln2", isOffHeap()  ));
       fail("Expected IllegalStateException with incompatible gateway sender ids message");
     }
     catch (Exception e) {
@@ -215,28 +195,21 @@ public void testSameParallelGatewaySenderIdAcrossSamePartitionedRegion()
       throws Exception {
     IgnoredException.addIgnoredException("another cache has the same region defined");
     try {
-      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
-          new Object[] {1});
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
 
-      vm4.invoke(WANTestBase.class, "createCache",
-          new Object[] {lnPort });
-      vm5.invoke(WANTestBase.class, "createCache",
-          new Object[] {lnPort });
+      vm4.invoke(() -> WANTestBase.createCache(lnPort ));
+      vm5.invoke(() -> WANTestBase.createCache(lnPort ));
       
-      vm4.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln1", 2, true, 10, 100, false, false, null, true});
-      vm4.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2", 2, true, 10, 100, false, false, null, true});
+      vm4.invoke(() -> WANTestBase.createSender("ln1", 2, true, 10, 100, false, false, null, true));
+      vm4.invoke(() -> WANTestBase.createSender("ln2", 2, true, 10, 100, false, false, null, true));
       
-      vm5.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2", 2, true, 10, 100, false, false, null, true});
-      vm5.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln3", 2, true, 10, 100, false, false, null, true});
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          getTestMethodName() + "_PR", "ln1,ln2", 1, 100, isOffHeap()  });
-      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          getTestMethodName() + "_PR", "ln2,ln3", 1, 100, isOffHeap()  });
+      vm5.invoke(() -> WANTestBase.createSender("ln2", 2, true, 10, 100, false, false, null, true));
+      vm5.invoke(() -> WANTestBase.createSender("ln3", 2, true, 10, 100, false, false, null, true));
+
+      vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+          getTestMethodName() + "_PR", "ln1,ln2", 1, 100, isOffHeap()  ));
+      vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+          getTestMethodName() + "_PR", "ln2,ln3", 1, 100, isOffHeap()  ));
       
       fail("Expected IllegalStateException with incompatible gateway sender ids message");
     }
@@ -259,22 +232,17 @@ public void testSameParallelGatewaySenderIdAcrossSamePartitionedRegion()
   public void ___testSameParallelGatewaySenderIdAcrossDifferentPartitionedRegion()
       throws Exception {
     try {
-      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
       
-      vm1.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln1_Parallel", 2, true, 10, 100, false, false, null, true});
-      vm1.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2_Parallel", 2, true, 10, 100, false, false, null, true});
+      vm1.invoke(() -> WANTestBase.createSender("ln1_Parallel", 2, true, 10, 100, false, false, null, true));
+      vm1.invoke(() -> WANTestBase.createSender("ln2_Parallel", 2, true, 10, 100, false, false, null, true));
       
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR1", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  });
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR2", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  });
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR1", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  ));
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR2", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  ));
 
     }
     catch (Exception e) {
@@ -290,22 +258,17 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion()
       throws Exception {
     IgnoredException.addIgnoredException("another cache has the same region defined");
     try {
-      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
       
-      vm1.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln1_Parallel", 2, true, 10, 100, false, false, null, true});
-      vm1.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2_Parallel", 2, true, 10, 100, false, false, null, true});
+      vm1.invoke(() -> WANTestBase.createSender("ln1_Parallel", 2, true, 10, 100, false, false, null, true));
+      vm1.invoke(() -> WANTestBase.createSender("ln2_Parallel", 2, true, 10, 100, false, false, null, true));
       
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR1", null, "ln1_Parallel", null, isOffHeap()  });
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR2", null, "ln1_Parallel,ln2_Parallel", getTestMethodName() + "_PR1", isOffHeap()  });
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR1", null, "ln1_Parallel", null, isOffHeap()  ));
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR2", null, "ln1_Parallel,ln2_Parallel", getTestMethodName() + "_PR1", isOffHeap()  ));
       //now we support this
       //fail("Expected IllegalStateException with incompatible gateway sender ids in colocated regions");
     }
@@ -329,22 +292,17 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion()
   public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion2()
       throws Exception {
     try {
-      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
       
-      vm1.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln1_Parallel", 2, true, 10, 100, false, false, null, true});
-      vm1.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2_Parallel", 2, true, 10, 100, false, false, null, true});
+      vm1.invoke(() -> WANTestBase.createSender("ln1_Parallel", 2, true, 10, 100, false, false, null, true));
+      vm1.invoke(() -> WANTestBase.createSender("ln2_Parallel", 2, true, 10, 100, false, false, null, true));
       
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR1", null, "ln1_Parallel", null, isOffHeap()  });
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR2", null, null, getTestMethodName() + "_PR1", isOffHeap()  });
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR1", null, "ln1_Parallel", null, isOffHeap()  ));
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR2", null, null, getTestMethodName() + "_PR1", isOffHeap()  ));
       
     }
     catch (Exception e) {
@@ -361,22 +319,19 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion2()
   public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion3()
       throws Exception {
     try {
-      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
 
-      vm1.invoke(WANTestBase.class, "createSender", new Object[] {
-          "ln1_Parallel", 2, true, 10, 100, false, false, null, true });
-      vm1.invoke(WANTestBase.class, "createSender", new Object[] {
-          "ln2_Parallel", 2, true, 10, 100, false, false, null, true });
+      vm1.invoke(() -> WANTestBase.createSender(
+          "ln1_Parallel", 2, true, 10, 100, false, false, null, true ));
+      vm1.invoke(() -> WANTestBase.createSender(
+          "ln2_Parallel", 2, true, 10, 100, false, false, null, true ));
 
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR1", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  });
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR2", null, "ln1_Parallel", getTestMethodName() + "_PR1", isOffHeap()  });
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR1", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  ));
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR2", null, "ln1_Parallel", getTestMethodName() + "_PR1", isOffHeap()  ));
 
     } catch (Exception e) {
       Assert.fail("The tests caught Exception.", e);
@@ -392,24 +347,18 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion3()
   public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion4()
       throws Exception {
     try {
-      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-          "createFirstLocatorWithDSId", new Object[] { 1 });
-
-      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-      vm1.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln1_Parallel", 2, true, 10, 100, false, false, null, true});
-      vm1.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln2_Parallel", 2, true, 10, 100, false, false, null, true});
-      vm1.invoke(WANTestBase.class, "createSender",
-          new Object[] {"ln3_Parallel", 2, true, 10, 100, false, false, null, true});
-
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR1", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  });
-      vm1.invoke(WANTestBase.class,
-          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
-              getTestMethodName() + "_PR2", null, "ln1_Parallel,ln2_Parallel,ln3_Parallel", getTestMethodName() + "_PR1", isOffHeap()  });
+      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+
+      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+
+      vm1.invoke(() -> WANTestBase.createSender("ln1_Parallel", 2, true, 10, 100, false, false, null, true));
+      vm1.invoke(() -> WANTestBase.createSender("ln2_Parallel", 2, true, 10, 100, false, false, null, true));
+      vm1.invoke(() -> WANTestBase.createSender("ln3_Parallel", 2, true, 10, 100, false, false, null, true));
+
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR1", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  ));
+      vm1.invoke(() -> WANTestBase.createPartitionedRegionWithSerialParallelSenderIds(
+              getTestMethodName() + "_PR2", null, "ln1_Parallel,ln2_Parallel,ln3_Parallel", getTestMethodName() + "_PR1", isOffHeap()  ));
       //now we support this
       //fail("Expected IllegalStateException with incompatible gateway sender ids in colocated regions");
     } catch (Exception e) {
@@ -427,16 +376,15 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion4()
    * SerialGatewaySender and ParallelGatewaySender with same name is allowed
    */
   public void testSerialGatewaySenderAndParallelGatewaySenderWithSameName() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
-        "ln", 2, false, 100, false, false, null, null, true, false });
+    vm1.invoke(() -> WANTestBase.createSenderForValidations(
+        "ln", 2, false, 100, false, false, null, null, true, false ));
     try {
-      vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
-          "ln", 2, true, 100, false, false, null, null, true, false });
+      vm1.invoke(() -> WANTestBase.createSenderForValidations(
+          "ln", 2, true, 100, false, false, null, null, true, false ));
       fail("Expected IllegateStateException : Sender names should be different.");
     } catch (Exception e) {
       if (!(e.getCause() instanceof IllegalStateException)
@@ -449,20 +397,19 @@ public void testSerialGatewaySenderAndParallelGatewaySenderWithSameName() {
   
   //remote ds ids should be same
   public void testSameRemoteDSAcrossSameSender() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+    vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null, null,
-        true, false  });
+        true, false  ));
 
     try {
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+      vm2.invoke(() -> WANTestBase.createSenderForValidations(
           "ln", 3, false, 100, false, false, null, null,
-          true, false  });
+          true, false  ));
       fail("Expected IllegateStateException : Remote Ds Ids should match");
     }
     catch (Exception e) {
@@ -476,19 +423,18 @@ public void testSameRemoteDSAcrossSameSender() {
   
   // sender with same name should be either serial or parallel but not both.
   public void testSerialSenderOnBothCache() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+    vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null, null,
-        true, false  });
+        true, false  ));
 
     try {
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
-          "ln", 2, true, 100, false, false, null, null, true, false  });
+      vm2.invoke(() -> WANTestBase.createSenderForValidations(
+          "ln", 2, true, 100, false, false, null, null, true, false  ));
       fail("Expected IllegateStateException : is not serial Gateway Sender");
     }
     catch (Exception e) {
@@ -502,21 +448,20 @@ public void testSerialSenderOnBothCache() {
   
   // sender with same name should be either serial or parallel but not both.
   public void testParallelSenderOnBothCache(){
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
-        new Object[] {1});
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+    vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         true, 100,false, false,
-        null, null, true, false  });
+        null, null, true, false  ));
     
     try {
       vm2
-          .invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+          .invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
               false, 100, false, false,null, null,
-              true, false  });
+              true, false  ));
       fail("Expected IllegateStateException : is not parallel Gateway Sender");
     }
     catch (Exception e) {
@@ -529,21 +474,20 @@ public void testParallelSenderOnBothCache(){
   
   // isBatchConflation should be same across the same sender
   public void testBatchConflation() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+    vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         false, 100, false, false,
-        null, null, true, false  });
+        null, null, true, false  ));
 
     // isBatchConflation
     try {
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+      vm2.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
           false, 100,true, false,
-          null, null, true, false  });
+          null, null, true, false  ));
       fail("Expected IllegateStateException : isBatchConflation Should match");
     }
     catch (Exception e) {
@@ -556,18 +500,17 @@ public void testBatchConflation() {
   
   //isPersistentEnabled should be same across the same sender
   public void testisPersistentEnabled() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+    vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         false, 100, false, false,
-        null, null, true, false  });
+        null, null, true, false  ));
     try {
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
-        false, 100,false, true, null, null, true, false  });
+      vm2.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
+        false, 100,false, true, null, null, true, false  ));
       fail("Expected IllegateStateException : isPersistentEnabled Should match");
     }
     catch (Exception e) {
@@ -579,18 +522,17 @@ public void testisPersistentEnabled() {
   }
   
   public void testAlertThreshold() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+    vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         false, 100, false, false,
-        null, null, true, false });
+        null, null, true, false ));
     try {
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
-        false, 50, false, false, null, null, true, false  });
+      vm2.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
+        false, 50, false, false, null, null, true, false  ));
       fail("Expected IllegateStateException : alertThreshold Should match");
     }
     catch (Exception e) {
@@ -602,18 +544,17 @@ public void testAlertThreshold() {
   }
   
   public void testManualStart() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+    vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         false, 100, false, false,
-        null, null, true, false  });
+        null, null, true, false  ));
     try {
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
-        false, 100, false, false, null, null, false, false  });
+      vm2.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
+        false, 100, false, false, null, null, false, false  ));
       fail("Expected IllegateStateException : manualStart Should match");
     }
     catch (Exception e) {
@@ -625,23 +566,22 @@ public void testManualStart() {
   }
   
   public void testGatewayEventFilters() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
     ArrayList eventFiletrs = new ArrayList();
     eventFiletrs.add(new MyGatewayEventFilter());
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+    vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, eventFiletrs,
-        null, true, false  });
+        null, true, false  ));
     try {
       eventFiletrs = new ArrayList();
       eventFiletrs.add(new Filter70());
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+      vm2.invoke(() -> WANTestBase.createSenderForValidations(
           "ln", 2, false, 100, false, false,
-          eventFiletrs, null, true, false  });
+          eventFiletrs, null, true, false  ));
       fail("Expected IllegateStateException : GatewayEventFileters Should match");
     }
     catch (Exception e) {
@@ -654,24 +594,23 @@ public void testGatewayEventFilters() {
   }
   
   public void testGatewayEventFilters2() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
     ArrayList eventFiletrs = new ArrayList();
     eventFiletrs.add(new MyGatewayEventFilter());
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+    vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, eventFiletrs,
-        null, true, false  });
+        null, true, false  ));
     try {
       eventFiletrs = new ArrayList();
       eventFiletrs.add(new MyGatewayEventFilter());
       eventFiletrs.add(new Filter70());
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+      vm2.invoke(() -> WANTestBase.createSenderForValidations(
           "ln", 2, false, 100, false, false,
-          eventFiletrs, null, true, false  });
+          eventFiletrs, null, true, false  ));
       fail("Expected IllegateStateException : GatewayEventFileters Should match");
     }
     catch (Exception e) {
@@ -684,25 +623,24 @@ public void testGatewayEventFilters2() {
   }
   
   public void testGatewayTransportFilters() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
     ArrayList transportFiletrs = new ArrayList();
     transportFiletrs.add(new MyGatewayTransportFilter1());
     transportFiletrs.add(new MyGatewayTransportFilter2());
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+    vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null,
-        transportFiletrs, true, false  });
+        transportFiletrs, true, false  ));
    try {
       transportFiletrs = new ArrayList();
       transportFiletrs.add(new MyGatewayTransportFilter3());
       transportFiletrs.add(new MyGatewayTransportFilter4());
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+      vm2.invoke(() -> WANTestBase.createSenderForValidations(
           "ln", 2, false, 100, false, false,
-          null, transportFiletrs, true, false  });
+          null, transportFiletrs, true, false  ));
       fail("Expected IllegateStateException : GatewayEventFileters Should match");
     }
     catch (Exception e) {
@@ -715,25 +653,24 @@ public void testGatewayTransportFilters() {
   }
 
   public void testGatewayTransportFiltersOrder() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
     ArrayList transportFiletrs = new ArrayList();
     transportFiletrs.add(new MyGatewayTransportFilter1());
     transportFiletrs.add(new MyGatewayTransportFilter2());
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+    vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null,
-        transportFiletrs, true, false  });
+        transportFiletrs, true, false  ));
    try {
       transportFiletrs = new ArrayList();
       transportFiletrs.add(new MyGatewayTransportFilter2());
       transportFiletrs.add(new MyGatewayTransportFilter1());
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+      vm2.invoke(() -> WANTestBase.createSenderForValidations(
           "ln", 2, false, 100, false, false,
-          null, transportFiletrs, true, false });
+          null, transportFiletrs, true, false ));
       fail("Expected IllegateStateException : GatewayEventFileters Should match");
     }
     catch (Exception e) {
@@ -749,17 +686,17 @@ public void testGatewayTransportFiltersOrder() {
 //    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
 //        "createFirstLocatorWithDSId", new Object[] { 1 });
 //
-//    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-//    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+//    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+//    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 //
-//    vm1.invoke(WANTestBase.class, "createSenderWithListener", new Object[] {
+//    vm1.invoke(() -> WANTestBase.createSenderWithListener(
 //        "ln", 2, false, 100, 10, false, false, null,
-//        true, true });
+//        true, true ));
 //    
 //   try {
-//      vm2.invoke(WANTestBase.class, "createSenderWithListener", new Object[] {
+//      vm2.invoke(() -> WANTestBase.createSenderWithListener(
 //        "ln", 2, false, 100, 10, false, false, null,
-//        false, true });
+//        false, true ));
 //      fail("Expected IllegateStateException : GatewayEventFileters Should match");
 //    }
 //    catch (Exception e) {
@@ -772,20 +709,19 @@ public void testGatewayTransportFiltersOrder() {
 //  }
   
   public void testIsDiskSynchronous() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+    vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null,
-        null, true, false });
+        null, true, false ));
     
    try {
-      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+      vm2.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null,
-        null, true, true });
+        null, true, true ));
       fail("Expected IllegateStateException : isDiskSynchronous Should match");
     }
     catch (Exception e) {
@@ -803,14 +739,13 @@ public void testIsDiskSynchronous() {
    * Expected: Cache.getCacheServer should return only the Bridge server and not the Receiver
    */
   public void test_GetCacheServersDoesNotReturnReceivers() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createReceiver( lnPort ));
     
-    vm4.invoke(WANTestBase.class, "createCacheServer", new Object[] { });
+    vm4.invoke(() -> WANTestBase.createCacheServer( ));
     
-    Map cacheServers = (Map) vm4.invoke(WANTestBase.class, "getCacheServers", new Object[] { });
+    Map cacheServers = (Map) vm4.invoke(() -> WANTestBase.getCacheServers( ));
     
     assertEquals("Cache.getCacheServers returned incorrect BridgeServers: ", 1, cacheServers.get("BridgeServer"));
     assertEquals("Cache.getCacheServers returned incorrect ReceiverServers: ", 0, cacheServers.get("ReceiverServer"));
@@ -823,16 +758,15 @@ public void test_GetCacheServersDoesNotReturnReceivers() {
    * Expected: Cache.getCacheServers should only return the bridge server and not the Receiver.
    */
   public void test_GetCacheServersDoesNotReturnReceivers_Scenario2() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
     
-    vm5.invoke(WANTestBase.class, "createCacheServer", new Object[] { });
+    vm5.invoke(() -> WANTestBase.createCacheServer( ));
     
-    Map cacheServers_vm4 = (Map) vm4.invoke(WANTestBase.class, "getCacheServers", new Object[] { });
-    Map cacheServers_vm5 = (Map) vm5.invoke(WANTestBase.class, "getCacheServers", new Object[] { });
+    Map cacheServers_vm4 = (Map) vm4.invoke(() -> WANTestBase.getCacheServers( ));
+    Map cacheServers_vm5 = (Map) vm5.invoke(() -> WANTestBase.getCacheServers( ));
     
     assertEquals("Cache.getCacheServers on vm4 returned incorrect BridgeServers: ", 0, cacheServers_vm4.get("BridgeServer"));
     assertEquals("Cache.getCacheServers on vm4 returned incorrect ReceiverServers: ", 0, cacheServers_vm4.get("ReceiverServer"));
@@ -849,19 +783,18 @@ public void test_GetCacheServersDoesNotReturnReceivers_Scenario2() {
    * on number of machines
    */ 
   public void DISABLED_testDispatcherThreadsForParallelGatewaySender() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm1.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
 
     // dispatcher threads
     try {
-      vm2.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+      vm2.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
       fail("Expected IllegateStateException : dispatcher threads Should match");
     }
     catch (Exception e) {
@@ -880,19 +813,18 @@ public void DISABLED_testDispatcherThreadsForParallelGatewaySender() {
    * disabling the tests
    */
   public void DISABLED_testOrderPolicyForParallelGatewaySender() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm1.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm1.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
 
     // dispatcher threads
     try {
-      vm2.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+      vm2.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
       fail("Expected IllegateStateException : order policy Should match");
     }
     catch (Exception e) {
@@ -904,43 +836,41 @@ public void DISABLED_testOrderPolicyForParallelGatewaySender() {
   }
 
   public void testBug50434_RR_Serial() 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 });
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    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,
-        false, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_RR", "ln"});
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_RR", "ln"));
     
-    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_RR", "ln"});
+    vm5.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_RR", "ln"));
 
     try {
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-          10 });
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+          10 ));
       fail("Expected GatewaySenderConfigurationException : Sender Ids should match");
     }
     catch (Exception e) {
@@ -953,41 +883,38 @@ public void testBug50434_RR_Serial() throws Exception {
   }
   
   public void testBug50434_RR_SerialAsyncEventQueue() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-
-    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, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_RR", "ln" });
-
-    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_RR", "ln" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm5.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm6.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm7.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_RR", "ln" ));
+
+    vm5.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_RR", "ln" ));
 
     try {
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
       fail("Expected GatewaySenderConfigurationException : AsyncEvent queue IDs should match");
     }
     catch (Exception e) {
@@ -1000,153 +927,144 @@ public void testBug50434_RR_SerialAsyncEventQueue() throws Exception {
   }
   
   public void testBug50434_RR_Serial_Pass() 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 });
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    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,
-        false, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_RR", "ln"});
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_RR", "ln"));
     
-    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_RR", "ln"});
+    vm5.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_RR", "ln"));
     
-    vm6.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_RR", "ln"});
+    vm6.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_RR", "ln"));
     
-    vm7.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_RR", "ln"});
+    vm7.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_RR", "ln"));
     
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        10});
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        10));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10});
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10));
   }
   
   public void testBug50434_RR_SerialAsyncEventQueue_Pass() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-
-    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, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_RR", "ln" });
-    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_RR", "ln" });
-    vm6.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_RR", "ln" });
-    vm7.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_RR", "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm4.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
-        "ln", 1000 });// primary sender
-    vm5.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
-        "ln", 0 });// secondary
-    vm6.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
-        "ln", 0 });// secondary
-    vm7.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
-        "ln", 0 });// secondary
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm5.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm6.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm7.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_RR", "ln" ));
+    vm5.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_RR", "ln" ));
+    vm6.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_RR", "ln" ));
+    vm7.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_RR", "ln" ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm4.invoke(() -> WANTestBase.validateAsyncEventListener(
+        "ln", 1000 ));// primary sender
+    vm5.invoke(() -> WANTestBase.validateAsyncEventListener(
+        "ln", 0 ));// secondary
+    vm6.invoke(() -> WANTestBase.validateAsyncEventListener(
+        "ln", 0 ));// secondary
+    vm7.invoke(() -> WANTestBase.validateAsyncEventListener(
+        "ln", 0 ));// secondary
   }
   
   public void testBug50434_PR_Serial() 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 });
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, 1, 100, isOffHeap() });
-
-    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 });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      false, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      false, 100, 10, false, false, null, true });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_RR", null, 1, 100, isOffHeap() ));
+
+    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 ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+      false, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+      false, 100, 10, false, false, null, true ));
     
-    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" ));
     
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
     
-    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
+    vm5.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
     
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 
     try {
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        10});
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        10));
       fail("Expected GatewaySenderConfigurationException : Sender Ids should match");
     }
     catch (Exception e) {
@@ -1159,40 +1077,37 @@ public void testBug50434_PR_Serial() throws Exception {
   }
   
   public void testBug50434_PR_SerialAsyncEventQueue() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-
-    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, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
-    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm5.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm6.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm7.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
+    vm5.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
 
     try {
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
       fail("Expected GatewaySenderConfigurationException : AsyncEvent queue IDs should match");
     }
     catch (Exception e) {
@@ -1205,154 +1120,145 @@ public void testBug50434_PR_SerialAsyncEventQueue() throws Exception {
   }
   
   public void testBug50434_PR_Serial_Pass() 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 });
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-
-    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 });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      false, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      false, 100, 10, false, false, null, true });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    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 ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+      false, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+      false, 100, 10, false, false, null, true ));
     
-    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" ));
     
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
-    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
-    vm6.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
-    vm7.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
+    vm5.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
+    vm6.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
+    vm7.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
     
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        10});
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        10));
 
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-      0});
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
+      0));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10});
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10));
   }
   
   public void testBug50434_PR_SerialAsyncEventQueue_Pass() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-
-    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, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        false, 100, 100, false, false, null, false });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
-    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
-    vm6.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
-    vm7.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
-
-    vm4.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
-        "ln", 1000 });// primary sender
-    vm5.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
-        "ln", 0 });// secondary
-    vm6.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
-        "ln", 0 });// secondary
-    vm7.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
-        "ln", 0 });// secondary
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm5.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm6.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+    vm7.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
+    vm5.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
+    vm6.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
+    vm7.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
+
+    vm4.invoke(() -> WANTestBase.validateAsyncEventListener(
+        "ln", 1000 ));// primary sender
+    vm5.invoke(() -> WANTestBase.validateAsyncEventListener(
+        "ln", 0 ));// secondary
+    vm6.invoke(() -> WANTestBase.validateAsyncEventListener(
+        "ln", 0 ));// secondary
+    vm7.invoke(() -> WANTestBase.validateAsyncEventListener(
+        "ln", 0 ));// secondary
   }
   
   public void testBug50434_PR_Parallel() 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 });
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()});
-
-    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 });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
+
+    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 ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap()});
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()});
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()});
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()});
-
-    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
-    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
+
+    vm4.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
+    vm5.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
     
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
     try {
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        10});
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        10));
       fail("Expected GatewaySenderConfigurationException : Sender Ids should match");
     }
     catch (Exception e) {
@@ -1365,40 +1271,37 @@ public void testBug50434_PR_Parallel() throws Exception {
   }
   
   public void testBug50434_PR_ParallelAsyncEventQueue() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-
-    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, "createAsyncEventQueue", new Object[] { "ln",
-        true, 100, 100, false, false, null, false });
-    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        true, 100, 100, false, false, null, false });
-    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        true, 100, 100, false, false, null, false });
-    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        true, 100, 100, false, false, null, false });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
-    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        true, 100, 100, false, false, null, false ));
+    vm5.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        true, 100, 100, false, false, null, false ));
+    vm6.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        true, 100, 100, false, false, null, false ));
+    vm7.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        true, 100, 100, false, false, null, false ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
+    vm5.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
     
     try {
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        10});
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        10));
       fail("Expected GatewaySenderConfigurationException : AsyncEvent queue IDs should match");
     }
     catch (Exception e) {
@@ -1411,141 +1314,123 @@ public void testBug50434_PR_ParallelAsyncEventQueue() throws Exception {
   }
   
   public void testBug50434_PR_Parallel_pass() 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 });
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()});
-
-    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", null, 1, 10, isOffHeap()});
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()});
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()});
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 1, 10, 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" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
+
+    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", null, 1, 10, isOffHeap()));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
-    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
-    vm6.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
-    vm7.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
-      getTestMethodName() + "_PR", "ln"});
+    vm4.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
+    vm5.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
+    vm6.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
+    vm7.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
+      getTestMethodName() + "_PR", "ln"));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        10});
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        10));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10});
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10));
   }
   
   public void testBug50434_PR_ParallelAsyncEventQueue_Pass() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-
-    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, "createAsyncEventQueue", new Object[] { "ln",
-        true, 100, 100, false, false, null, false });
-    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        true, 100, 100, false, false, null, false });
-    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        true, 100, 100, false, false, null, false });
-    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
-        true, 100, 100, false, false, null, false });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
-    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
-    vm6.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
-    vm7.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
-        new Object[] { getTestMethodName() + "_PR", "ln" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        true, 100, 100, false, false, null, false ));
+    vm5.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        true, 100, 100, false, false, null, false ));
+    vm6.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        true, 100, 100, false, false, null, false ));
+    vm7.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
+        true, 100, 100, false, false, null, false ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
+    vm5.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
+    vm6.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
+    vm7.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_PR", "ln" ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        256 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        256 ));
     
-    vm4.invoke(WANTestBase.class, "waitForAsyncQueueToGetEmpty",
-        new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "waitForAsyncQueueToGetEmpty",
-        new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "waitForAsyncQueueToGetEmpty",
-        new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "waitForAsyncQueueToGetEmpty",
-        new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForAsyncQueueToGetEmpty( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForAsyncQueueToGetEmpty( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForAsyncQueueToGetEmpty( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForAsyncQueueToGetEmpty( "ln" ));
     
-    int vm4size = (Integer)vm4.invoke(WANTestBase.class, "getAsyncEventListenerMapSize",
-        new Object[] { "ln"});
-    int vm5size = (Integer)vm5.invoke(WANTestBase.class, "getAsyncEventListenerMapSize",
-        new Object[] { "ln"});
-    int vm6size = (Integer)vm6.invoke(WANTestBase.class, "getAsyncEventListenerMapSize",
-        new Object[] { "ln"});
-    int vm7size = (Integer)vm7.invoke(WANTestBase.class, "getAsyncEventListenerMapSize",
-        new Object[] { "ln"});
+    int vm4size = (Integer)vm4.invoke(() -> WANTestBase.getAsyncEventListenerMapSize( "ln"));
+    int vm5size = (Integer)vm5.invoke(() -> WANTestBase.getAsyncEventListenerMapSize( "ln"));
+    int vm6size = (Integer)vm6.invoke(() -> WANTestBase.getAsyncEventListenerMapSize( "ln"));
+    int vm7size = (Integer)vm7.invoke(() -> WANTestBase.getAsyncEventListenerMapSize( "ln"));
     
     assertEquals(vm4size + vm5size + vm6size + vm7size, 256);
   }
   
   public void testBug51367_WrongBindAddressOnGatewayReceiver() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm2.invoke(WANTestBase.class, "createReceiverWithBindAddress", new Object[] { lnPort });
+    vm2.invoke(() -> WANTestBase.createReceiverWithBindAddress( lnPort ));
   }
   
   
   public void testBug50247_NonPersistentSenderWithPersistentRegion()
       throws Exception {
     IgnoredException.addIgnoredException("could not get remote locator information");
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
     
     try {
-      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-          true, 10, 100, false, false, null, false });
-      vm4.invoke(WANTestBase.class, "createPartitionedRegionWithPersistence",
-          new Object[] { getTestMethodName() + "_PR", "ln1", 1, 100 });
+      vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
+          true, 10, 100, false, false, null, false ));
+      vm4.invoke(() -> WANTestBase.createPartitionedRegionWithPersistence( getTestMethodName() + "_PR", "ln1", 1, 100 ));
       fail("Expected GatewaySenderException with incompatible gateway sender ids and region");
     }
     catch (Exception e) {
@@ -1559,10 +1444,9 @@ public void testBug50247_NonPersistentSenderWithPersistentRegion()
     }
 
     try {
-      vm5.invoke(WANTestBase.class, "createPartitionedRegionWithPersistence",
-          new Object[] { getTestMethodName() + "_PR", "ln1", 1, 100 });
-      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-          true, 10, 100, false, false, null, false });
+      vm5.invoke(() -> WANTestBase.createPartitionedRegionWithPersistence( getTestMethodName() + "_PR", "ln1", 1, 100 ));
+      vm5.invoke(() -> WANTestBase.createSender( "ln1", 2,
+          true, 10, 100, false, false, null, false ));
       fail("Expected GatewaySenderException with incompatible gateway sender ids and region");
     }
     catch (Exception e) {
@@ -1583,98 +1467,84 @@ public void testBug50247_NonPersistentSenderWithPersistentRegion()
    * enabled: false Async channel persistence enabled: false
    */
   public void testReplicatedSerialAsyncEventQueueWith2WANSites() {
-    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 ));
 
     // ------------ START - CREATE CACHE, REGION ON 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.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, "createAsyncEventQueue", new Object[] {
-        "lnAsync", false, 100, 100, false, false, null, false });
-    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
-        "lnAsync", false, 100, 100, false, false, null, false });
-    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
-        "lnAsync", false, 100, 100, false, false, null, false });
-    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
-        "lnAsync", false, 100, 100, false, false, null, false });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class,
-        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
-            getTestMethodName() + "_RR", "ln", "lnAsync", isOffHeap() });
-    vm5.invoke(WANTestBase.class,
-        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
-            getTestMethodName() + "_RR", "ln", "lnAsync", isOffHeap() });
-    vm6.invoke(WANTestBase.class,
-        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
-            getTestMethodName() + "_RR", "ln", "lnAsync", isOffHeap() });
-    vm7.invoke(WANTestBase.class,
-        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
-            getTestMethodName() + "_RR", "ln", "lnAsync", isOffHeap() });
+    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.createAsyncEventQueue(
+        "lnAsync", false, 100, 100, false, false, null, false ));
+    vm5.invoke(() -> WANTestBase.createAsyncEventQueue(
+        "lnAsync", false, 100, 100, false, false, null, false ));
+    vm6.invoke(() -> WANTestBase.createAsyncEventQueue(
+        "lnAsync", false, 100, 100, false, false, null, false ));
+    vm7.invoke(() -> WANTestBase.createAsyncEventQueue(
+        "lnAsync", false, 100, 100, false, false, null, false ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegionWithSenderAndAsyncEventQueue(
+            getTestMethodName() + "_RR", "ln", "lnAsync", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegionWithSenderAndAsyncEventQueue(
+            getTestMethodName() + "_RR", "ln", "lnAsync", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegionWithSenderAndAsyncEventQueue(
+            getTestMethodName() + "_RR", "ln", "lnAsync", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegionWithSenderAndAsyncEventQueue(
+            getTestMethodName() + "_RR", "ln", "lnAsync", isOffHeap() ));
     // ------------- END - CREATE CACHE, REGION ON LOCAL SITE -------------//
 
     // ------------- START - CREATE CACHE 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 ));
 
-    vm2.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
-        false, 100, 10, false, false, null, true });
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
-        false, 100, 10, false, false, null, true });
+    vm2.invoke(() -> WANTestBase.createSender( "ny", 1,
+        false, 100, 10, false, false, null, true ));
+    vm3.invoke(() -> WANTestBase.createSender( "ny", 1,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
-        "nyAsync", false, 100, 100, false, false, null, false });
-    vm3.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
-        "nyAsync", false, 100, 100, false, false, null, false });
+    vm2.invoke(() -> WANTestBase.createAsyncEventQueue(
+        "nyAsync", false, 100, 100, false, false, null, false ));
+    vm3.invoke(() -> WANTestBase.createAsyncEventQueue(
+        "nyAsync", false, 100, 100, false, false, null, false ));
 
-    vm2.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm2.invoke(() -> WANTestBase.startSender( "ny" ));
+    vm3.invoke(() -> WANTestBase.startSender( "ny" ));
 
-    vm2.invoke(WANTestBase.class,
-        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
-            getTestMethodName() + "_RR", "ny", "nyAsync", isOffHeap() });
-    vm3.invoke(WANTestBase.class,
-        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
-            getTestMethodName() + "_RR", "ny", "nyAsync", isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegionWithSenderAndAsyncEventQueue(
+            getTestMethodName() + "_RR", "ny", "nyAsync", isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegionWithSenderAndAsyncEventQueue(
+            getTestMethodName() + "_RR", "ny", "nyAsync", isOffHeap() ));
 
     // ------------- END - CREATE CACHE, REGION ON REMOTE SITE -------------//
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
 
     // validate AsyncEventListener on local site
-    vm4.invoke(WANTestBase.class, "validateAsyncEventListener",
-        new Object[] { "lnAsync", 1000 });// primary sender
-    vm5.invoke(WANTestBase.class, "validateAsyncEventListener",
-        new Object[] { "lnAsync", 0 });// secondary
-    vm6.invoke(WANTestBase.class, "validateAsyncEventListener",
-        new Object[] { "lnAsync", 0 });// secondary
-    vm7.invoke(WANTestBase.class, "validateAsyncEventListener",
-        new Object[] { "lnAsync", 0 });// secondary
+    vm4.invoke(() -> WANTestBase.validateAsyncEventListener( "lnAsync", 1000 ));// primary sender
+    vm5.invoke(() -> WANTestBase.validateAsyncEventListener( "lnAsync", 0 ));// secondary
+    vm6.invoke(() -> WANTestBase.validateAsyncEventListener( "lnAsync", 0 ));// secondary
+    vm7.invoke(() -> WANTestBase.validateAsyncEventListener( "lnAsync", 0 ));// secondary
 
     // validate region size on remote site
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
     // validate AsyncEventListener on remote site
-    vm2.invoke(WANTestBase.class, "validateAsyncEventListener",
-        new Object[] { "nyAsync", 1000 });// primary sender
-    vm3.invoke(WANTestBase.class, "validateAsyncEventListener",
-        new Object[] { "nyAsync", 0 });// secondary
+    vm2.invoke(() -> WANTestBase.validateAsyncEventListener( "nyAsync", 1000 ));// primary sender
+    vm3.invoke(() -> WANTestBase.validateAsyncEventListener( "nyAsync", 0 ));// secondary
 
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index cbef0c11ceab..9e1b28c364cd 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -53,12 +53,12 @@ public void testParallelGatewaySenderWithoutStarting() {
 
     createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, false);
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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" });
+    vm4.invoke(() -> WANTestBase.verifySenderStoppedState( "ln" ));
+    vm5.invoke(() -> WANTestBase.verifySenderStoppedState( "ln" ));
+    vm6.invoke(() -> WANTestBase.verifySenderStoppedState( "ln" ));
+    vm7.invoke(() -> WANTestBase.verifySenderStoppedState( "ln" ));
     
     validateRegionSizes(getTestMethodName() + "_PR", 0, vm2, vm3);
   }
@@ -75,13 +75,13 @@ public void testParallelGatewaySenderStartOnAccessorNode() {
 
     Wait.pause(2000);
     
-    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 10 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 10 ));
 
-    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
-    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
 
     validateRegionSizes(getTestMethodName() + "_PR", 10, vm2, vm3);
   }
@@ -102,19 +102,19 @@ public void testParallelPropagationSenderPause() throws Exception {
     waitForSendersRunning();
     
     //FIRST RUN: now, the senders are started. So, start the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     //SECOND RUN: keep one thread doing puts to the region
-    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invokeAsync(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 100 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 100 ));
   }
 
   /**
@@ -132,29 +132,29 @@ public void testParallelPropagationSenderResume() throws Exception {
     waitForSendersRunning();
     
     //now, the senders are started. So, start the puts
-    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     
     //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" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     //sleep for a second or two
     Wait.pause(2000);
     
     //resume the senders
-    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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
     Wait.pause(2000);
 
     validateParallelSenderQueueAllBucketsDrained();
     
     //find the region size on remote vm
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 1000 ));
  
   }
 
@@ -170,54 +170,54 @@ public void testParallelPropagationSenderResumeNegativeScenario() throws Excepti
     Integer lnPort = locatorPorts[0];
     Integer nyPort = locatorPorts[1];
 
-    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 });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.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 });
+    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 ));
 
-    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() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
 
-    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() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
   
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //wait till the senders are running
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 
     //start the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 100 ));
 
     //let the queue drain completely
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln", 0 ));
     
     //stop the senders
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
     
     //now, try to resume a stopped sender
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
     //do more puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 100 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 100 ));
   }
 
   /**
@@ -236,16 +236,16 @@ public void testParallelPropagationSenderStop() throws Exception {
     waitForSendersRunning();
     
     //FIRST RUN: now, the senders are started. So, do some of the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 100 ));
     
     //now, stop all of the senders
     stopSenders();
     
     //SECOND RUN: keep one thread doing puts
-    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invokeAsync(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 100 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 100 ));
   }
 
   /**
@@ -264,7 +264,7 @@ public void testParallelPropagationSenderStartAfterStop() throws Exception {
     waitForSendersRunning();
     
     //FIRST RUN: now, the senders are started. So, do some of the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 200 ));
     
     //now, stop all of the senders
     stopSenders();
@@ -272,19 +272,19 @@ public void testParallelPropagationSenderStartAfterStop() throws Exception {
     Wait.pause(2000);
     
     //SECOND RUN: do some of the puts after the senders are stopped
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
     
     //start the senders again
     startSenders();
 
     //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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
 
     //SECOND RUN: do some more puts
-    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    AsyncInvocation async = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     async.join();
     
     Wait.pause(2000);
@@ -293,12 +293,12 @@ public void testParallelPropagationSenderStartAfterStop() throws Exception {
     validateParallelSenderQueueAllBucketsDrained();
     
     //verify the events propagate to remote site
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 1000 ));
     
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm6.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm7.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+    vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+    vm6.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+    vm7.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
   }
 
   /**
@@ -321,7 +321,7 @@ public void testParallelPropagationSenderStartAfterStop_Scenario2() throws Excep
     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[] { getTestMethodName() + "_PR", 200 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 200 ));
     
     LogWriterUtils.getLogWriter().info("Done few puts");
     
@@ -332,22 +332,22 @@ public void testParallelPropagationSenderStartAfterStop_Scenario2() throws Excep
     Wait.pause(2000);
     
     //SECOND RUN: do some of the puts after the senders are stopped
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
     
     //SECOND RUN: start async puts on region
-    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 });
+    AsyncInvocation async = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 5000 ));
     LogWriterUtils.getLogWriter().info("Started high number of puts by async thread");
 
     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" });
+    vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
 
     LogWriterUtils.getLogWriter().info("All the senders are started");
     
@@ -359,7 +359,7 @@ public void testParallelPropagationSenderStartAfterStop_Scenario2() throws Excep
     validateParallelSenderQueueAllBucketsDrained();
     
     //verify that the queue size ultimately becomes zero. That means all the events propagate to remote site.
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln", 0 ));
   }
   
   /**
@@ -380,7 +380,7 @@ public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws E
     waitForSendersRunning();
     
     //FIRST RUN: now, the senders are started. So, do some of the puts
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 200 ));
     
     //now, stop all of the senders
     stopSenders();
@@ -388,28 +388,28 @@ public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws E
     Wait.pause(2000);
     
     //SECOND RUN: do some of the puts after the senders are stopped
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
     
     //start the senders again
     startSenders();
 
     //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[] {getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(getTestMethodName() + "_PR", 200 ));
 
     //SECOND RUN: do some more puts
-    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    AsyncInvocation async = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     async.join();
     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"});
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
     
     //verify the events propagate to remote site
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 1000 ));
   }
 
   /**
@@ -423,50 +423,49 @@ public void testStartPauseResumeParallelGatewaySender() throws Exception {
 
     createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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.
     //Start the senders in async threads, so colocation of shadowPR will be complete and 
     //missing buckets will be created in PRHARedundancyProvider.createMissingBuckets().
-    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" ));
 
     waitForSendersRunning();
     
     LogWriterUtils.getLogWriter().info("Started senders on local site");
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 });
+    vm4.invoke(() -> WANTestBase.doPuts( 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" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Paused senders on local site");
     
-    vm4.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.verifySenderPausedState( "ln" ));
+    vm5.invoke(() -> WANTestBase.verifySenderPausedState( "ln" ));
+    vm6.invoke(() -> WANTestBase.verifySenderPausedState( "ln" ));
+    vm7.invoke(() -> WANTestBase.verifySenderPausedState( "ln" ));
     
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_PR", 1000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( 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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Resumed senders on local site");
 
-    vm4.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.verifySenderResumedState( "ln" ));
+    vm5.invoke(() -> WANTestBase.verifySenderResumedState( "ln" ));
+    vm6.invoke(() -> WANTestBase.verifySenderResumedState( "ln" ));
+    vm7.invoke(() -> WANTestBase.verifySenderResumedState( "ln" ));
 
     try {
       inv1.join();
@@ -495,27 +494,27 @@ public void testDestroyParallelGatewaySenderExceptionScenario() {
     // make sure all the senders are running before doing any puts
     waitForSendersRunning();
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
     
     // try destroying on couple of nodes
     try {
-      vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+      vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
     }
     catch (RMIException e) {
       assertTrue("Cause of the exception should be GatewaySenderException", e
           .getCause() instanceof GatewaySenderException);
     }
     try {
-      vm5.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+      vm5.invoke(() -> WANTestBase.destroySender( "ln" ));
     }
     catch (RMIException e) {
       assertTrue("Cause of the exception should be GatewaySenderException", e
           .getCause() instanceof GatewaySenderException);
     }
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testDestroyParallelGatewaySender() {
@@ -528,36 +527,32 @@ public void testDestroyParallelGatewaySender() {
     // make sure all the senders are running
     waitForSendersRunning();
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
     
     Wait.pause(2000);
     
     //stop the sender and remove from region before calling destroy on it
     stopSenders();
 
-    vm4.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] {
-        "ln", getTestMethodName() + "_PR" });
-    vm5.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] {
-        "ln", getTestMethodName() + "_PR" });
-    vm6.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] {
-        "ln", getTestMethodName() + "_PR" });
-    vm7.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] {
-        "ln", getTestMethodName() + "_PR" });
-
-    vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "verifySenderDestroyed",
-        new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "verifySenderDestroyed",
-        new Object[] { "ln", true });
-    vm6.invoke(WANTestBase.class, "verifySenderDestroyed",
-        new Object[] { "ln", true });
-    vm7.invoke(WANTestBase.class, "verifySenderDestroyed",
-        new Object[] { "ln", true });
+    vm4.invoke(() -> WANTestBase.removeSenderFromTheRegion(
+        "ln", getTestMethodName() + "_PR" ));
+    vm5.invoke(() -> WANTestBase.removeSenderFromTheRegion(
+        "ln", getTestMethodName() + "_PR" ));
+    vm6.invoke(() -> WANTestBase.removeSenderFromTheRegion(
+        "ln", getTestMethodName() + "_PR" ));
+    vm7.invoke(() -> WANTestBase.removeSenderFromTheRegion(
+        "ln", getTestMethodName() + "_PR" ));
+
+    vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
+    vm5.invoke(() -> WANTestBase.destroySender( "ln" ));
+    vm6.invoke(() -> WANTestBase.destroySender( "ln" ));
+    vm7.invoke(() -> WANTestBase.destroySender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", true ));
+    vm5.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", true ));
+    vm6.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", true ));
+    vm7.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", true ));
   }
 
   private void createSendersReceiversAndPartitionedRegion(Integer lnPort, Integer nyPort, boolean createAccessors,
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index ee38f5a451ba..5e0142c632b9 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -62,67 +62,65 @@ public void setUp() throws Exception {
   }
   
   public void testParallelSenderQueueEventsOverflow_NoDiskStoreSpecified() 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, "createSenderWithoutDiskStore", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSenderWithoutDiskStore", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSenderWithoutDiskStore", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSenderWithoutDiskStore", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "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.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" });
+    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.createSenderWithoutDiskStore( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     //give some time for the senders to pause
     Wait.pause(1000);
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
 
     int numEventPuts = 50;
-    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] { getTestMethodName(), numEventPuts });
+    vm4.invoke(() -> WANTestBase.doHeavyPuts( getTestMethodName(), numEventPuts ));
     
-    long numOvVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
     
-    long numMemVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
     
     LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
     LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
@@ -135,13 +133,13 @@ public void testParallelSenderQueueEventsOverflow_NoDiskStoreSpecified() throws
     //expected is twice the number of events put due to redundancy level of 1  
     assertEquals("Total number of entries on disk and in VM is incorrect", (numEventPuts*2), (totalOverflown + totalInMemory));
     
-    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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 50 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 50 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50 ));
   }
   
   /**
@@ -150,67 +148,65 @@ public void testParallelSenderQueueEventsOverflow_NoDiskStoreSpecified() throws
    * @throws Exception
    */
   public void _testParallelSenderQueueEventsOverflow() 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, 10, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "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.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" });
+    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, 10, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     //give some time for the senders to pause
     Wait.pause(1000);
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
 
     int numEventPuts = 50;
-    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] { getTestMethodName(), numEventPuts });
+    vm4.invoke(() -> WANTestBase.doHeavyPuts( getTestMethodName(), numEventPuts ));
     
-    long numOvVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
     
-    long numMemVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
     
     LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
     LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
@@ -223,13 +219,13 @@ public void _testParallelSenderQueueEventsOverflow() throws Exception {
     //expected is twice the number of events put due to redundancy level of 1  
     assertEquals("Total number of entries on disk and in VM is incorrect", (numEventPuts*2), (totalOverflown + totalInMemory));
     
-    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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 50 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 50 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50 ));
   }
 
   /**
@@ -239,67 +235,65 @@ public void _testParallelSenderQueueEventsOverflow() throws Exception {
    * @throws Exception
    */
   public void _testParallelSenderQueueEventsOverflow_2() 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, 10, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 5, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 5, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 20, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "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.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" });
+    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, 10, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 5, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 5, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 20, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     //give some time for the senders to pause
     Wait.pause(1000);
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
 
     int numEventPuts = 50;
-    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] { getTestMethodName(), numEventPuts });
+    vm4.invoke(() -> WANTestBase.doHeavyPuts( getTestMethodName(), numEventPuts ));
     
-    long numOvVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
     
-    long numMemVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
     
     LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
     LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
@@ -318,77 +312,75 @@ public void _testParallelSenderQueueEventsOverflow_2() throws Exception {
     assertTrue("Number of entries in memory VM6 is incorrect. Should be less than 5", (numMemVm6 < 5));
     assertTrue("Number of entries in memory VM7 is incorrect. Should be less than 20", (numMemVm7 < 20));
     
-    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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 50 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 50 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50 ));
   }
 
   public void _testParallelSenderQueueNoEventsOverflow() 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, 10, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 10, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "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.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" });
+    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, 10, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 10, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     //give some time for the senders to pause
     Wait.pause(1000);
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
 
     int numEventPuts = 15;
-    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] { getTestMethodName(), numEventPuts });
+    vm4.invoke(() -> WANTestBase.doHeavyPuts( getTestMethodName(), numEventPuts ));
     
-    long numOvVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
-    long numOvVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
+    long numOvVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesOverflownToDisk( "ln" ));
     
-    long numMemVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
-    long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm4 = (Long) vm4.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm5 = (Long) vm5.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm6 = (Long) vm6.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
+    long numMemVm7 = (Long) vm7.invoke(() -> WANTestBase.getNumberOfEntriesInVM( "ln" ));
     
     LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
     LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
@@ -401,13 +393,13 @@ public void _testParallelSenderQueueNoEventsOverflow() throws Exception {
     //expected is twice the number of events put due to redundancy level of 1  
     assertEquals("Total number of entries on disk and in VM is incorrect", (numEventPuts*2), (totalOverflown + totalInMemory));
     
-    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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 15 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 15 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 15 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 15 ));
   }
   
   /**
@@ -415,11 +407,9 @@ public void _testParallelSenderQueueNoEventsOverflow() throws Exception {
    * when persistence of sender is enabled. 
    */
   public void _test_ValidateParallelGatewaySenderQueueAttributes_1() {
-    Integer localLocPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer localLocPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     
-    Integer remoteLocPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, localLocPort });
+    Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort ));
     
     WANTestBase test = new WANTestBase(getTestMethodName());
     Properties props = new Properties();
@@ -480,11 +470,9 @@ public void _test_ValidateParallelGatewaySenderQueueAttributes_1() {
    * when persistence of sender is not enabled. 
    */
   public void _test_ValidateParallelGatewaySenderQueueAttributes_2() {
-    Integer localLocPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer localLocPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     
-    Integer remoteLocPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, localLocPort });
+    Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort ));
     
     WANTestBase test = new WANTestBase(getTestMethodName());
     Properties props = new Properties();
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index 01f665cc1afb..e52486f89995 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -47,10 +47,8 @@ public void setUp() throws Exception {
   
   public void testPartitionedRegionWithGatewaySenderPersistenceEnabled() throws IOException {
     try {
-      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 ));
       createCache(lnPort);
       GatewaySenderFactory fact = cache.createGatewaySenderFactory();
       fact.setPersistenceEnabled(true);
@@ -83,53 +81,51 @@ public void testPartitionedRegionWithGatewaySenderPersistenceEnabled() throws IO
    * site receives all the events.
    */
   public void testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled() {
-    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, 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.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), "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, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
+    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, 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.createPersistentPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), "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.createPersistentPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
 
   }
 
@@ -137,64 +133,62 @@ public void testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled()
    * Enable persistence for the GatewaySender but not the region
    */
   public void testPartitionedRegionWithPersistentGatewaySender() {
-    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 ));
     
     LogWriterUtils.getLogWriter().info("Created remote receivers");
     
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
     
     LogWriterUtils.getLogWriter().info("Created local site cache");
 
-    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 ));
   
     LogWriterUtils.getLogWriter().info("Created local site senders");
 
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
     LogWriterUtils.getLogWriter().info("Created local site persistent PR");
     
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Started sender on vm4");
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
     
     LogWriterUtils.getLogWriter().info("Started the senders");
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
   }
   
   
@@ -208,109 +202,99 @@ public void testPartitionedRegionWithPersistentGatewaySender() {
    */
   public void 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(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create PR on local site
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "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(), 3000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 3000 ));
     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(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
     
     try {
       inv1.join();
@@ -326,26 +310,26 @@ public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
     
     //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(), 3000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 3000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 3000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 3000 ));
   }
   
   /**
@@ -357,109 +341,99 @@ public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
    */
   public void testPersistentPRWithGatewaySenderPersistenceEnabled_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, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create PR on local site
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "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(), 3000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 3000 ));
     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, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
     
     try {
       inv1.join();
@@ -475,26 +449,26 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart() {
     
     //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(), 3000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 3000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 3000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 3000 ));
   }
   
   /**
@@ -506,100 +480,90 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart() {
    */
   public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart2() {
     //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 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, false });
-    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
-        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, false });
-    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
-        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, false });
-    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
-        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, false });
+    String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, false ));
+    String diskStore2 = (String) vm5.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, false ));
+    String diskStore3 = (String) vm6.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, false ));
+    String diskStore4 = (String) vm7.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, false ));
 
     LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
     
     //create PR on local site
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "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(), 300 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 300 ));
     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, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
     
     try {
       inv1.join();
@@ -613,56 +577,56 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart2() {
     
     LogWriterUtils.getLogWriter().info("Created back the partitioned regions");
     
-    vm4.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.unsetRemoveFromQueueOnException( "ln" ));
+    vm5.invoke(() -> WANTestBase.unsetRemoveFromQueueOnException( "ln" ));
+    vm6.invoke(() -> WANTestBase.unsetRemoveFromQueueOnException( "ln" ));
+    vm7.invoke(() -> WANTestBase.unsetRemoveFromQueueOnException( "ln" ));
 
     //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("Creating the receiver.");
     //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 PR on remote site
     
     LogWriterUtils.getLogWriter().info("Creating the partitioned region at receiver. ");
-    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
-    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" });
+    vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     LogWriterUtils.getLogWriter().info("Doing some extra puts. ");
     //start puts in region on local site
-    vm4.invoke(WANTestBase.class, "doPutsAfter300", new Object[] { getTestMethodName(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPutsAfter300( getTestMethodName(), 1000 ));
     //----------------------------------------------------------------------------------------------------
-    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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
     LogWriterUtils.getLogWriter().info("Validating the region size at the receiver end. ");
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
   }
   
   
@@ -676,110 +640,100 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart2() {
    */
   public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart_Scenario2() {
     //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, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create PR on local site
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "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(), 3000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 3000 ));
     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, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
     
     try {
       inv1.join();
@@ -795,34 +749,34 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart_Scenario
     
     //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...");
     
     //----------------------------------------------------------------------------------------------------
     
     //Dispatcher should be dispatching now. Do some more puts through async thread
-    AsyncInvocation async1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
+    AsyncInvocation async1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
     try {
       async1.join();
     } catch (InterruptedException e) {
       e.printStackTrace();
     }
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 3000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 3000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 3000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 3000 ));
   }
 
   /**
@@ -834,110 +788,100 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart_Scenario
    */
   public void testPersistentPRWithPersistentGatewaySender_Restart_Bug44275() {
     //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, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create PR on local site
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "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, "doPutsWithKeyAsString", new Object[] { getTestMethodName(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPutsWithKeyAsString( getTestMethodName(), 1000 ));
     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, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
     
     try {
       inv1.join();
@@ -953,26 +897,26 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_Bug44275() {
     
     //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(), 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-    getTestMethodName(), 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+    getTestMethodName(), 1000 ));
   }
   
   /**
@@ -984,197 +928,178 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_Bug44275() {
    */
   public void testPersistentPRWithPersistentGatewaySender_Restart_DoOps() {
     //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, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create PR on local site
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "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, "doPutsWithKeyAsString", new Object[] { getTestMethodName(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPutsWithKeyAsString( getTestMethodName(), 1000 ));
     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
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
     
     LogWriterUtils.getLogWriter().info("Created back the partitioned regions");
     
     //start the senders in async mode. This will ensure that the 
     //node of shadow PR that went down last will come up first
-    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(), 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-    getTestMethodName(), 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+    getTestMethodName(), 1000 ));
     
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
     
    //do some extra puts in region on local site
-    vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { getTestMethodName(), 10000 });
+    vm4.invoke(() -> WANTestBase.doPutsWithKeyAsString( getTestMethodName(), 10000 ));
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
     
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-    getTestMethodName(), 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+    getTestMethodName(), 10000 ));
   }
   
   public void testPersistentPR_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 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 PR on local site
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
     // start puts in region on local site
-    vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] {
-        getTestMethodName(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPutsWithKeyAsString(
+        getTestMethodName(), 1000 ));
     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");
 
@@ -1189,18 +1114,14 @@ public void testPersistentPR_Restart() {
 //        new Object[] { testName, "ln", 1, 100, isOffHeap() });
 
     // create PR on local site
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
-        "createPersistentPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1,
-            100, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class,
-        "createPersistentPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1,
-            100, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class,
-        "createPersistentPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1,
-            100, isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class,
-        "createPersistentPartitionedRegion", new Object[] { getTestMethodName(), "ln", 1,
-            100, isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1,
+            100, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1,
+            100, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1,
+            100, isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1,
+            100, isOffHeap() ));
 
     try {
       inv1.join();
@@ -1215,14 +1136,14 @@ public void testPersistentPR_Restart() {
 
     LogWriterUtils.getLogWriter().info("Created back the partitioned regions");
 
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
   }
 
   /**
@@ -1236,126 +1157,116 @@ public void testPersistentPR_Restart() {
    */
   public void NotSupported_testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled_Restart2() {
     //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, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create PR on local site
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "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(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
     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 from 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.");
     
     
     //start the senders. NOTE that the senders are not associated with partitioned region
-    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" ));
     
     LogWriterUtils.getLogWriter().info("Started the senders.");
     
     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(), 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
   }
   
   /**
@@ -1366,133 +1277,123 @@ public void NotSupported_testPersistentPartitionedRegionWithGatewaySenderPersist
    */
   public void NotSupported_testNonPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled_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(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create non persistent PR on local site
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "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(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
     
     //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. The local site has been brought down.");
     
     //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
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
     
     LogWriterUtils.getLogWriter().info("Created back the partitioned regions");
     
     //start the senders
-    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" ));
     
     LogWriterUtils.getLogWriter().info("Started the senders.");
     
     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(), 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-    getTestMethodName(), 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+    getTestMethodName(), 1000 ));
   }
 
 
@@ -1508,130 +1409,128 @@ public void NotSupported_testNonPersistentPartitionedRegionWithGatewaySenderPers
    */
   public void Bug50247_testPersistentPartitionedRegionWithGatewaySender_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.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.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 ));
 
     //create PR on remote site
-    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create PR on local site
-    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "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(), 3000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 3000 ));
     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 back the senders
-    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 ));
     
     LogWriterUtils.getLogWriter().info("Created the senders again");
     
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm6.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
     
     //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" });
+    vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
     
     LogWriterUtils.getLogWriter().info("Started the senders.");
     
     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...");
     
     //create PR on local site
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-      getTestMethodName(), "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
     
     try {
       inv1.join();
@@ -1648,11 +1547,11 @@ public void Bug50247_testPersistentPartitionedRegionWithGatewaySender_Restart()
     //-------------------------------------------------------------------------------------------
     
     //start puts in region on local site
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 3000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 3000 ));
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 3000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName(), 3000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 3000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 3000 ));
   }
   
   /**
@@ -1665,58 +1564,56 @@ public void Bug50247_testPersistentPartitionedRegionWithGatewaySender_Restart()
    */
   public void testParallelPropagationWithSenderPerisistenceEnabledForAccessor() {
     //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.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.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, "createPartitionedRegionAsAccessor", new Object[] {
-      getTestMethodName() + "_PR", "ln", 1, 100 });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
-      getTestMethodName() + "_PR", "ln", 1, 100 });
-
-    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, "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.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, 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.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegionAsAccessor(
+      getTestMethodName() + "_PR", "ln", 1, 100 ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegionAsAccessor(
+      getTestMethodName() + "_PR", "ln", 1, 100 ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
     
     //start puts in region on local site
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 1000 ));
   }
   
   /**
@@ -1728,53 +1625,51 @@ public void testRemoveGatewayFromPersistentRegionOnRestart() throws Throwable {
     
 
     try {
-      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, 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.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-      vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-      vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-      vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), "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, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-      vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 113 });
-
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 113 });
-      vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 113 });
+      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, 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.createPersistentPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+      vm5.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+      vm6.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+      vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), "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.createPersistentPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+      vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+
+      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 113 ));
+
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 113 ));
+      vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 113 ));
 
       //Bounce vm4, vm5, vm6, vm7 without the parallel queue
       vm4.invoke(WANTestBase.class, "closeCache", new Object [] {});
@@ -1787,19 +1682,19 @@ public void testRemoveGatewayFromPersistentRegionOnRestart() throws Throwable {
       vm6.invoke(ParallelWANPersistenceEnabledGatewaySenderDUnitTest.class, "setIgnoreQueue" , new Object[] { true});
       vm7.invoke(ParallelWANPersistenceEnabledGatewaySenderDUnitTest.class, "setIgnoreQueue" , new Object[] { true});
 
-      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 ));
 
-      AsyncInvocation async4 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-      AsyncInvocation async5 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-      AsyncInvocation async6 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-      AsyncInvocation async7 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
+      AsyncInvocation async4 = vm4.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+      AsyncInvocation async5 = vm5.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+      AsyncInvocation async6 = vm6.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+      AsyncInvocation async7 = vm7.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
 
       async7.getResult(30 * 1000);
       async5.getResult(30 * 1000);
@@ -1808,8 +1703,8 @@ public void testRemoveGatewayFromPersistentRegionOnRestart() throws Throwable {
 
       //This should succeed, because the region recovered even though
       //the queue was removed.
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 113 });
+      vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 113 ));
     } finally {
       vm4.invoke(ParallelWANPersistenceEnabledGatewaySenderDUnitTest.class, "setIgnoreQueue" , new Object[] { false});
       vm5.invoke(ParallelWANPersistenceEnabledGatewaySenderDUnitTest.class, "setIgnoreQueue" , new Object[] { false});
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
index 4e0b5c2cb13a..f01d36f4509d 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
@@ -40,75 +40,69 @@ public void setUp() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationWithClientServer() 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, "createReceiverAndServer", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiverAndServer", new Object[] { nyPort });
-    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() });
+    vm2.invoke(() -> WANTestBase.createReceiverAndServer( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiverAndServer( nyPort ));
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "createClientWithLocator", new Object[] {
-        nyPort, "localhost", getTestMethodName() + "_PR" });
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      100 });
+    vm4.invoke(() -> WANTestBase.createClientWithLocator(
+        nyPort, "localhost", getTestMethodName() + "_PR" ));
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      100 ));
 
-    vm5.invoke(WANTestBase.class, "createServer", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createServer", new Object[] { lnPort });
-    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 });
-    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() });
+    vm5.invoke(() -> WANTestBase.createServer( lnPort ));
+    vm6.invoke(() -> WANTestBase.createServer( lnPort ));
+    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 ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
 
-    vm7.invoke(WANTestBase.class, "createClientWithLocator", new Object[] {
-      lnPort, "localhost", getTestMethodName() + "_PR" });
+    vm7.invoke(() -> WANTestBase.createClientWithLocator(
+      lnPort, "localhost", getTestMethodName() + "_PR" ));
     
-    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation inv2 = vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation inv2 = vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
 
     inv1.join();
     inv2.join();
     // before doing any puts, let the senders be running in order to ensure that
     // not a single event will be lost
     
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
-    vm7.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        10000 });
+    vm7.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        10000 ));
 
     
     // verify all buckets drained on all sender nodes.
-    vm5.invoke(WANTestBase.class,
-        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class,
-        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained( "ln" ));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained( "ln" ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10000 ));
 
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10000 });
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10000 });
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10000 ));
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10000 ));
 
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 10000 });
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 10000 ));
     
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 10000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 10000 ));
 
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
index c9fa048ee49d..8f3042ae24ac 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -42,65 +42,63 @@ public void setUp() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationWithSingleBucketPR() 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 });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.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 });
+    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 ));
  
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 1, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 1, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 1, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 1, isOffHeap() ));
  
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
  
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 1, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 1, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 1, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 1, 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" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
     //pause the senders
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     Wait.pause(5000);
     
-    AsyncInvocation async1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 700 });
-    AsyncInvocation async2 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
-    AsyncInvocation async3 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 800 });
-    AsyncInvocation async4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    AsyncInvocation async1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 700 ));
+    AsyncInvocation async2 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
+    AsyncInvocation async3 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 800 ));
+    AsyncInvocation async4 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     
     async1.join();
     async2.join();
     async3.join();
     async4.join();
     
-    int queueSize = (Integer) vm4.invoke(WANTestBase.class, "getQueueContentSize", new Object[] { "ln" });
+    int queueSize = (Integer) vm4.invoke(() -> WANTestBase.getQueueContentSize( "ln" ));
     assertEquals("Actual queue size is not matching with the expected", 3500, queueSize);
     
     //resume the senders now
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   /**
@@ -110,153 +108,149 @@ public void testParallelPropagationWithSingleBucketPR() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationWithLowNumberofBuckets() 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 });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.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 });
+    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 ));
  
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 10, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 1, 10, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 10, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 10, isOffHeap() ));
  
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
  
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 10, 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" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
-    AsyncInvocation async1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 700 });
-    AsyncInvocation async2 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
-    AsyncInvocation async3 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 800 });
-    AsyncInvocation async4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    AsyncInvocation async1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 700 ));
+    AsyncInvocation async2 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
+    AsyncInvocation async3 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 800 ));
+    AsyncInvocation async4 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     
     async1.join();
     async2.join();
     async3.join();
     async4.join();
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testParalleQueueDrainInOrder_PR() 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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", null, 3, 4, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 3, 4, isOffHeap() ));
   
-    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {getTestMethodName() + "_PR"});
+    vm2.invoke(() -> WANTestBase.addListenerOnRegion(getTestMethodName() + "_PR"));
   
-    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() + "_PR", "ln", 3, 4, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 3, 4, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 3, 4, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 3, 4, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 3, 4, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 3, 4, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 3, 4, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 3, 4, 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" ));
 
-    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
-    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
-    vm6.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
-    vm7.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
+    vm4.invoke(() -> WANTestBase.addQueueListener( "ln", true));
+    vm5.invoke(() -> WANTestBase.addQueueListener( "ln", true));
+    vm6.invoke(() -> WANTestBase.addQueueListener( "ln", true));
+    vm7.invoke(() -> WANTestBase.addQueueListener( "ln", true));
 
     Wait.pause(2000);
-    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"));
     
     Wait.pause(2000);
     
-    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      4 });
-    vm4.invoke(WANTestBase.class, "addListenerOnBucketRegion", new Object[] {getTestMethodName() + "_PR", 4});
-    vm5.invoke(WANTestBase.class, "addListenerOnBucketRegion", new Object[] {getTestMethodName() + "_PR", 4});
-    vm6.invoke(WANTestBase.class, "addListenerOnBucketRegion", new Object[] {getTestMethodName() + "_PR", 4 });
-    vm7.invoke(WANTestBase.class, "addListenerOnBucketRegion", new Object[] {getTestMethodName() + "_PR", 4});
+    vm6.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      4 ));
+    vm4.invoke(() -> WANTestBase.addListenerOnBucketRegion(getTestMethodName() + "_PR", 4));
+    vm5.invoke(() -> WANTestBase.addListenerOnBucketRegion(getTestMethodName() + "_PR", 4));
+    vm6.invoke(() -> WANTestBase.addListenerOnBucketRegion(getTestMethodName() + "_PR", 4 ));
+    vm7.invoke(() -> WANTestBase.addListenerOnBucketRegion(getTestMethodName() + "_PR", 4));
     
-    vm4.invoke(WANTestBase.class, "addListenerOnQueueBucketRegion", new Object[] { "ln" , 4});
-    vm5.invoke(WANTestBase.class, "addListenerOnQueueBucketRegion", new Object[] { "ln" , 4});
-    vm6.invoke(WANTestBase.class, "addListenerOnQueueBucketRegion", new Object[] { "ln" , 4 });
-    vm7.invoke(WANTestBase.class, "addListenerOnQueueBucketRegion", new Object[] { "ln" , 4});
+    vm4.invoke(() -> WANTestBase.addListenerOnQueueBucketRegion( "ln" , 4));
+    vm5.invoke(() -> WANTestBase.addListenerOnQueueBucketRegion( "ln" , 4));
+    vm6.invoke(() -> WANTestBase.addListenerOnQueueBucketRegion( "ln" , 4 ));
+    vm7.invoke(() -> WANTestBase.addListenerOnQueueBucketRegion( "ln" , 4));
     
-    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      1000 });
+    vm6.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      1000 ));
     
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 1000 });
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 1000 ));
     
-    HashMap vm4BRUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkBR", new Object[] {getTestMethodName() + "_PR", 4});
-    HashMap vm5BRUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkBR", new Object[] {getTestMethodName() + "_PR", 4});
-    HashMap vm6BRUpdates = (HashMap)vm6.invoke(WANTestBase.class, "checkBR", new Object[] {getTestMethodName() + "_PR", 4});
-    HashMap vm7BRUpdates = (HashMap)vm7.invoke(WANTestBase.class, "checkBR", new Object[] {getTestMethodName() + "_PR", 4});
+    HashMap vm4BRUpdates = (HashMap)vm4.invoke(() -> WANTestBase.checkBR(getTestMethodName() + "_PR", 4));
+    HashMap vm5BRUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkBR(getTestMethodName() + "_PR", 4));
+    HashMap vm6BRUpdates = (HashMap)vm6.invoke(() -> WANTestBase.checkBR(getTestMethodName() + "_PR", 4));
+    HashMap vm7BRUpdates = (HashMap)vm7.invoke(() -> WANTestBase.checkBR(getTestMethodName() + "_PR", 4));
     
     List b0SenderUpdates = (List)vm4BRUpdates.get("Create0");
     List b1SenderUpdates = (List)vm4BRUpdates.get("Create1");
     List b2SenderUpdates = (List)vm4BRUpdates.get("Create2");
     List b3SenderUpdates = (List)vm4BRUpdates.get("Create3");
     
-    HashMap vm4QueueBRUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue_BR", new Object[] {"ln", 4});
-    HashMap vm5QueueBRUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue_BR", new Object[] {"ln", 4});
-    HashMap vm6QueueBRUpdates = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue_BR", new Object[] {"ln", 4});
-    HashMap vm7QueueBRUpdates = (HashMap)vm7.invoke(WANTestBase.class, "checkQueue_BR", new Object[] {"ln", 4});
+    HashMap vm4QueueBRUpdates = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue_BR("ln", 4));
+    HashMap vm5QueueBRUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue_BR("ln", 4));
+    HashMap vm6QueueBRUpdates = (HashMap)vm6.invoke(() -> WANTestBase.checkQueue_BR("ln", 4));
+    HashMap vm7QueueBRUpdates = (HashMap)vm7.invoke(() -> WANTestBase.checkQueue_BR("ln", 4));
     
     assertEquals(vm4QueueBRUpdates, vm5QueueBRUpdates);
     assertEquals(vm4QueueBRUpdates, vm6QueueBRUpdates);
     assertEquals(vm4QueueBRUpdates, vm7QueueBRUpdates);
     
-    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"});
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 1000 });
-    HashMap receiverUpdates = (HashMap)vm2.invoke(WANTestBase.class, "checkPR", new Object[] {
-      getTestMethodName() + "_PR"});
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln"));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln"));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln"));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln"));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 1000 ));
+    HashMap receiverUpdates = (HashMap)vm2.invoke(() -> WANTestBase.checkPR(
+      getTestMethodName() + "_PR"));
     List createList = (List)receiverUpdates.get("Create");
     ArrayList b0ReceiverUpdates = new ArrayList();
     ArrayList b1ReceiverUpdates = new ArrayList();
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index 530e10153070..bfc95c94960f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -47,10 +47,8 @@ public void setUp() throws Exception {
   }
 
   public void test_ParallelGatewaySenderMetaRegionNotExposedToUser_Bug44216() {
-    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 ));
 
     createCache(lnPort);
     createSender("ln", 2, true, 100, 300, false, false,
@@ -84,75 +82,73 @@ public void test_ParallelGatewaySenderMetaRegionNotExposedToUser_Bug44216() {
   }
   
   public void testParallelPropagation_withoutRemoteSite() 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 ));
     
-    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 ));
 
     //keep a larger batch to minimize number of exception occurrences in the log
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 300, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 300, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 300, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 300, 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" });
-
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false});
-    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
-    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 300, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 300, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 300, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 300, 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" ));
+
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false));
+    vm6.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false ));
+    vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false ));
     
     //make sure all the senders are running before doing any puts
-    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() + "_PR",
-      1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      1000 ));
 
     
-    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 ));
     
-    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()  });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
     
     //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"));
     
     // Just making sure that though the remote site is started later,
     // remote site is still able to get the data. Since the receivers are
     // 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[] {
-        getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
   
   /**
@@ -160,122 +156,118 @@ public void testParallelPropagation_withoutRemoteSite() throws Exception {
    * @throws Exception
    */
   public void 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 });
-
-    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, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
     
     //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", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testParallelPropagation_ManualStart() 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, false });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, false });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, false });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, false });
-
-    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()  });
-
-    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, false ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, false, false, null, false ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, false, false, null, false ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, false, false, null, false ));
+
+    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()  ));
+
+    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, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
     
     //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", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
   
   /**
@@ -283,44 +275,42 @@ public void testParallelPropagation_ManualStart() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationPutBeforeSenderStart() 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, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      1000 });
-    
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    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.doPuts( getTestMethodName() + "_PR",
+      1000 ));
+    
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
 
     try{
       inv1.join();
@@ -331,23 +321,23 @@ public void testParallelPropagationPutBeforeSenderStart() throws Exception {
     catch(InterruptedException ie) {
       fail("Caught interrupted exception");
     }
-    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()  });
+    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, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
   
   /**
@@ -360,178 +350,168 @@ public void testParallelPropagationPutBeforeSenderStart() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationWithLocalCacheClosedAndRebuilt() 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.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      1000 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-              getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      1000 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+              getTestMethodName() + "_PR", 1000 ));
     //-------------------Close and rebuild local site ---------------------------------
 
-    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());
     
     Integer regionSize = 
-      (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_PR" });
+      (Integer) vm2.invoke(() -> WANTestBase.getRegionSize(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 });
-    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, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", 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" });
-
-    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.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.setRemoveFromQueueOnException( "ln", true ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm6.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", 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" ));
+
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     //------------------------------------------------------------------------------------
     
     IgnoredException.addIgnoredException(EntryExistsException.class.getName());
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     
     //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"});
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 1000 ));
   }
   
   public void testParallelColocatedPropagation() 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, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), "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, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), null, 1, 100, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
-        new Object[] { getTestMethodName(), null, 1, 100, isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
+    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.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "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.createColocatedPartitionedRegions( getTestMethodName(), null, 1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), null, 1, 100, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
     
     //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(), 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
   }
   /**
    * Create colocated partitioned regions.
@@ -543,500 +523,478 @@ public void testParallelColocatedPropagation() throws Exception {
    */
 
   public void testParallelColocatedPropagation2() 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, "createColocatedPartitionedRegions2",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
-        new Object[] { getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
-        new Object[] { getTestMethodName(), "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, "createColocatedPartitionedRegions2",
-        new Object[] { getTestMethodName(), null, 1, 100, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
-        new Object[] { getTestMethodName(), null, 1, 100, isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName()+"_child1", 1000 });
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName()+"_child2", 1000 });
+    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.createColocatedPartitionedRegions2( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createColocatedPartitionedRegions2( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createColocatedPartitionedRegions2( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createColocatedPartitionedRegions2( getTestMethodName(), "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.createColocatedPartitionedRegions2( getTestMethodName(), null, 1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createColocatedPartitionedRegions2( getTestMethodName(), null, 1, 100, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName()+"_child1", 1000 ));
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName()+"_child2", 1000 ));
     
     //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"});
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName()+"_child1", 0 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName()+"_child2", 0 });
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName()+"_child1", 0 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName()+"_child2", 0 ));
   }
 
   
   public void testParallelPropagationWihtOverflow() 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(), "ln", 1, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "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(), null, 1, 100, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), 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(), "ln", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "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(), null, 1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap()  ));
 
     //let all the senders start before doing any puts to ensure that none of the events is 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, "doHeavyPuts", new Object[] { getTestMethodName(), 150 });
+    vm4.invoke(() -> WANTestBase.doHeavyPuts( getTestMethodName(), 150 ));
 
     //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(), 150 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 150 ));
   }
 
   public void testSerialReplicatedAndParallePartitionedPropagation()
       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[] { "lnSerial",
-        2, false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial",
-        2, false, 100, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel",
-        2, true, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel",
-        2, true, 100, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel",
-        2, true, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel",
-        2, true, 100, 10, false, false, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-
-    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, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial", isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnParallel", 1, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnParallel", 1, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnParallel", 1, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnParallel", 1, 100, isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial" });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    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( "lnSerial",
+        2, false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial",
+        2, false, 100, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "lnParallel",
+        2, true, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnParallel",
+        2, true, 100, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "lnParallel",
+        2, true, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "lnParallel",
+        2, true, 100, 10, false, false, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnParallel", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnParallel", 1, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnParallel", 1, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnParallel", 1, 100, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial" ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnParallel" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnParallel" ));
+    vm6.invoke(() -> WANTestBase.startSender( "lnParallel" ));
+    vm7.invoke(() -> WANTestBase.startSender( "lnParallel" ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+    vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
     
     //verify all buckets drained on all sender nodes.
-    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel"});
-    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel"});
-    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel"});
-    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel"});
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel"));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel"));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testPartitionedParallelPropagationToTwoWanSites()
       throws Exception {
     Integer lnPort = createFirstLocatorWithDSId(1);
-    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
-
-    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[] { "lnParallel1",
-        2, true, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel1",
-        2, true, 100, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel1",
-        2, true, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel1",
-        2, true, 100, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel2",
-        3, true, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel2",
-        3, true, 100, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel2",
-        3, true, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel2",
-        3, true, 100, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel1" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel1" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel1" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel1" });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel2" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel2" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel2" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel2" });
-
-    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 nyPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver( tkPort ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "lnParallel1",
+        2, true, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnParallel1",
+        2, true, 100, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "lnParallel1",
+        2, true, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "lnParallel1",
+        2, true, 100, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "lnParallel2",
+        3, true, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnParallel2",
+        3, true, 100, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "lnParallel2",
+        3, true, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "lnParallel2",
+        3, true, 100, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnParallel1" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnParallel1" ));
+    vm6.invoke(() -> WANTestBase.startSender( "lnParallel1" ));
+    vm7.invoke(() -> WANTestBase.startSender( "lnParallel1" ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnParallel2" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnParallel2" ));
+    vm6.invoke(() -> WANTestBase.startSender( "lnParallel2" ));
+    vm7.invoke(() -> WANTestBase.startSender( "lnParallel2" ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
 
     //before doing puts, make sure that the senders are started.
     //this will ensure that not a single events is lost
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel1" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel1" });
-    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel1" });
-    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel1" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "lnParallel1" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "lnParallel1" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "lnParallel1" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "lnParallel1" ));
 
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel2" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel2" });
-    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel2" });
-    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel2" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "lnParallel2" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "lnParallel2" ));
+    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "lnParallel2" ));
+    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "lnParallel2" ));
     
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
     
     //verify all buckets drained on all sender nodes.
-    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel1"});
-    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel1"});
-    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel1"});
-    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel1"});
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel1"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel1"));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel1"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel1"));
     
     //verify all buckets drained on all sender nodes.
-    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel2"});
-    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel2"});
-    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel2"});
-    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel2"});
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel2"));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel2"));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel2"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("lnParallel2"));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testPartitionedParallelPropagationHA() throws Exception {
     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,
-        "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, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "ln", 2, 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()  });
-
-    AsyncInvocation inv1 = vm7.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_PR", 5000 });
+    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.setRemoveFromQueueOnException( "ln", true ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm6.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 2, 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()  ));
+
+    AsyncInvocation inv1 = vm7.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 5000 ));
     Wait.pause(500);
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
-    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_PR", 10000 });
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
+    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 10000 ));
     Wait.pause(1500);
-    AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender");
+    AsyncInvocation inv4 = vm5.invokeAsync(() -> WANTestBase.killSender());
     inv1.join();
     inv2.join();
     inv3.join();
     inv4.join();
     
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 10000 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 10000 });
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 10000 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+      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"});
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 10000 ));
   }
 
   public void testParallelPropagationWithFilter() 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,
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "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(), null, 1, 100, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap()  });
+        new MyGatewayEventFilter(), true ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "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(), null, 1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap()  ));
 
     //wait for senders to be running before doing any puts. This will ensure that
     //not a single events is 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(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 800 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 800 ));
   }
   
   
   public void testParallelPropagationWithPutAll() 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, "doPutAll", new Object[] { getTestMethodName() + "_PR",
-        100 , 50 });
+    vm4.invoke(() -> WANTestBase.doPutAll( getTestMethodName() + "_PR",
+        100 , 50 ));
     
     //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", 5000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 5000 ));
   
   }
   
@@ -1048,87 +1006,85 @@ public void testParallelPropagationWithPutAll() throws Exception {
    */
   public void testParallelPropagationWithDestroy() 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, 100, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 100, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 100, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 100, 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, 100, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 100, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 100, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 100, 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, "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" ));
     
     Wait.pause(2000);
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 });
-    vm4.invoke(WANTestBase.class, "doDestroys", new Object[] { getTestMethodName() + "_PR", 500 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
+    vm4.invoke(() -> WANTestBase.doDestroys( getTestMethodName() + "_PR", 500 ));
     
     
-    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueBucketSize", new Object[] { "ln", 15 });
-    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueBucketSize", new Object[] { "ln", 15 });
-    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueBucketSize", new Object[] { "ln", 15 });
-    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueBucketSize", new Object[] { "ln", 15 });
+    vm4.invoke(() -> WANTestBase.validateParallelSenderQueueBucketSize( "ln", 15 ));
+    vm5.invoke(() -> WANTestBase.validateParallelSenderQueueBucketSize( "ln", 15 ));
+    vm6.invoke(() -> WANTestBase.validateParallelSenderQueueBucketSize( "ln", 15 ));
+    vm7.invoke(() -> WANTestBase.validateParallelSenderQueueBucketSize( "ln", 15 ));
 
-    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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
     //give some time for the queue to drain
     Wait.pause(5000);
     
-    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", 500 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 500 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 500 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 500 ));
   
   }
   
@@ -1137,95 +1093,91 @@ public void testParallelPropagationWithDestroy() throws Exception {
    * @throws Exception
    */
   public void testParallelPropagationTxOperations() 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[] {
-//        testName + "_PR", "ln", true, 1, 100, isOffHeap()  });
-//    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-//        testName + "_PR", "ln", true, 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(
+//        testName + "_PR", "ln", true, 1, 100, isOffHeap()  ));
+//    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+//        testName + "_PR", "ln", true, 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.class, "doTxPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+//    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+//    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(() -> WANTestBase.doTxPuts( getTestMethodName() + "_PR",
+        1000 ));
     
     //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", 3 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 3 ));
   }
 
   public void disable_testParallelGatewaySenderQueueLocalSize() {
-    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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.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 });
+    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 ));
 
-    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()  });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     /*
      * Remember pausing sender does not guarantee that peek will be paused
@@ -1233,19 +1185,19 @@ public void disable_testParallelGatewaySenderQueueLocalSize() {
      * events and send them after peeking without a check for pause. hence below
      * pause of 1 sec to allow dispatching to be paused
      */
-//    vm4.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" });
-//    vm5.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" });
+//    vm4.invoke(() -> WANTestBase.waitForSenderPausedState( "ln" ));
+//    vm5.invoke(() -> WANTestBase.waitForSenderPausedState( "ln" ));
     Wait.pause(1000);
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        10 ));
     
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
-    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln", 10 ));
+    vm5.invoke(() -> WANTestBase.validateQueueContents( "ln", 10 ));
     
     // instead of checking size as 5 and 5. check that combined size is 10
-    Integer localSize1 = (Integer)vm4.invoke(WANTestBase.class, "getPRQLocalSize", new Object[] { "ln"});
-    Integer localSize2 = (Integer)vm5.invoke(WANTestBase.class, "getPRQLocalSize", new Object[] { "ln"});
+    Integer localSize1 = (Integer)vm4.invoke(() -> WANTestBase.getPRQLocalSize( "ln"));
+    Integer localSize2 = (Integer)vm5.invoke(() -> WANTestBase.getPRQLocalSize( "ln"));
     assertEquals(10,  localSize1 + localSize2);
   }
   
@@ -1255,34 +1207,32 @@ public void tParallelGatewaySenderQueueLocalSizeWithHA() {
     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,
-        "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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.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 });
+    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 ));
 
-    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()  });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     /*
      * Remember pausing sender does not guarantee that peek will be paused
@@ -1290,24 +1240,24 @@ public void tParallelGatewaySenderQueueLocalSizeWithHA() {
      * events and send them after peeking without a check for pause. hence below
      * pause of 1 sec to allow dispatching to be paused
      */
-//    vm4.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" });
-//    vm5.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" });
+//    vm4.invoke(() -> WANTestBase.waitForSenderPausedState( "ln" ));
+//    vm5.invoke(() -> WANTestBase.waitForSenderPausedState( "ln" ));
     Wait.pause(1000);
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        10 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        10 ));
     
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
-    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln", 10 ));
+    vm5.invoke(() -> WANTestBase.validateQueueContents( "ln", 10 ));
     
-    Integer localSize1 = (Integer)vm4.invoke(WANTestBase.class, "getPRQLocalSize", new Object[] { "ln"});
-    Integer localSize2 = (Integer)vm5.invoke(WANTestBase.class, "getPRQLocalSize", new Object[] { "ln"});
+    Integer localSize1 = (Integer)vm4.invoke(() -> WANTestBase.getPRQLocalSize( "ln"));
+    Integer localSize2 = (Integer)vm5.invoke(() -> WANTestBase.getPRQLocalSize( "ln"));
     assertEquals(10,  localSize1 + localSize2);
     
-    vm5.invoke(WANTestBase.class, "killSender", new Object[] { });
+    vm5.invoke(() -> WANTestBase.killSender( ));
     
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
-    vm4.invoke(WANTestBase.class, "checkPRQLocalSize", new Object[] { "ln", 10 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln", 10 ));
+    vm4.invoke(() -> WANTestBase.checkPRQLocalSize( "ln", 10 ));
     
   }
   
@@ -1315,135 +1265,123 @@ public void tParallelGatewaySenderQueueLocalSizeWithHA() {
    * Added for defect #50364 Can't colocate region that has AEQ with a region that does not have that same AEQ
    */
   public void testParallelSenderAttachedToChildRegionButNotToParentRegion() {
-	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 ));
 	    
 	//create cache and receiver on site2
-	vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+	vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
 	//create cache on site1
-	vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });   
+	vm3.invoke(() -> WANTestBase.createCache( lnPort ));   
 	
 	//create sender on site1
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
+      true, 100, 10, false, false, null, true ));
     
     //start sender on site1
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
     
     //create leader (parent) PR on site1
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "PARENT_PR", null, 0, 100, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "PARENT_PR", null, 0, 100, isOffHeap() ));
     String parentRegionFullPath = 
-      (String) vm3.invoke(WANTestBase.class, "getRegionFullPath", new Object[] { getTestMethodName() + "PARENT_PR"});
+      (String) vm3.invoke(() -> WANTestBase.getRegionFullPath( getTestMethodName() + "PARENT_PR"));
     
     //create colocated (child) PR on site1
-    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegion", new Object[] {
-        getTestMethodName() + "CHILD_PR", "ln", 0, 100, parentRegionFullPath });
+    vm3.invoke(() -> WANTestBase.createColocatedPartitionedRegion(
+        getTestMethodName() + "CHILD_PR", "ln", 0, 100, parentRegionFullPath ));
     
     //create leader and colocated PR on site2
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "PARENT_PR", null, 0, 100, isOffHeap() });
-    vm2.invoke(WANTestBase.class, "createColocatedPartitionedRegion", new Object[] {
-        getTestMethodName() + "CHILD_PR", null, 0, 100, parentRegionFullPath });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "PARENT_PR", null, 0, 100, isOffHeap() ));
+    vm2.invoke(() -> WANTestBase.createColocatedPartitionedRegion(
+        getTestMethodName() + "CHILD_PR", null, 0, 100, parentRegionFullPath ));
     
     //do puts in colocated (child) PR on site1
-    vm3.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "CHILD_PR", 1000 });
+    vm3.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "CHILD_PR", 1000 ));
     
     //verify the puts reach site2
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "CHILD_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "CHILD_PR", 1000 ));
   }
   
   public void testParallelPropagationWithFilter_AfterAck() 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 });
-
-    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm2.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
-        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true });
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
-        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
-        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
-        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true });
-
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap() });
-
-    vm2.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap() });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    vm6.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm7.invoke(() -> WANTestBase.createReceiver( nyPort ));
+
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createSender( "ln", 2, true,
+        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true ));
+    vm3.invoke(() -> WANTestBase.createSender( "ln", 2, true,
+        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true ));
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2, true,
+        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2, true,
+        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+
+    vm2.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap() ));
 
     // wait for senders to be running before doing any puts. This will ensure
     // that
     // not a single events is lost
-    vm2.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "ln" });
-    vm3.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "ln" });
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
-
-    vm2.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
-    vm3.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
-    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
-    
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName(), 1000 });
-    
-    Integer vm2Acks = (Integer)vm2.invoke(WANTestBase.class,
-        "validateAfterAck", new Object[] { "ln"});
-    Integer vm3Acks = (Integer)vm3.invoke(WANTestBase.class,
-        "validateAfterAck", new Object[] { "ln"});
-    Integer vm4Acks = (Integer)vm4.invoke(WANTestBase.class,
-        "validateAfterAck", new Object[] { "ln"});
-    Integer vm5Acks = (Integer)vm5.invoke(WANTestBase.class,
-        "validateAfterAck", new Object[] { "ln"});
+    vm2.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm3.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
+    vm3.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
+    vm5.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName(), 1000 ));
+    
+    Integer vm2Acks = (Integer)vm2.invoke(() -> WANTestBase.validateAfterAck( "ln"));
+    Integer vm3Acks = (Integer)vm3.invoke(() -> WANTestBase.validateAfterAck( "ln"));
+    Integer vm4Acks = (Integer)vm4.invoke(() -> WANTestBase.validateAfterAck( "ln"));
+    Integer vm5Acks = (Integer)vm5.invoke(() -> WANTestBase.validateAfterAck( "ln"));
 
     assertEquals(2000, (vm2Acks + vm3Acks + vm4Acks + vm5Acks));
         
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
index dff14b10ba04..4dd9b205ff64 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
@@ -42,117 +42,115 @@ public void setUp() throws Exception {
    * Site2 (NY): vm3, vm6, vm7
    */
   public void testParallelPropagationLoopBack() {
-    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 ));
 
     //create receiver on site1 and site2
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     //create cache on site1 and site2
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm7.invoke(() -> WANTestBase.createCache( nyPort ));
 
     //create senders on site1
-    vm2.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, null, true });
-    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 });
+    vm2.invoke(() -> WANTestBase.createSender( "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 ));
     
     //create senders on site2
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
-      true, 100, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
-      true, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
-      true, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ny", 1,
+      true, 100, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ny", 1,
+      true, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ny", 1,
+      true, 100, 10, false, false, null, true ));
     
     //create PR on site1
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap()  });
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap()  ));
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap()  ));
     
     //create PR on site2
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap()  });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap()  ));
     
     //start sender on site1
-    vm2.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm2.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     
     //start sender on site2
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm3.invoke(() -> WANTestBase.startSender( "ny" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ny" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ny" ));
     
     //pause senders on site1
-    vm2.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm2.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
     //pause senders on site2
-    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny" });
+    vm3.invoke(() -> WANTestBase.pauseSender( "ny" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ny" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ny" ));
     
     //this is required since sender pause doesn't take effect immediately
     Wait.pause(1000);
     
     //Do 100 puts on site1
-    vm2.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      100 });
+    vm2.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      100 ));
     //do next 100 puts on site2
-    vm3.invoke(WANTestBase.class, "doPutsFrom", new Object[] { getTestMethodName() + "_PR",
-      100, 200 });
+    vm3.invoke(() -> WANTestBase.doPutsFrom( getTestMethodName() + "_PR",
+      100, 200 ));
     //verify queue size on both sites
-    vm2.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 100 });
-    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 100 });
-    vm5.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 100 });
+    vm2.invoke(() -> WANTestBase.verifyQueueSize( "ln", 100 ));
+    vm4.invoke(() -> WANTestBase.verifyQueueSize( "ln", 100 ));
+    vm5.invoke(() -> WANTestBase.verifyQueueSize( "ln", 100 ));
     
-    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
-    vm6.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
-    vm7.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
+    vm3.invoke(() -> WANTestBase.verifyQueueSize( "ny", 100 ));
+    vm6.invoke(() -> WANTestBase.verifyQueueSize( "ny", 100 ));
+    vm7.invoke(() -> WANTestBase.verifyQueueSize( "ny", 100 ));
     
     //resume sender on site1
-    vm2.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm2.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
      
     //validate events reached site2 from site1
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 200 });
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 200 ));
     
     //on site2, verify queue size again
     //this ensures that loopback is not happening since the queue size is same as before
     //the event coming from site1 are not enqueued again
-    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
-    vm6.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
-    vm7.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
+    vm3.invoke(() -> WANTestBase.verifyQueueSize( "ny", 100 ));
+    vm6.invoke(() -> WANTestBase.verifyQueueSize( "ny", 100 ));
+    vm7.invoke(() -> WANTestBase.verifyQueueSize( "ny", 100 ));
     
     //resume sender on site2
-    vm3.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny" });
+    vm3.invoke(() -> WANTestBase.resumeSender( "ny" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ny" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ny" ));
     
     //validate region size on both the sites
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 200 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 200 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 200 ));
   }
   
   /**
@@ -163,103 +161,100 @@ public void testParallelPropagationLoopBack() {
    */
   public void testParallelPropagationLoopBack3Sites() {
     //Create locators
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
     
     //create cache and receivers on all the 3 sites
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    vm3.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    vm4.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm5.invoke(() -> WANTestBase.createReceiver( tkPort ));
     
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( nyPort ));
     
     //create senders on all the 3 sites
-    vm3.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 });
+    vm3.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 ));
     
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 3,
-      true, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 3,
-      true, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ny", 3,
+      true, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ny", 3,
+      true, 100, 10, false, false, null, true ));
     
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk", 1,
-      true, 100, 10, false, false, null, true });
+    vm5.invoke(() -> WANTestBase.createSender( "tk", 1,
+      true, 100, 10, false, false, null, true ));
     
     //create PR on the 3 sites
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln", 0, 100, isOffHeap() ));
     
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ny", 0, 100, isOffHeap() ));
     
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "tk", 0, 100, isOffHeap() });
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "tk", 0, 100, isOffHeap() ));
     
     //start senders on all the sites 
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm4.invoke(() -> WANTestBase.startSender( "ny" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ny" ));
     
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk" });
+    vm5.invoke(() -> WANTestBase.startSender( "tk" ));
     
     //pause senders on site1 and site3. Site2 has the sender running to pass along events
-    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
     
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "tk" });
+    vm5.invoke(() -> WANTestBase.pauseSender( "tk" ));
     
     //need to have this pause since pauseSender doesn't take effect immediately
     Wait.pause(1000);
     
     //do puts on site1
-    vm3.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      100 });
+    vm3.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      100 ));
     
     //do more puts on site3
-    vm5.invoke(WANTestBase.class, "doPutsFrom", new Object[] { getTestMethodName() + "_PR",
-      100, 200 });
+    vm5.invoke(() -> WANTestBase.doPutsFrom( getTestMethodName() + "_PR",
+      100, 200 ));
     
     //verify queue size on site1 and site3
-    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 100 });
-    vm5.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "tk", 100 });
+    vm3.invoke(() -> WANTestBase.verifyQueueSize( "ln", 100 ));
+    vm5.invoke(() -> WANTestBase.verifyQueueSize( "tk", 100 ));
 
     //resume sender on site1 so that events reach site2 and from there to site3
-    vm3.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
     
     //validate region size on site2 (should have 100) and site3 (should have 200)
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 100 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 200 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 100 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 200 ));
     
     //verify queue size remains same on site3 which means event loopback did not happen
     //this means events coming from site1 are not enqueued back into the sender
-    vm5.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "tk", 100 });
+    vm5.invoke(() -> WANTestBase.verifyQueueSize( "tk", 100 ));
     
     //resume sender on site3
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "tk" });
+    vm5.invoke(() -> WANTestBase.resumeSender( "tk" ));
     
     //validate region size
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 200 });
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 200 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 200 });
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 200 ));
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 200 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 200 ));
   }
   
   /**
@@ -271,154 +266,151 @@ public void testParallelPropagationLoopBack3Sites() {
    * TK site: vm5
    */
   public void testParallelPropagationLoopBack3SitesNtoNTopologyPutFromOneDS() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
     
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    vm3.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    vm4.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm5.invoke(() -> WANTestBase.createReceiver( tkPort ));
     
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( nyPort ));
     
     //site1
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-      true, 100, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-      true, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln1", 2,
+      true, 100, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln1", 2,
+      true, 100, 10, false, false, null, true ));
 
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
-      true, 100, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
-      true, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln2", 3,
+      true, 100, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln2", 3,
+      true, 100, 10, false, false, null, true ));
     
     //site2
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1,
-      true, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1,
-      true, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ny1", 1,
+      true, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ny1", 1,
+      true, 100, 10, false, false, null, true ));
 
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny2", 3,
-      true, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny2", 3,
-      true, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ny2", 3,
+      true, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ny2", 3,
+      true, 100, 10, false, false, null, true ));
 
     //site3
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk1", 1,
-      true, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk2", 2,
-      true, 100, 10, false, false, null, true });
+    vm5.invoke(() -> WANTestBase.createSender( "tk1", 1,
+      true, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "tk2", 2,
+      true, 100, 10, false, false, null, true ));
 
     //create PR
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln1,ln2", 0, 1, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ln1,ln2", 0, 1, isOffHeap() });
-    
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ny1,ny2", 0, 1, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "ny1,ny2", 0, 1, isOffHeap() });
-    
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      getTestMethodName() + "_PR", "tk1,tk2", 0, 1, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln1,ln2", 0, 1, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ln1,ln2", 0, 1, isOffHeap() ));
+    
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ny1,ny2", 0, 1, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "ny1,ny2", 0, 1, isOffHeap() ));
+    
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", "tk1,tk2", 0, 1, isOffHeap() ));
 
     //start all the senders
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+    vm3.invoke(() -> WANTestBase.startSender( "ln1" ));
+    vm3.invoke(() -> WANTestBase.startSender( "ln2" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln1" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ln2" ));
     
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny2" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny2" });
+    vm4.invoke(() -> WANTestBase.startSender( "ny1" ));
+    vm4.invoke(() -> WANTestBase.startSender( "ny2" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ny1" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ny2" ));
     
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk1" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk2" });
+    vm5.invoke(() -> WANTestBase.startSender( "tk1" ));
+    vm5.invoke(() -> WANTestBase.startSender( "tk2" ));
     
     //pause senders on all the sites
-    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln1" });
-    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln2" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln1" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln2" });
+    vm3.invoke(() -> WANTestBase.pauseSender( "ln1" ));
+    vm3.invoke(() -> WANTestBase.pauseSender( "ln2" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln1" ));
+    vm6.invoke(() -> WANTestBase.pauseSender( "ln2" ));
     
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny1" });
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny2" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny1" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny2" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ny1" ));
+    vm4.invoke(() -> WANTestBase.pauseSender( "ny2" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ny1" ));
+    vm7.invoke(() -> WANTestBase.pauseSender( "ny2" ));
     
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "tk1" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "tk2" });
+    vm5.invoke(() -> WANTestBase.pauseSender( "tk1" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "tk2" ));
     
     //this is required since sender pause doesn't take effect immediately
     Wait.pause(1000);
 
     //do puts on site1
-    vm3.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      100 });
+    vm3.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      100 ));
     
     //verify queue size on site1 and site3
-    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln1", 100 });
-    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln2", 100 });
+    vm3.invoke(() -> WANTestBase.verifyQueueSize( "ln1", 100 ));
+    vm3.invoke(() -> WANTestBase.verifyQueueSize( "ln2", 100 ));
     
     //resume sender (from site1 to site2) on site1
-    vm3.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln1" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln1" });
+    vm3.invoke(() -> WANTestBase.resumeSender( "ln1" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln1" ));
 
     //validate region size on site2
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 100 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 100 ));
 
     //verify queue size on site2 (sender 2 to 1)
     //should remain at 0 as the events from site1 should not go back to site1
-    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny1", 0 });
+    vm4.invoke(() -> WANTestBase.verifyQueueSize( "ny1", 0 ));
     
     //verify queue size on site2 (sender 2 to 3)
     //should remain at 0 as events from site1 will reach site3 directly..site2 need not send to site3 again  
-    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny2", 0 });
+    vm4.invoke(() -> WANTestBase.verifyQueueSize( "ny2", 0 ));
     
     //do more puts on site3
-    vm5.invoke(WANTestBase.class, "doPutsFrom", new Object[] { getTestMethodName() + "_PR",
-      100, 200 });
+    vm5.invoke(() -> WANTestBase.doPutsFrom( getTestMethodName() + "_PR",
+      100, 200 ));
     
     //resume sender (from site3 to site2) on site3
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "tk2" });
+    vm5.invoke(() -> WANTestBase.resumeSender( "tk2" ));
     
     //validate region size on site2
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 200 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 200 ));
     
     //verify queue size on site2 (sender 2 to 3)
     //should remain at 0 as the events from site3 should not go back to site3
-    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny2", 0 });
+    vm4.invoke(() -> WANTestBase.verifyQueueSize( "ny2", 0 ));
     
     //verify queue size on site2 (sender 2 to 1)
     //should remain at 0 as events from site3 will reach site1 directly..site2 need not send to site1 again  
-    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny1", 0 });
+    vm4.invoke(() -> WANTestBase.verifyQueueSize( "ny1", 0 ));
     
     //resume all senders
-    vm3.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln2" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln2" });
+    vm3.invoke(() -> WANTestBase.resumeSender( "ln2" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln2" ));
     
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny1" });
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny2" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny1" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny2" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ny1" ));
+    vm4.invoke(() -> WANTestBase.resumeSender( "ny2" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ny1" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ny2" ));
     
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "tk1" });
+    vm5.invoke(() -> WANTestBase.resumeSender( "tk1" ));
     
     //validate region size on all sites
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 200 });
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 200 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 200 });
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 200 ));
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 200 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 200 ));
   }
   
 
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index 04214fb84fd9..f1c8b1c7b5ca 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -44,10 +44,8 @@ public void setUp() throws Exception {
   }
   
   public void testPartitionedRegionParallelPropagation_BeforeDispatch() 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 ));
 
     createReceiver(vm2, nyPort);
     createReceiver(vm3, nyPort);
@@ -63,14 +61,10 @@ public void testPartitionedRegionParallelPropagation_BeforeDispatch() throws Exc
 
     putKeyValues();
 
-    ArrayList v4List = (ArrayList)vm4.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", NUM_PUTS });
-    ArrayList v5List = (ArrayList)vm5.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", NUM_PUTS });
-    ArrayList v6List = (ArrayList)vm6.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", NUM_PUTS });
-    ArrayList v7List = (ArrayList)vm7.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", NUM_PUTS });
+    ArrayList v4List = (ArrayList)vm4.invoke(() -> WANTestBase.getSenderStats( "ln", NUM_PUTS ));
+    ArrayList v5List = (ArrayList)vm5.invoke(() -> WANTestBase.getSenderStats( "ln", NUM_PUTS ));
+    ArrayList v6List = (ArrayList)vm6.invoke(() -> WANTestBase.getSenderStats( "ln", NUM_PUTS ));
+    ArrayList v7List = (ArrayList)vm7.invoke(() -> WANTestBase.getSenderStats( "ln", NUM_PUTS ));
     
     assertEquals(NUM_PUTS, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
     assertEquals(NUM_PUTS, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
@@ -82,10 +76,8 @@ public void testPartitionedRegionParallelPropagation_BeforeDispatch() throws Exc
   }
 
   public void testPartitionedRegionParallelPropagation_AfterDispatch_NoRedundacny() 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 ));
 
     createReceiver(vm2, nyPort);
    
@@ -98,21 +90,17 @@ public void testPartitionedRegionParallelPropagation_AfterDispatch_NoRedundacny(
     
     startSenders();
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName,
-        NUM_PUTS });
+    vm4.invoke(() -> WANTestBase.doPuts( testName,
+        NUM_PUTS ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, NUM_PUTS });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, NUM_PUTS ));
     
     
-    ArrayList v4List = (ArrayList)vm4.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v5List = (ArrayList)vm5.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v6List = (ArrayList)vm6.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v7List = (ArrayList)vm7.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList v4List = (ArrayList)vm4.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v5List = (ArrayList)vm5.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v6List = (ArrayList)vm6.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v7List = (ArrayList)vm7.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
     
     assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
     assertEquals(NUM_PUTS, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
@@ -121,14 +109,12 @@ public void testPartitionedRegionParallelPropagation_AfterDispatch_NoRedundacny(
     assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10); //batches distributed
     assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
     
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {10, NUM_PUTS, NUM_PUTS });
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS, NUM_PUTS ));
   }
   
   public void testPartitionedRegionParallelPropagation_AfterDispatch_Redundancy_3() 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 ));
 
     createReceiver(vm2, nyPort);
 
@@ -140,20 +126,16 @@ public void testPartitionedRegionParallelPropagation_AfterDispatch_Redundancy_3(
     
     startSenders();
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName,
-        NUM_PUTS });
+    vm4.invoke(() -> WANTestBase.doPuts( testName,
+        NUM_PUTS ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, NUM_PUTS });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, NUM_PUTS ));
     
-    ArrayList v4List = (ArrayList)vm4.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v5List = (ArrayList)vm5.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v6List = (ArrayList)vm6.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v7List = (ArrayList)vm7.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList v4List = (ArrayList)vm4.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v5List = (ArrayList)vm5.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v6List = (ArrayList)vm6.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v7List = (ArrayList)vm7.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
     
     assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
     assertEquals(400, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
@@ -162,50 +144,46 @@ public void testPartitionedRegionParallelPropagation_AfterDispatch_Redundancy_3(
     assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10); //batches distributed
     assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
     
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {10, NUM_PUTS, NUM_PUTS });
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS, NUM_PUTS ));
   }
   
   public void testWANStatsTwoWanSites_Bug44331() throws Exception {
     Integer lnPort = createFirstLocatorWithDSId(1);
-    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer nyPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
 
     createReceiver(vm2, nyPort);
     createReceiver(vm3, tkPort);
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm4.invoke(() -> WANTestBase.createCache(lnPort ));
 
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1",
-        2, true, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln1",
+        2, true, 100, 10, false, false, null, true ));
   
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln2",
-        3, true, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln2",
+        3, true, 100, 10, false, false, null, true ));
   
     createReceiverPR(vm2, 0);
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      testName, null, 0, 10, isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      testName, null, 0, 10, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      testName, "ln1,ln2", 0, 10, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+      testName, "ln1,ln2", 0, 10, isOffHeap() ));
     
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln1" ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln2" ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName,
-        NUM_PUTS });
+    vm4.invoke(() -> WANTestBase.doPuts( testName,
+        NUM_PUTS ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, NUM_PUTS });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, NUM_PUTS });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, NUM_PUTS ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        testName, NUM_PUTS ));
     
-    ArrayList v4Sender1List = (ArrayList)vm4.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln1", 0 });
-    ArrayList v4Sender2List = (ArrayList)vm4.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln2", 0 });
+    ArrayList v4Sender1List = (ArrayList)vm4.invoke(() -> WANTestBase.getSenderStats( "ln1", 0 ));
+    ArrayList v4Sender2List = (ArrayList)vm4.invoke(() -> WANTestBase.getSenderStats( "ln2", 0 ));
     
     assertEquals(0, v4Sender1List.get(0).intValue()); //queue size
     assertEquals(NUM_PUTS, v4Sender1List.get(1).intValue()); //eventsReceived
@@ -221,15 +199,13 @@ public void testWANStatsTwoWanSites_Bug44331() throws Exception {
     assertTrue(v4Sender2List.get(4).intValue()>=10); //batches distributed
     assertEquals(0, v4Sender2List.get(5).intValue()); //batches redistributed
     
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {10, NUM_PUTS, NUM_PUTS });
-    vm3.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {10, NUM_PUTS, NUM_PUTS });
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS, NUM_PUTS ));
+    vm3.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS, NUM_PUTS ));
   }
   
   public void testParallelPropagationHA() 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 ));
 
     createReceiver(vm2, nyPort);
     
@@ -242,22 +218,18 @@ public void testParallelPropagationHA() throws Exception {
     
     startSenders();
 
-    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { testName, 1000 });
+    AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts( testName, 1000 ));
     pause(200);
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
     inv1.join();
     inv2.join();
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, 1000 ));
     
-    ArrayList v5List = (ArrayList)vm5.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0});
-    ArrayList v6List = (ArrayList)vm6.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0});
-    ArrayList v7List = (ArrayList)vm7.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0});
+    ArrayList v5List = (ArrayList)vm5.invoke(() -> WANTestBase.getSenderStats( "ln", 0));
+    ArrayList v6List = (ArrayList)vm6.invoke(() -> WANTestBase.getSenderStats( "ln", 0));
+    ArrayList v7List = (ArrayList)vm7.invoke(() -> WANTestBase.getSenderStats( "ln", 0));
     
     assertEquals(0, v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
     int receivedEvents = v5List.get(1) + v6List.get(1) + v7List.get(1);
@@ -269,7 +241,7 @@ public void testParallelPropagationHA() throws Exception {
     //assertTrue(v5List.get(4) + v6List.get(4) + v7List.get(4) > 1000); //batches distributed : its quite possible that vm4 has distributed some of the batches.
     assertEquals(0, v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
   
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStatsHA", new Object[] {NUM_PUTS, 1000, 1000 });
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStatsHA(NUM_PUTS, 1000, 1000 ));
   }
 
   /**
@@ -281,10 +253,8 @@ public void testParallelPropagationHA() throws Exception {
    */
   public void  testParallePropagationWithRemoteRegionDestroy() throws Exception {
     addIgnoredException("RegionDestroyedException");
-    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 ));
 
     createReceiver(vm2, nyPort);
 
@@ -292,28 +262,24 @@ public void  testParallePropagationWithRemoteRegionDestroy() throws Exception {
 
     createReceiverPR(vm2, 0);
 
-    vm2.invoke(WANTestBase.class, "addCacheListenerAndDestroyRegion", new Object[] {
-        testName});
+    vm2.invoke(() -> WANTestBase.addCacheListenerAndDestroyRegion(
+        testName));
 
     createSenderPRs(0);
 
     startSenders();
 
     //start puts in RR_1 in another thread
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 2000 });
+    vm4.invoke(() -> WANTestBase.doPuts( testName, 2000 ));
     
     //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, 2000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        testName, 2000 ));
     
-    ArrayList v4List = (ArrayList)vm5.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", -1});
-    ArrayList v5List = (ArrayList)vm5.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", -1});
-    ArrayList v6List = (ArrayList)vm6.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", -1});
-    ArrayList v7List = (ArrayList)vm7.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", -1});
+    ArrayList v4List = (ArrayList)vm5.invoke(() -> WANTestBase.getSenderStats( "ln", -1));
+    ArrayList v5List = (ArrayList)vm5.invoke(() -> WANTestBase.getSenderStats( "ln", -1));
+    ArrayList v6List = (ArrayList)vm6.invoke(() -> WANTestBase.getSenderStats( "ln", -1));
+    ArrayList v7List = (ArrayList)vm7.invoke(() -> WANTestBase.getSenderStats( "ln", -1));
     
     
     assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 1); //batches distributed : its quite possible that vm4 has distributed some of the batches.
@@ -322,30 +288,28 @@ public void  testParallePropagationWithRemoteRegionDestroy() throws Exception {
 
   public void testParallelPropogationWithFilter() 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 ));
 
     createReceiver(vm2, 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,
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
       true, 100, 10, false, false,
-      new MyGatewayEventFilter(), true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      new MyGatewayEventFilter(), true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
       true, 100, 10, false, false,
-      new MyGatewayEventFilter(), true });
+      new MyGatewayEventFilter(), true ));
   
     createSenderPRs(0);
 
@@ -353,19 +317,15 @@ public void testParallelPropogationWithFilter() throws Exception {
 
     createReceiverPR(vm2, 1);
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( testName, 1000 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 800 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, 800 ));
     
-    ArrayList v4List = (ArrayList)vm4.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v5List = (ArrayList)vm5.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v6List = (ArrayList)vm6.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v7List = (ArrayList)vm7.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList v4List = (ArrayList)vm4.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v5List = (ArrayList)vm5.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v6List = (ArrayList)vm6.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v7List = (ArrayList)vm7.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
     
     assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
     assertEquals(1000, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
@@ -375,14 +335,12 @@ public void testParallelPropogationWithFilter() throws Exception {
     assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
     assertEquals(200, v4List.get(6) + v5List.get(6) + v6List.get(6) + v7List.get(6)); //events filtered
     
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {80, 800, 800});
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(80, 800, 800));
   }
   
   public void testParallelPropagationConflation() 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 ));
 
     createReceiver(vm2, nyPort);
 
@@ -400,44 +358,40 @@ public void testParallelPropagationConflation() throws Exception {
       updateKeyValues.put(i, i+"_updated");
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( testName, updateKeyValues ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() /*creates aren't conflated*/ });
+    vm4.invoke(() -> WANTestBase.checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() /*creates aren't conflated*/ ));
     
     // Do the puts again. Since these are updates, the previous updates will be conflated.
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( testName, updateKeyValues ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() /*creates aren't conflated*/ });
+    vm4.invoke(() -> WANTestBase.checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() /*creates aren't conflated*/ ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 0 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, 0 ));
 
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {0, 0, 0});
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(0, 0, 0));
     
-    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" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
 
     keyValues.putAll(updateKeyValues);
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, keyValues.size() });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, keyValues.size() ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
+    vm2.invoke(() -> WANTestBase.validateRegionContents(
+        testName, keyValues ));
     
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {0, 150, NUM_PUTS});
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(0, 150, NUM_PUTS));
     
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.checkQueueSize( "ln", 0 ));
     
-    ArrayList v4List = (ArrayList)vm4.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v5List = (ArrayList)vm5.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v6List = (ArrayList)vm6.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList v7List = (ArrayList)vm7.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList v4List = (ArrayList)vm4.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v5List = (ArrayList)vm5.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v6List = (ArrayList)vm6.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList v7List = (ArrayList)vm7.invoke(() -> WANTestBase.getSenderStats( "ln", 0 ));
     
     assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
     assertEquals(200, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
@@ -455,27 +409,27 @@ protected Map putKeyValues() {
       keyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( testName, keyValues ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+    vm4.invoke(() -> WANTestBase.checkQueueSize( "ln", keyValues.size() ));
     
     return keyValues;
   }
 
   protected void createReceiverPR(VM vm, int redundancy) {
-    vm.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, redundancy, 10, isOffHeap() });
+    vm.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, null, redundancy, 10, isOffHeap() ));
   }
   
   protected void createSenderPRs(int redundancy) {
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", redundancy, 10, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", redundancy, 10, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", redundancy, 10, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", redundancy, 10, isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", redundancy, 10, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", redundancy, 10, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", redundancy, 10, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", redundancy, 10, isOffHeap() ));
   }
 
   protected void startPausedSenders() {
@@ -488,45 +442,45 @@ protected void startPausedSenders() {
   }
 
   protected void createReceiver(VM vm, Integer nyPort) {
-    vm.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm.invoke(() -> WANTestBase.createReceiver( nyPort ));
   }
   
   protected void startSenders() {
-    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" ));
   }
 
   protected void createSendersWithConflation(Integer lnPort) {
-    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, true, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
+    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, true, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, true, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, true, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
+        true, 100, 10, true, false, null, true ));
   }
 
   protected void createSenders(Integer lnPort) {
-    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.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 ));
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
index 3ea26741f97f..8e3a76051f48 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
@@ -47,11 +47,9 @@ public void setUp() throws Exception {
     //Uses replicated regions and conserve-sockets=false
     public void testPrimarySendersOnDifferentVMsReplicated() throws Exception {
 
-        Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
-                "createFirstPeerLocator", new Object[]{1});
+        Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstPeerLocator(1));
 
-        Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
-                "createFirstRemoteLocator", new Object[]{2, lnPort});
+        Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
 
         createCachesWith(Boolean.FALSE, nyPort, lnPort);
 
@@ -65,10 +63,10 @@ public void testPrimarySendersOnDifferentVMsReplicated() throws Exception {
 
         //exercise region and gateway operations with different messaging
         exerciseWANOperations();
-        AsyncInvocation invVM4transaction = vm4.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{getTestMethodName() + "_RR", 100});
-        AsyncInvocation invVM5transaction = vm5.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{getTestMethodName() + "_RR", 100});
-        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
-        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
+        AsyncInvocation invVM4transaction = vm4.invokeAsync(() -> WANTestBase.doTxPuts(getTestMethodName() + "_RR", 100));
+        AsyncInvocation invVM5transaction = vm5.invokeAsync(() -> WANTestBase.doTxPuts(getTestMethodName() + "_RR", 100));
+        AsyncInvocation invVM4 = vm4.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000));
+        AsyncInvocation invVM5 = vm5.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000));
 
         exerciseFunctions();
 
@@ -86,11 +84,9 @@ public void testPrimarySendersOnDifferentVMsReplicated() throws Exception {
 
     //Uses partitioned regions and conserve-sockets=false
     public void testPrimarySendersOnDifferentVMsPR() throws Exception {
-        Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
-                "createFirstPeerLocator", new Object[]{1});
+        Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstPeerLocator(1));
 
-        Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
-                "createFirstRemoteLocator", new Object[]{2, lnPort});
+        Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
 
         createCachesWith(Boolean.FALSE, nyPort, lnPort);
 
@@ -102,12 +98,12 @@ public void testPrimarySendersOnDifferentVMsPR() throws Exception {
 
         exerciseWANOperations();
         AsyncInvocation invVM4transaction
-                = vm4.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{getTestMethodName() + "_RR", 100, 1000});
+                = vm4.invokeAsync(() -> SerialGatewaySenderDistributedDeadlockDUnitTest.doTxPutsPR(getTestMethodName() + "_RR", 100, 1000));
         AsyncInvocation invVM5transaction
-                = vm5.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{getTestMethodName() + "_RR", 100, 1000});
+                = vm5.invokeAsync(() -> SerialGatewaySenderDistributedDeadlockDUnitTest.doTxPutsPR(getTestMethodName() + "_RR", 100, 1000));
 
-        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
-        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
+        AsyncInvocation invVM4 = vm4.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000));
+        AsyncInvocation invVM5 = vm5.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000));
 
         exerciseFunctions();
 
@@ -125,11 +121,9 @@ public void testPrimarySendersOnDifferentVMsPR() throws Exception {
     //Uses replicated regions and conserve-sockets=true
     public void testPrimarySendersOnDifferentVMsReplicatedSocketPolicy() throws Exception {
 
-        Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
-                "createFirstPeerLocator", new Object[]{1});
+        Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstPeerLocator(1));
 
-        Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
-                "createFirstRemoteLocator", new Object[]{2, lnPort});
+        Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
 
         createCachesWith(Boolean.TRUE, nyPort, lnPort);
 
@@ -143,11 +137,11 @@ public void testPrimarySendersOnDifferentVMsReplicatedSocketPolicy() throws Exce
 
         //exercise region and gateway operations with messaging
         exerciseWANOperations();
-        AsyncInvocation invVM4transaction = vm4.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{getTestMethodName() + "_RR", 100});
-        AsyncInvocation invVM5transaction = vm5.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{getTestMethodName() + "_RR", 100});
+        AsyncInvocation invVM4transaction = vm4.invokeAsync(() -> WANTestBase.doTxPuts(getTestMethodName() + "_RR", 100));
+        AsyncInvocation invVM5transaction = vm5.invokeAsync(() -> WANTestBase.doTxPuts(getTestMethodName() + "_RR", 100));
 
-        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
-        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
+        AsyncInvocation invVM4 = vm4.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000));
+        AsyncInvocation invVM5 = vm5.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000));
 
         exerciseFunctions();
 
@@ -165,11 +159,9 @@ public void testPrimarySendersOnDifferentVMsReplicatedSocketPolicy() throws Exce
     //Uses partitioned regions and conserve-sockets=true
     //this always causes a distributed deadlock
     public void testPrimarySendersOnDifferentVMsPRSocketPolicy() throws Exception {
-        Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
-                "createFirstPeerLocator", new Object[]{1});
+        Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstPeerLocator(1));
 
-        Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
-                "createFirstRemoteLocator", new Object[]{2, lnPort});
+        Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
 
         createCachesWith(Boolean.TRUE, nyPort, lnPort);
 
@@ -181,12 +173,12 @@ public void testPrimarySendersOnDifferentVMsPRSocketPolicy() throws Exception {
 
         exerciseWANOperations();
         AsyncInvocation invVM4transaction
-                = vm4.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{getTestMethodName() + "_RR", 100, 1000});
+                = vm4.invokeAsync(() -> SerialGatewaySenderDistributedDeadlockDUnitTest.doTxPutsPR(getTestMethodName() + "_RR", 100, 1000));
         AsyncInvocation invVM5transaction
-                = vm5.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{getTestMethodName() + "_RR", 100, 1000});
+                = vm5.invokeAsync(() -> SerialGatewaySenderDistributedDeadlockDUnitTest.doTxPutsPR(getTestMethodName() + "_RR", 100, 1000));
 
-        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
-        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
+        AsyncInvocation invVM4 = vm4.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000));
+        AsyncInvocation invVM5 = vm5.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000));
 
         exerciseFunctions();
 
@@ -206,59 +198,55 @@ public void testPrimarySendersOnDifferentVMsPRSocketPolicy() throws Exception {
     //**************************************************************************
     private void createReplicatedRegions(Integer nyPort) throws Exception {
         //create receiver
-        vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[]{
-          getTestMethodName() + "_RR", null, false});
-        vm2.invoke(WANTestBase.class, "createReceiverAfterCache", new Object[]{nyPort});
+        vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", null, false));
+        vm2.invoke(() -> WANTestBase.createReceiverAfterCache(nyPort));
 
         //create senders
-        vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[]{
-          getTestMethodName() + "_RR", "ln1,ln2", false});
+        vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1,ln2", false));
 
-        vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[]{
-          getTestMethodName() + "_RR", "ln1,ln2", false});
+        vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+          getTestMethodName() + "_RR", "ln1,ln2", false));
     }
 
     private void createCachesWith(Boolean socketPolicy, Integer nyPort, Integer lnPort) {
-        vm2.invoke(WANTestBase.class, "createCacheConserveSockets", new Object[]{socketPolicy, nyPort});
+        vm2.invoke(() -> WANTestBase.createCacheConserveSockets(socketPolicy, nyPort));
 
-        vm4.invoke(WANTestBase.class, "createCacheConserveSockets", new Object[]{socketPolicy, lnPort});
+        vm4.invoke(() -> WANTestBase.createCacheConserveSockets(socketPolicy, lnPort));
 
-        vm5.invoke(WANTestBase.class, "createCacheConserveSockets", new Object[]{socketPolicy, lnPort});
+        vm5.invoke(() -> WANTestBase.createCacheConserveSockets(socketPolicy, lnPort));
     }
 
     private void exerciseFunctions() throws Exception {
         //do function calls that use a shared connection
         for (int x = 0; x < 1000; x++) {
             //setting it to Boolean.TRUE it should pass the test
-            vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
-                    new Object[]{getTestMethodName() + "_RR", 1, Boolean.TRUE});
-            vm5.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
-                    new Object[]{getTestMethodName() + "_RR", 1, Boolean.TRUE});
+            vm4.invoke(() -> SerialGatewaySenderDistributedDeadlockDUnitTest.doFunctionPuts(getTestMethodName() + "_RR", 1, Boolean.TRUE));
+            vm5.invoke(() -> SerialGatewaySenderDistributedDeadlockDUnitTest.doFunctionPuts(getTestMethodName() + "_RR", 1, Boolean.TRUE));
         }
         for (int x = 0; x < 1000; x++) {
             //setting the Boolean.FALSE below will cause a deadlock in some GFE versions
             //setting it to Boolean.TRUE as above it should pass the test
             //this is similar to the customer found distributed deadlock
-            vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
-                    new Object[]{getTestMethodName() + "_RR", 1, Boolean.FALSE});
-            vm5.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
-                    new Object[]{getTestMethodName() + "_RR", 1, Boolean.FALSE});
+            vm4.invoke(() -> SerialGatewaySenderDistributedDeadlockDUnitTest.doFunctionPuts(getTestMethodName() + "_RR", 1, Boolean.FALSE));
+            vm5.invoke(() -> SerialGatewaySenderDistributedDeadlockDUnitTest.doFunctionPuts(getTestMethodName() + "_RR", 1, Boolean.FALSE));
         }
     }
 
     private void createPartitionedRegions(Integer nyPort) throws Exception {
         //create remote receiver
-        vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{getTestMethodName() + "_RR",
-                                                                                "", 0, 113, false});
+        vm2.invoke(() -> WANTestBase.createPartitionedRegion(getTestMethodName() + "_RR",
+                                                                                "", 0, 113, false));
 
-        vm2.invoke(WANTestBase.class, "createReceiverAfterCache", new Object[]{nyPort});
+        vm2.invoke(() -> WANTestBase.createReceiverAfterCache(nyPort));
 
         //create sender vms
-        vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{
-          getTestMethodName() + "_RR", "ln1,ln2", 1, 113, false});
+        vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+          getTestMethodName() + "_RR", "ln1,ln2", 1, 113, false));
 
-        vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{
-          getTestMethodName() + "_RR", "ln1,ln2", 1, 113, false});
+        vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+          getTestMethodName() + "_RR", "ln1,ln2", 1, 113, false));
     }
 
     private void exerciseWANOperations() throws Exception {
@@ -266,64 +254,63 @@ private void exerciseWANOperations() throws Exception {
         //messaging between the WAN gateways and members
 
         //exercise region and gateway operations
-        vm4.invoke(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 100});
-        vm5.invoke(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 100});
+        vm4.invoke(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 100));
+        vm5.invoke(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 100));
         Wait.pause(2000); //wait for events to propogate
-        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 100});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 100});
-        vm5.invoke(WANTestBase.class, "doDestroys", new Object[]{getTestMethodName() + "_RR", 100});
+        vm4.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 100));
+        vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 100));
+        vm5.invoke(() -> WANTestBase.doDestroys(getTestMethodName() + "_RR", 100));
         Wait.pause(2000);//wait for events to propogate
-        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 0});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 0});
-        vm4.invoke(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 100});
-        vm5.invoke(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 100});
+        vm5.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 0));
+        vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 0));
+        vm4.invoke(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 100));
+        vm5.invoke(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 100));
         Wait.pause(2000); //wait for events to propogate
-        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 100});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 100});
-        vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doInvalidates",
-                new Object[]{getTestMethodName() + "_RR", 100, 100});
-        vm4.invoke(WANTestBase.class, "doPutAll", new Object[]{getTestMethodName() + "_RR", 100, 10});
-        vm5.invoke(WANTestBase.class, "doPutAll", new Object[]{getTestMethodName() + "_RR", 100, 10});
+        vm4.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 100));
+        vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 100));
+        vm4.invoke(() -> SerialGatewaySenderDistributedDeadlockDUnitTest.doInvalidates(getTestMethodName() + "_RR", 100, 100));
+        vm4.invoke(() -> WANTestBase.doPutAll(getTestMethodName() + "_RR", 100, 10));
+        vm5.invoke(() -> WANTestBase.doPutAll(getTestMethodName() + "_RR", 100, 10));
         Wait.pause(2000);//wait for events to propogate
-        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 1000});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 1000});
-        vm4.invoke(WANTestBase.class, "doDestroys", new Object[]{getTestMethodName() + "_RR", 1000});
+        vm4.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 1000));
+        vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 1000));
+        vm4.invoke(() -> WANTestBase.doDestroys(getTestMethodName() + "_RR", 1000));
         Wait.pause(2000);//wait for events to propogate
-        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 0});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 0});
-        vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[]{getTestMethodName() + "_RR", 100});
+        vm5.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 0));
+        vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 0));
+        vm4.invoke(() -> WANTestBase.doPutsPDXSerializable(getTestMethodName() + "_RR", 100));
         Wait.pause(2000);
-        vm5.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{getTestMethodName() + "_RR", 100});
-        vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{getTestMethodName() + "_RR", 100});
+        vm5.invoke(() -> WANTestBase.validateRegionSize_PDX(getTestMethodName() + "_RR", 100));
+        vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(getTestMethodName() + "_RR", 100));
     }
 
     private void startSerialSenders() throws Exception {
         //get one primary sender on vm4 and another primary on vm5
         //the startup order matters here so that primaries are
         //on different JVM's
-        vm4.invoke(WANTestBase.class, "startSender", new Object[]{"ln1"});
+        vm4.invoke(() -> WANTestBase.startSender("ln1"));
 
-        vm5.invoke(WANTestBase.class, "startSender", new Object[]{"ln2"});
+        vm5.invoke(() -> WANTestBase.startSender("ln2"));
 
         //start secondaries
-        vm5.invoke(WANTestBase.class, "startSender", new Object[]{"ln1"});
+        vm5.invoke(() -> WANTestBase.startSender("ln1"));
 
-        vm4.invoke(WANTestBase.class, "startSender", new Object[]{"ln2"});
+        vm4.invoke(() -> WANTestBase.startSender("ln2"));
     }
 
     private void createSerialSenders() throws Exception {
 
-        vm4.invoke(WANTestBase.class, "createSender", new Object[]{"ln1", 2,
-            false, 100, 10, false, false, null, true});
+        vm4.invoke(() -> WANTestBase.createSender("ln1", 2,
+            false, 100, 10, false, false, null, true));
 
-        vm5.invoke(WANTestBase.class, "createSender", new Object[]{"ln1", 2,
-            false, 100, 10, false, false, null, true});
+        vm5.invoke(() -> WANTestBase.createSender("ln1", 2,
+            false, 100, 10, false, false, null, true));
 
-        vm4.invoke(WANTestBase.class, "createSender", new Object[]{"ln2", 2,
-            false, 100, 10, false, false, null, true});
+        vm4.invoke(() -> WANTestBase.createSender("ln2", 2,
+            false, 100, 10, false, false, null, true));
 
-        vm5.invoke(WANTestBase.class, "createSender", new Object[]{"ln2", 2,
-            false, 100, 10, false, false, null, true});
+        vm5.invoke(() -> WANTestBase.createSender("ln2", 2,
+            false, 100, 10, false, false, null, true));
     }
 
     public static void doFunctionPuts(String name, int num, Boolean useThreadOwnedSocket) throws Exception {
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index 89b575fc9444..113eb84058c9 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -53,107 +53,105 @@ public void setUp() throws Exception {
    */
   public void __testGatewaySenderEventListenerInvocationWithoutLocator() {
     int mPort = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
-    vm4.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
-    vm5.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
-    vm6.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
-    vm7.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
-
-    vm4.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, false, true});
-    vm5.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, false, true});
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort ));
+    vm5.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort ));
+    vm6.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort ));
+    vm7.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort ));
+
+    vm4.invoke(() -> WANTestBase.createSenderWithListener( "ln", 2,
+        false, 100, 10, false, false, null, false, true));
+    vm5.invoke(() -> WANTestBase.createSenderWithListener( "ln", 2,
+        false, 100, 10, false, false, null, false, true));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1000; i++) {
       keyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
 
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", keyValues.size() });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", keyValues.size() ));
     
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", keyValues.size() });
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", keyValues.size() ));
     
-    vm4.invoke(WANTestBase.class, "printEventListenerMap", new Object[]{});
-    vm5.invoke(WANTestBase.class, "printEventListenerMap", new Object[]{});
+    vm4.invoke(() -> WANTestBase.printEventListenerMap());
+    vm5.invoke(() -> WANTestBase.printEventListenerMap());
     
-    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", keyValues });
+    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", keyValues ));
   }
   
   /**
    * Test validates whether the listener attached receives all the events.
    */
   public void testGatewaySenderEventListenerInvocation() {
-    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, "createSenderWithListener", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, false, true});
-    vm5.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, false, true});
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", 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.createSenderWithListener( "ln", 2,
+        false, 100, 10, false, false, null, false, true));
+    vm5.invoke(() -> WANTestBase.createSenderWithListener( "ln", 2,
+        false, 100, 10, false, false, null, false, true));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1000; i++) {
       keyValues.put(i, i);
     }
 
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
 
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", keyValues.size() });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", keyValues.size() ));
     
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", keyValues.size() });
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", keyValues.size() ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 0 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 0 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 0 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 0 ));
     
-    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", keyValues });
+    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", keyValues ));
   }
 
   /**
@@ -161,40 +159,38 @@ public void testGatewaySenderEventListenerInvocation() {
    * When there are 2 listeners attcahed to the GatewaySender.
    */
   public void testGatewaySender2EventListenerInvocation() {
-    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, "createSenderWithListener", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, true});
-    vm5.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, true});
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", 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.createSenderWithListener( "ln", 2,
+        false, 100, 10, false, false, null, true, true));
+    vm5.invoke(() -> WANTestBase.createSenderWithListener( "ln", 2,
+        false, 100, 10, false, false, null, true, true));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1000; i++) {
@@ -202,15 +198,15 @@ public void testGatewaySender2EventListenerInvocation() {
     }
 
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 0 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 0 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 0 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 0 ));
     
-    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener2", new Object[] {"ln", keyValues });
+    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener2("ln", keyValues ));
   }
   
   /**
@@ -218,22 +214,18 @@ public void testGatewaySender2EventListenerInvocation() {
    * pool should not be created.
    */
   public void testGatewaySenderEventListenerPoolImpl() {
-    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 });
+    vm4.invoke(() -> WANTestBase.createCache(lnPort ));
 
-    vm4.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, false, false });
+    vm4.invoke(() -> WANTestBase.createSenderWithListener( "ln", 2,
+        false, 100, 10, false, false, null, false, false ));
     
-    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateNoPoolCreation", new Object[] {"ln" });
+    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateNoPoolCreation("ln" ));
   }
   
   // Test start/stop/resume on listener invocation
@@ -241,59 +233,59 @@ public void testGatewaySenderEventListenerPoolImpl() {
   public void __testGatewaySenderEventListener_GatewayOperations() {
 
     int mPort = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
-    vm4.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
-    vm5.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
-    vm6.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
-    vm7.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
+    vm4.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort ));
+    vm5.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort ));
+    vm6.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort ));
+    vm7.invoke(() -> WANTestBase.createCacheWithoutLocator(mPort ));
 
-    vm4.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, false, true});
+    vm4.invoke(() -> WANTestBase.createSenderWithListener( "ln", 2,
+        false, 100, 10, false, false, null, false, true));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
     final Map initialKeyValues = new HashMap();
     for(int i=0; i< 1000; i++) {
       initialKeyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      initialKeyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      initialKeyValues ));
 
-    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", initialKeyValues });
+    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", initialKeyValues ));
     
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
     
     final Map keyValues = new HashMap();
     for(int i=1000; i< 2000; i++) {
       keyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
     
-    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", initialKeyValues });
+    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", initialKeyValues ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
     final Map finalKeyValues = new HashMap();
     for(int i=2000; i< 3000; i++) {
       finalKeyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      finalKeyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      finalKeyValues ));
     
     finalKeyValues.putAll(initialKeyValues);
-    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", finalKeyValues });
+    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", finalKeyValues ));
     
   }
     
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index b306c22974a6..c824eb6d78da 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -559,24 +559,22 @@ public void testDestroySerialGatewaySenderExceptionScenario() {
 
   
   public void testGatewaySenderNotRegisteredAsCacheServer() {
-    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 });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
 
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, true, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, true, null, true ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     SerializableRunnable check = new SerializableRunnable("assert no cache servers") {
       public void run() {
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index af82aefae598..d2406969c041 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -60,79 +60,76 @@ public void setUp() throws Exception {
   
   
   public void testPrimarySecondaryQueueDrainInOrder_RR() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
-        new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] {nyPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] {nyPort });
+    vm2.invoke(() -> WANTestBase.createCache(nyPort ));
+    vm3.invoke(() -> WANTestBase.createCache(nyPort ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm2.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver2( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver2( 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, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY });
+    vm4.invoke(() -> WANTestBase.createSenderWithMultipleDispatchers( "ln", 2,
+        false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createSenderWithMultipleDispatchers( "ln", 2,
+        false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", false});
-    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", false});
+    vm4.invoke(() -> WANTestBase.addQueueListener( "ln", false));
+    vm5.invoke(() -> WANTestBase.addQueueListener( "ln", false));
     
-    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {getTestMethodName() + "_RR"});
-    vm3.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {getTestMethodName() + "_RR"});
+    vm2.invoke(() -> WANTestBase.addListenerOnRegion(getTestMethodName() + "_RR"));
+    vm3.invoke(() -> WANTestBase.addListenerOnRegion(getTestMethodName() + "_RR"));
 
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln"));
     
-    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-      1000 });
+    vm6.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+      1000 ));
     Wait.pause(5000);
-    HashMap primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
-    HashMap secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
+    HashMap primarySenderUpdates = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue());
+    HashMap secondarySenderUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
     assertEquals(primarySenderUpdates, secondarySenderUpdates);
     
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln"));
     Wait.pause(2000);
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln"));
     Wait.pause(2000);
     // We should wait till primarySenderUpdates and secondarySenderUpdates become same
     // If in 300000ms they don't then throw error.
-    primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
-    secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
+    primarySenderUpdates = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue());
+    secondarySenderUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
     
-    vm5.invoke(WANTestBase.class,
-        "checkQueueOnSecondary", new Object[] { primarySenderUpdates });
+    vm5.invoke(() -> WANTestBase.checkQueueOnSecondary( primarySenderUpdates ));
 //    assertEquals(primarySenderUpdates, secondarySenderUpdates);
     
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln"));
     Wait.pause(5000);
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 1000 });
-    primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
-    HashMap receiverUpdates = (HashMap)vm2.invoke(WANTestBase.class, "checkQueue");
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 1000 ));
+    primarySenderUpdates = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue());
+    HashMap receiverUpdates = (HashMap)vm2.invoke(() -> WANTestBase.checkQueue());
     
     List destroyList = (List)primarySenderUpdates.get("Destroy");
     List createList = (List)receiverUpdates.get("Create");
@@ -144,74 +141,71 @@ public void testPrimarySecondaryQueueDrainInOrder_RR() throws Exception {
     Wait.pause(5000);
     // We expect that after this much time secondary would have got batchremoval message
     // removing all the keys.
-    secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
+    secondarySenderUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
     assertEquals(secondarySenderUpdates.get("Destroy"), receiverUpdates.get("Create"));
   }
   
   public void testPrimarySecondaryQueueDrainInOrder_PR() 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 ));
 
-    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() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
   
-    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {getTestMethodName() + "_PR"});
-    vm3.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {getTestMethodName() + "_PR"});
+    vm2.invoke(() -> WANTestBase.addListenerOnRegion(getTestMethodName() + "_PR"));
+    vm3.invoke(() -> WANTestBase.addListenerOnRegion(getTestMethodName() + "_PR"));
   
-    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, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true,1, OrderPolicy.KEY });
+    vm4.invoke(() -> WANTestBase.createSenderWithMultipleDispatchers( "ln", 2,
+        false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createSenderWithMultipleDispatchers( "ln", 2,
+        false, 100, 10, false, false, null, true,1, OrderPolicy.KEY ));
 
-    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.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.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", false});
-    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", false});
+    vm4.invoke(() -> WANTestBase.addQueueListener( "ln", false));
+    vm5.invoke(() -> WANTestBase.addQueueListener( "ln", false));
 
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln"));
     
-    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-      1000 });
+    vm6.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+      1000 ));
     Wait.pause(5000);
-    HashMap primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
-    HashMap secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
-    vm5.invoke(WANTestBase.class,
-        "checkQueueOnSecondary", new Object[] { primarySenderUpdates });
+    HashMap primarySenderUpdates = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue());
+    HashMap secondarySenderUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
+    vm5.invoke(() -> WANTestBase.checkQueueOnSecondary( primarySenderUpdates ));
     
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln"));
     Wait.pause(4000);
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln"));
     Wait.pause(15000);
-    primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
-    secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
+    primarySenderUpdates = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue());
+    secondarySenderUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
     assertEquals(primarySenderUpdates, secondarySenderUpdates);
     
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln"));
     Wait.pause(5000);
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_PR", 1000 ));
   }
   
   /**
@@ -219,11 +213,9 @@ public void testPrimarySecondaryQueueDrainInOrder_PR() throws Exception {
    * when persistence of sender is enabled. 
    */
   public void test_ValidateSerialGatewaySenderQueueAttributes_1() {
-    Integer localLocPort = (Integer) vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer localLocPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    Integer remoteLocPort = (Integer) vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, localLocPort });
+    Integer remoteLocPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort ));
 
     WANTestBase test = new WANTestBase(getTestMethodName());
     Properties props = new Properties();
@@ -285,11 +277,9 @@ public void test_ValidateSerialGatewaySenderQueueAttributes_1() {
    * when persistence of sender is not enabled. 
    */
   public void test_ValidateSerialGatewaySenderQueueAttributes_2() {
-    Integer localLocPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer localLocPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     
-    Integer remoteLocPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, localLocPort });
+    Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort ));
     
     WANTestBase test = new WANTestBase(getTestMethodName());
     Properties props = new Properties();
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
index bd60ad637a67..591d3d5e7b17 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -45,48 +45,46 @@ public void setUp() throws Exception {
    */
   public void testReplicatedRegionWithGatewaySenderPersistenceEnabled() {
 
-    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, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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, true, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, true, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
   }
 
@@ -96,48 +94,40 @@ public void testReplicatedRegionWithGatewaySenderPersistenceEnabled() {
    */
   public void testPersistentReplicatedRegionWithGatewaySender() {
 
-    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 });
-
-    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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 ));
+
+    vm2.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
   }
 
@@ -147,48 +137,40 @@ public void testPersistentReplicatedRegionWithGatewaySender() {
    * 
    */
   public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled() {
-    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, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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, true, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, true, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
   }
 
@@ -197,88 +179,83 @@ public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled()
    * if the remote site receives all the event.
    */
   public void testReplicatedRegionWithGatewaySenderPersistenceEnabled_Restart() {
-    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 });
-
-    String firstDStore = (String)vm4.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-            100, 10, false, true, null, null, true });
-    String secondDStore = (String)vm5.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-            100, 10, false, true, null, null, true });
+    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 ));
+
+    String firstDStore = (String)vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+            100, 10, false, true, null, null, true ));
+    String secondDStore = (String)vm5.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+            100, 10, false, true, null, null, true ));
 
     LogWriterUtils.getLogWriter().info("The first ds is " + firstDStore);
     LogWriterUtils.getLogWriter().info("The first ds is " + secondDStore);
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
 
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
 
     // verify if the queue has all the events
-    // vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000
-    // });
-    // vm5.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000
-    // });
+    // vm4.invoke(() -> WANTestBase.checkQueueSize( "ln", 1000
+    // ));
+    // vm5.invoke(() -> WANTestBase.checkQueueSize( "ln", 1000
+    // ));
     //
-    // vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-    // testName + "_RR", 0 });
-    // vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-    // testName + "_RR", 0 });
+    // vm2.invoke(() -> WANTestBase.validateRegionSize(
+    // testName + "_RR", 0 ));
+    // vm3.invoke(() -> WANTestBase.validateRegionSize(
+    // testName + "_RR", 0 ));
 
     // kill the vm
-    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 sender. ");
     // restart the vm
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] {
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANTestBase.createSenderWithDiskStore(
         "ln", 2, false, 100, 10, false, true, null,
-        firstDStore, true });
+        firstDStore, true ));
     LogWriterUtils.getLogWriter().info("Creted the sender.... in vm4 ");
-    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] {
+    vm5.invoke(() -> WANTestBase.createSenderWithDiskStore(
         "ln", 2, false, 100, 10, false, true, null,
-        secondDStore, true });
+        secondDStore, true ));
     LogWriterUtils.getLogWriter().info("Creted the sender.... in vm5 ");
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender",
-        new Object[] { "ln" });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Started the sender in vm 4");
 
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Started the sender in vm 5");
     try {
       inv1.join();
@@ -288,10 +265,10 @@ public void testReplicatedRegionWithGatewaySenderPersistenceEnabled_Restart() {
 
     Wait.pause(5000);
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
   }
 
@@ -302,83 +279,76 @@ public void testReplicatedRegionWithGatewaySenderPersistenceEnabled_Restart() {
    * 
    */
   public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled_Restart() {
-    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 });
-
-    String firstDStore = (String)vm4.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-            100, 10, false, true, null, null, true });
-    String secondDStore = (String)vm5.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-            100, 10, false, true, null, null, true  });
+    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 ));
+
+    String firstDStore = (String)vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+            100, 10, false, true, null, null, true ));
+    String secondDStore = (String)vm5.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+            100, 10, false, true, null, null, true  ));
 
     LogWriterUtils.getLogWriter().info("The first ds is " + firstDStore);
     LogWriterUtils.getLogWriter().info("The first ds is " + secondDStore);
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
 
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
 
     // kill the vm
-    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
-    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm4.invoke(() -> WANTestBase.killSender());
+    vm5.invoke(() -> WANTestBase.killSender());
 
     LogWriterUtils.getLogWriter().info("Killed the sender. ");
     // restart the vm
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
     
-    vm4.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-      100, 10, false, true, null, firstDStore, true  });
+    vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+      100, 10, false, true, null, firstDStore, true  ));
     LogWriterUtils.getLogWriter().info("Created the sender.... in vm4 ");
-    vm5.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-            100, 10, false, true, null, secondDStore, true  });
+    vm5.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+            100, 10, false, true, null, secondDStore, true  ));
     LogWriterUtils.getLogWriter().info("Created the sender.... in vm5 ");
     
-    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm5.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
   
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender",
-        new Object[] { "ln" });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Started the sender in vm 4");
 
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Started the sender in vm 5");
     try {
       inv1.join();
@@ -388,10 +358,10 @@ public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled_Re
 
     Wait.pause(5000);
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
   }
   
@@ -402,87 +372,83 @@ public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled_Re
    * 
    */
   public void testPersistentReplicatedRegionWithGatewaySender_Restart() {
-    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 });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    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 ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
 
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
 
     // verify if the queue has all the events
-    // vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000
-    // });
-    // vm5.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000
-    // });
+    // vm4.invoke(() -> WANTestBase.checkQueueSize( "ln", 1000
+    // ));
+    // vm5.invoke(() -> WANTestBase.checkQueueSize( "ln", 1000
+    // ));
     //
-    // vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-    // testName + "_RR", 0 });
-    // vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-    // testName + "_RR", 0 });
+    // vm2.invoke(() -> WANTestBase.validateRegionSize(
+    // testName + "_RR", 0 ));
+    // vm3.invoke(() -> WANTestBase.validateRegionSize(
+    // testName + "_RR", 0 ));
 
     // kill the vm
-    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
-    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm4.invoke(() -> WANTestBase.killSender());
+    vm5.invoke(() -> WANTestBase.killSender());
 
     LogWriterUtils.getLogWriter().info("Killed the sender. ");
     // restart the vm
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] {
-        "ln", 2, false, 100, 10, false, false, null, true});
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANTestBase.createSender(
+        "ln", 2, false, 100, 10, false, false, null, true));
     LogWriterUtils.getLogWriter().info("Creted the sender.... in vm4 ");
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] {
-        "ln", 2, false, 100, 10, false, false, null, true});
+    vm5.invoke(() -> WANTestBase.createSender(
+        "ln", 2, false, 100, 10, false, false, null, true));
     LogWriterUtils.getLogWriter().info("Creted the sender.... in vm5 ");
     
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Started the sender in vm 4");
 
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Started the sender in vm 5");
     
-    AsyncInvocation inv1 =  vm4.invokeAsync(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
+    AsyncInvocation inv1 =  vm4.invokeAsync(() -> WANTestBase.createPersistentReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
     try {
       inv1.join();
@@ -491,13 +457,13 @@ public void testPersistentReplicatedRegionWithGatewaySender_Restart() {
     }
 
     Wait.pause(5000);
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-      1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+      1000 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
   }
   
@@ -509,83 +475,76 @@ public void testPersistentReplicatedRegionWithGatewaySender_Restart() {
    * In this case put is continuously happening while the vm is down.
    */
   public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled_Restart2() {
-    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 });
-
-    String firstDStore = (String)vm4.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-            100, 10, false, true, null, null, true  });
-    String secondDStore = (String)vm5.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-            100, 10, false, true, null, null, true  });
+    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 ));
+
+    String firstDStore = (String)vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+            100, 10, false, true, null, null, true  ));
+    String secondDStore = (String)vm5.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+            100, 10, false, true, null, null, true  ));
 
     LogWriterUtils.getLogWriter().info("The first ds is " + firstDStore);
     LogWriterUtils.getLogWriter().info("The first ds is " + secondDStore);
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
 
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
 
     // kill the vm
-    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
-    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm4.invoke(() -> WANTestBase.killSender());
+    vm5.invoke(() -> WANTestBase.killSender());
 
     LogWriterUtils.getLogWriter().info("Killed the sender. ");
     // restart the vm
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
     
-    vm4.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-      100, 10, false, true, null, firstDStore, true  });
+    vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+      100, 10, false, true, null, firstDStore, true  ));
     LogWriterUtils.getLogWriter().info("Created the sender.... in vm4 ");
-    vm5.invoke(WANTestBase.class,
-        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
-            100, 10, false, true, null, secondDStore, true  });
+    vm5.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, false,
+            100, 10, false, true, null, secondDStore, true  ));
     LogWriterUtils.getLogWriter().info("Created the sender.... in vm5 ");
     
-    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm5.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
   
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender",
-        new Object[] { "ln" });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Started the sender in vm 4");
 
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     LogWriterUtils.getLogWriter().info("Started the sender in vm 5");
     try {
       inv1.join();
@@ -595,10 +554,10 @@ public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled_Re
 
     Wait.pause(5000);
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
index 4269b76ec583..bd971ce5288e 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
@@ -37,85 +37,79 @@ public void setUp() throws Exception {
   }
   
   public void testReplicatedSerialPropagationLoopBack() 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[] { lnPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    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[] { nyPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm7.invoke(() -> WANTestBase.createCache( nyPort ));
 
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
-        false, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "ny", 1,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny", isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny", isOffHeap() ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
-    
-    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln",
-        false });
-    vm6.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ny",
-        false });
-    
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()});
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny", isOffHeap()});
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANTestBase.startSender( "ny" ));
+    
+    vm4.invoke(() -> WANTestBase.addQueueListener( "ln",
+        false ));
+    vm6.invoke(() -> WANTestBase.addQueueListener( "ny",
+        false ));
+    
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny", isOffHeap()));
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1; i++) {
       keyValues.put(i, i);
     }
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
     
     keyValues.clear();
     for(int i=1; i< 2; i++) {
       keyValues.put(i, i);
     }
-    vm6.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 2 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 2 });
-    
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 2 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 2 });
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 2 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 2 });
+    vm6.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
+    
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 2 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 2 ));
+    
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 2 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 2 ));
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 2 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 2 ));
   
   
     Wait.pause(5000);
-    vm4.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ln", 0 });
-    vm6.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ny", 0 });
-    
-    Map queueMap1 = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
-    Map queueMap2 = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
+    vm4.invoke(() -> WANTestBase.verifyQueueSize( "ln", 0 ));
+    vm6.invoke(() -> WANTestBase.verifyQueueSize( "ny", 0 ));
+    
+    Map queueMap1 = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue());
+    Map queueMap2 = (HashMap)vm6.invoke(() -> WANTestBase.checkQueue());
 
     List createList1 = (List)queueMap1.get("Create");
     List updateList1 = (List)queueMap1.get("Update");
@@ -131,101 +125,92 @@ public void testReplicatedSerialPropagationLoopBack() throws Exception {
   
   
   public void testReplicatedSerialPropagationLoopBack3SitesLoop() 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 tkPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
 
     
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    vm3.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    vm4.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm5.invoke(() -> WANTestBase.createReceiver( tkPort ));
     
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( nyPort ));
     // using vm5 for sender in ds 3. cache is already created.
     
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 3,
-        false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk", 1,
-      false, 100, 10, false, false, null, true });
+    vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ny", 3,
+        false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "tk", 1,
+      false, 100, 10, false, false, null, true ));
 
     
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()});
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny", isOffHeap()});
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "tk", isOffHeap()});
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()));
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny", isOffHeap()));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "tk", isOffHeap()));
 
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk" });
-    
-    vm6.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln",
-      false });
-    vm7.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ny",
-      false });
-    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "tk",
-      false });
+    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ny" ));
+    vm5.invoke(() -> WANTestBase.startSender( "tk" ));
+    
+    vm6.invoke(() -> WANTestBase.addQueueListener( "ln",
+      false ));
+    vm7.invoke(() -> WANTestBase.addQueueListener( "ny",
+      false ));
+    vm5.invoke(() -> WANTestBase.addQueueListener( "tk",
+      false ));
   
     
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny", isOffHeap() });
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny", isOffHeap() ));
 
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1; i++) {
       keyValues.put(i, i);
     }
-    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm3.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
     
     keyValues.clear();
     for(int i=1; i< 2; i++) {
       keyValues.put(i, i);
     }
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
     
     keyValues.clear();
     for(int i=2; i< 3; i++) {
       keyValues.put(i, i);
     }
-    vm5.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm5.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
     
         
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 3 });
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 3 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 3 });
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 3 ));
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 3 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 3 ));
     
     
     Wait.pause(5000);
-    vm6.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ln", 0 });
-    vm7.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ny", 0 });
-    vm5.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "tk", 0 });
+    vm6.invoke(() -> WANTestBase.verifyQueueSize( "ln", 0 ));
+    vm7.invoke(() -> WANTestBase.verifyQueueSize( "ny", 0 ));
+    vm5.invoke(() -> WANTestBase.verifyQueueSize( "tk", 0 ));
     
     
     
-    Map queueMap1 = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
-    Map queueMap2 = (HashMap)vm7.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
-    Map queueMap3 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
+    Map queueMap1 = (HashMap)vm6.invoke(() -> WANTestBase.checkQueue());
+    Map queueMap2 = (HashMap)vm7.invoke(() -> WANTestBase.checkQueue());
+    Map queueMap3 = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
     
     List createList1 = (List)queueMap1.get("Create");
     List updateList1 = (List)queueMap1.get("Update");
@@ -245,129 +230,114 @@ public void testReplicatedSerialPropagationLoopBack3SitesLoop() throws Exception
   
   
   public void testReplicatedSerialPropagationLoopBack3SitesNtoNPutInAllDS() 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 tkPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
 
     
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    vm3.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    vm4.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm5.invoke(() -> WANTestBase.createReceiver( tkPort ));
     
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( nyPort ));
     // using vm5 for sender in ds 3. cache is already created.
     
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-        false, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 3,
-        false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk1", 1,
-      false, 100, 10, false, false, null, true });
+    vm6.invoke(() -> WANTestBase.createSender( "ln1", 2,
+        false, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ny1", 3,
+        false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "tk1", 1,
+      false, 100, 10, false, false, null, true ));
 
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
-      false, 100, 10, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny2", 1,
-      false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk2", 2,
-    false, 100, 10, false, false, null, true });
+    vm6.invoke(() -> WANTestBase.createSender( "ln2", 3,
+      false, 100, 10, false, false, null, true ));
+    vm7.invoke(() -> WANTestBase.createSender( "ny2", 1,
+      false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "tk2", 2,
+    false, 100, 10, false, false, null, true ));
 
     
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap()});
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny1,ny2", isOffHeap()});
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "tk1,tk2", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap()));
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny1,ny2", isOffHeap()));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "tk1,tk2", isOffHeap() ));
 
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk1" });
-    
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny2" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk2" });
-    
-    
-    vm6.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln1",
-      false });
-    vm7.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ny1",
-      false });
-    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "tk1",
-      false });
-    vm6.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "ln2",
-      false });
-    vm7.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "ny2",
-      false });
-    vm5.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "tk2",
-      false });
+    vm6.invoke(() -> WANTestBase.startSender( "ln1" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ny1" ));
+    vm5.invoke(() -> WANTestBase.startSender( "tk1" ));
+    
+    vm6.invoke(() -> WANTestBase.startSender( "ln2" ));
+    vm7.invoke(() -> WANTestBase.startSender( "ny2" ));
+    vm5.invoke(() -> WANTestBase.startSender( "tk2" ));
+    
+    
+    vm6.invoke(() -> WANTestBase.addQueueListener( "ln1",
+      false ));
+    vm7.invoke(() -> WANTestBase.addQueueListener( "ny1",
+      false ));
+    vm5.invoke(() -> WANTestBase.addQueueListener( "tk1",
+      false ));
+    vm6.invoke(() -> WANTestBase.addSecondQueueListener( "ln2",
+      false ));
+    vm7.invoke(() -> WANTestBase.addSecondQueueListener( "ny2",
+      false ));
+    vm5.invoke(() -> WANTestBase.addSecondQueueListener( "tk2",
+      false ));
   
     
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny1,ny2", isOffHeap() });
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny1,ny2", isOffHeap() ));
     
     final Map keyValues = new HashMap();
     for(int i=0; i< 1; i++) {
       keyValues.put(i, i);
     }
-    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm3.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
     
     keyValues.clear();
     for(int i=1; i< 2; i++) {
       keyValues.put(i, i);
     }
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
     
     keyValues.clear();
     for(int i=2; i< 3; i++) {
       
       keyValues.put(i, i);
     }
-    vm5.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm5.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
     
     Wait.pause(2000);
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 3 });
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 3 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 3 });
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 3 ));
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 3 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 3 ));
     
     Wait.pause(5000);
-    vm6.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ln1", 0 });
-    vm7.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ny1", 0 });
-    vm5.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "tk1", 0 });
-    vm6.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ln2", 0 });
-    vm7.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ny2", 0 });
-    vm5.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "tk2", 0 });
-    
-    
-    Map queueMap1 = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
-    Map queueMap2 = (HashMap)vm7.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
-    Map queueMap3 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
-    Map queueMap4 = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue2",
-        new Object[] {});
-    Map queueMap5 = (HashMap)vm7.invoke(WANTestBase.class, "checkQueue2",
-        new Object[] {});
-    Map queueMap6 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue2",
-        new Object[] {});
+    vm6.invoke(() -> WANTestBase.verifyQueueSize( "ln1", 0 ));
+    vm7.invoke(() -> WANTestBase.verifyQueueSize( "ny1", 0 ));
+    vm5.invoke(() -> WANTestBase.verifyQueueSize( "tk1", 0 ));
+    vm6.invoke(() -> WANTestBase.verifyQueueSize( "ln2", 0 ));
+    vm7.invoke(() -> WANTestBase.verifyQueueSize( "ny2", 0 ));
+    vm5.invoke(() -> WANTestBase.verifyQueueSize( "tk2", 0 ));
+    
+    
+    Map queueMap1 = (HashMap)vm6.invoke(() -> WANTestBase.checkQueue());
+    Map queueMap2 = (HashMap)vm7.invoke(() -> WANTestBase.checkQueue());
+    Map queueMap3 = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
+    Map queueMap4 = (HashMap)vm6.invoke(() -> WANTestBase.checkQueue2());
+    Map queueMap5 = (HashMap)vm7.invoke(() -> WANTestBase.checkQueue2());
+    Map queueMap6 = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue2());
     
     List createList1 = (List)queueMap1.get("Create");
     List updateList1 = (List)queueMap1.get("Update");
@@ -403,106 +373,91 @@ public void testReplicatedSerialPropagationLoopBack3SitesNtoNPutInAllDS() throws
 
   
   public void testReplicatedSerialPropagationLoopBack3SitesNtoNPutFromOneDS() 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 tkPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
 
     
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    vm3.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    vm4.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm5.invoke(() -> WANTestBase.createReceiver( tkPort ));
     
     
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
-        false, 100, 10, false, false, null, true });
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
-      false, 100, 10, false, false, null, true });
+    vm3.invoke(() -> WANTestBase.createSender( "ln1", 2,
+        false, 100, 10, false, false, null, true ));
+    vm3.invoke(() -> WANTestBase.createSender( "ln2", 3,
+      false, 100, 10, false, false, null, true ));
     
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 3,
-        false, 100, 10, false, false, null, true });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny2", 1,
-      false, 100, 10, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ny1", 3,
+        false, 100, 10, false, false, null, true ));
+    vm4.invoke(() -> WANTestBase.createSender( "ny2", 1,
+      false, 100, 10, false, false, null, true ));
     
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk1", 1,
-      false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk2", 2,
-    false, 100, 10, false, false, null, true });
+    vm5.invoke(() -> WANTestBase.createSender( "tk1", 1,
+      false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "tk2", 2,
+    false, 100, 10, false, false, null, true ));
 
     
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny1,ny2", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "tk1,tk2", isOffHeap() });
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny1,ny2", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "tk1,tk2", isOffHeap() ));
 
     
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk1" });
-    
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny2" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk2" });
-    
-    
-    vm3.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln1",
-      false });
-    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ny1",
-      false });
-    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "tk1",
-      false });
-    vm3.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "ln2",
-      false });
-    vm4.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "ny2",
-      false });
-    vm5.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "tk2",
-      false });
+    vm3.invoke(() -> WANTestBase.startSender( "ln1" ));
+    vm4.invoke(() -> WANTestBase.startSender( "ny1" ));
+    vm5.invoke(() -> WANTestBase.startSender( "tk1" ));
+    
+    vm3.invoke(() -> WANTestBase.startSender( "ln2" ));
+    vm4.invoke(() -> WANTestBase.startSender( "ny2" ));
+    vm5.invoke(() -> WANTestBase.startSender( "tk2" ));
+    
+    
+    vm3.invoke(() -> WANTestBase.addQueueListener( "ln1",
+      false ));
+    vm4.invoke(() -> WANTestBase.addQueueListener( "ny1",
+      false ));
+    vm5.invoke(() -> WANTestBase.addQueueListener( "tk1",
+      false ));
+    vm3.invoke(() -> WANTestBase.addSecondQueueListener( "ln2",
+      false ));
+    vm4.invoke(() -> WANTestBase.addSecondQueueListener( "ny2",
+      false ));
+    vm5.invoke(() -> WANTestBase.addSecondQueueListener( "tk2",
+      false ));
   
     final Map keyValues = new HashMap();
     for(int i=0; i< 1; i++) {
       keyValues.put(i, i);
     }
-    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
-      keyValues });
+    vm3.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
+      keyValues ));
     
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1 });
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1 });
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1 });
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1 ));
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1 ));
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1 ));
     
     Wait.pause(5000);
-    vm3.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ln1", 0 });
-    vm4.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ny1", 0 });
-    vm5.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "tk1", 0 });
-    vm3.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ln2", 0 });
-    vm4.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "ny2", 0 });
-    vm5.invoke(WANTestBase.class, "verifyQueueSize",
-        new Object[] { "tk2", 0 });
-    
-    
-    Map queueMap1 = (HashMap)vm3.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
-    Map queueMap2 = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
-    Map queueMap3 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue",
-        new Object[] {});
-    Map queueMap4 = (HashMap)vm3.invoke(WANTestBase.class, "checkQueue2",
-        new Object[] {});
-    Map queueMap5 = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue2",
-        new Object[] {});
-    Map queueMap6 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue2",
-        new Object[] {});
+    vm3.invoke(() -> WANTestBase.verifyQueueSize( "ln1", 0 ));
+    vm4.invoke(() -> WANTestBase.verifyQueueSize( "ny1", 0 ));
+    vm5.invoke(() -> WANTestBase.verifyQueueSize( "tk1", 0 ));
+    vm3.invoke(() -> WANTestBase.verifyQueueSize( "ln2", 0 ));
+    vm4.invoke(() -> WANTestBase.verifyQueueSize( "ny2", 0 ));
+    vm5.invoke(() -> WANTestBase.verifyQueueSize( "tk2", 0 ));
+    
+    
+    Map queueMap1 = (HashMap)vm3.invoke(() -> WANTestBase.checkQueue());
+    Map queueMap2 = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue());
+    Map queueMap3 = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
+    Map queueMap4 = (HashMap)vm3.invoke(() -> WANTestBase.checkQueue2());
+    Map queueMap5 = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue2());
+    Map queueMap6 = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue2());
     
     List createList1 = (List)queueMap1.get("Create");
     List updateList1 = (List)queueMap1.get("Update");
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
index 56e8d8279f3b..91234c9fc53b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
@@ -50,122 +50,114 @@ public void setUp() throws Exception {
   // this test is disabled due to a high rate of failure in unit test runs
   // see ticket #52190
   public void disabledtestReplicatedSerialPropagation_withoutRemoteLocator() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    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 ));
 
     //keep the batch size high enough to reduce the number of exceptions in the log
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 400, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 400, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()   });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()    });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 400, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()    ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-      1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+      1000 ));
 
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
   
-    vm2.invoke(WANTestBase.class, "createReceiver2",
-        new Object[] {nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver2",
-        new Object[] {nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver2(nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver2(nyPort ));
     
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   } 
 
   
   public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
     
-    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 ));
 
     //keep the batch size high enough to reduce the number of exceptions in the log
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 400, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 400, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 400, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
     
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());
 
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
-      "ln", false });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
-      "ln", false });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException(
+      "ln", false ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException(
+      "ln", false ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-      1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+      1000 ));
     
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
   
-    vm2.invoke(WANTestBase.class, "createReceiver2",
-        new Object[] {nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver2",
-        new Object[] {nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver2(nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver2(nyPort ));
     
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
   
   /**
@@ -175,207 +167,201 @@ public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception
    */
   public void testReplicatedSerialPropagationWithoutRemoteSite_defect46595()
       throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    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 ));
 
     // reduce the batch-size so maximum number of batches will be sent
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 5, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 5, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 5, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 5, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
 
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());
     IgnoredException.addIgnoredException(IOException.class.getName());
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
-      "ln", false });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
-      "ln", false });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException(
+      "ln", false ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException(
+      "ln", false ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        10000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        10000 ));
 
     // pause for some time before starting up the remote site
     Wait.pause(10000);
 
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
     
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap()  ));
   
-    vm2.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver2( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver2( nyPort ));
 
 
 
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
 
   }
 
   public void testReplicatedSerialPropagation() 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 });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()   });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()   });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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 ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
   
   public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() 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 });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()   });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", 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,
+        false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
     
     //---------close local site and build again-----------------------------------------
-    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( ));
     
     Integer regionSize = 
-      (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_RR" });
+      (Integer) vm2.invoke(() -> WANTestBase.getRegionSize(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 });
-    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.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.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
     
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap()  ));
     
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
     IgnoredException.addIgnoredException(EntryExistsException.class.getName());
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-      1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+      1000 ));
     //----------------------------------------------------------------------------------
 
     //verify remote site receives all the events
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
 
   /**
@@ -386,69 +372,67 @@ public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throw
    * @throws Exception
    */
   public void testReplicatedSerialPropagationWithLocalRegionDestroy() 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 ));
 
     //these are part of 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 ));
 
     //these are part of 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 ));
 
     //senders are created on local site
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 20, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 20, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 20, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 20, false, false, null, true ));
 
     //create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
     //create another RR (RR_2) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap()  ));
     
     //start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
 
     //create another RR (RR_2) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
     
     //start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1", 1000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
     //do puts in RR_2 in main thread
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_2", 500 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_2", 500 ));
     //destroy RR_2 after above puts are complete
-    vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_2"});
+    vm4.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_2"));
     
     try {
       inv1.join();
@@ -458,11 +442,11 @@ public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Excep
     }
     //sleep for some time to let all the events propagate to remote site
     Thread.sleep(20);
-    //vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_2", 500 });
+    //vm4.invoke(() -> WANTestBase.verifyQueueSize( "ln", 0 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_2", 500 ));
   }
 
   /**
@@ -473,54 +457,52 @@ public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Excep
    * @throws Exception
    */
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy() 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 ));
 
     //these are part of 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 ));
 
     //these are part of 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 ));
 
     //senders are created on local site
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 500, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 500, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 500, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 500, false, false, null, true ));
 
     //create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
     //start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
 
     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[] { getTestMethodName() + "_RR_1", 1000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
     //destroy RR_1 in remote site
-    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_1"});
+    vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_1"));
     
     try {
       inv1.join();
@@ -530,13 +512,13 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exce
     }
 
     //verify that all is well in local site. All the events should be present in local region
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 1000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 1000 ));
     //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 
     //more in depth validations.
-    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty", new Object[] {"ln" });
+    vm4.invoke(() -> WANTestBase.verifyRegionQueueNotEmpty("ln" ));
   }
   
   /**
@@ -547,74 +529,72 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exce
    * @throws Exception
    */
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() 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 ));
 
     //these are part of 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 ));
 
     //these are part of 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 ));
 
     //senders are created on local site
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 200, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 200, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 200, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 200, false, false, null, true ));
 
     //create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
     //create another RR (RR_2) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap()  ));
     
     //start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
 
     //create another RR (RR_2) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
     //destroy RR_2 on remote site in the middle
-    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_2"});
+    vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_2"));
     
     //expected exceptions in the logs
     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[] { getTestMethodName() + "_RR_2", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_2", 1000 ));
     
     //start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1", 1000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
    
     try {
       inv1.join();
@@ -624,8 +604,8 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() throws Exc
     }
     //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[] {
-        getTestMethodName() + "_RR_1", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 1000 ));
 
   }
   
@@ -635,79 +615,75 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() throws Exc
    */
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
       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 ));
     // these are part of 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 ));
 
 
     // these are part of 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 ));
 
     // senders are created on local site
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 200, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 200, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 200, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 200, false, false, null, true ));
 
     // create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
     // create another RR (RR_2) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap()  ));
     
     // start the senders on local site
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
-    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
+    vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
     
     // start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     // create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
 
     // create another RR (RR_2) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  ));
 
     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[] { getTestMethodName() + "_RR_1", 1000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
     // start puts in RR_2 in another thread
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_2", 1000 });
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_2", 1000 ));
     // destroy RR_2 on remote site in the middle
-    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName()
-        + "_RR_2" });
+    vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName()
+        + "_RR_2" ));
 
     try {
       inv1.join();
@@ -720,8 +696,8 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
     // in it
     // in local site
     try {
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          getTestMethodName() + "_RR_1", 1000 });
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR_1", 1000 ));
     } finally {
       System.setProperty(
           "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
@@ -750,53 +726,51 @@ public void run2() throws CacheException {
    * @throws Exception
    */
   public void testReplicatedSerialPropagationWithRemoteReceiverStopped() 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 ));
 
     //these are part of 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 ));
 
     //these are part of 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 ));
 
     //senders are created on local site. Batch size is kept to a high (170) so 
     //there will be less number of exceptions (occur during dispatchBatch) in the log 
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 350, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 350, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 350, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 350, false, false, null, true ));
 
     //create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
-    //vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-    //    testName + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
+    //vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+    //    testName + "_RR_1", null, isOffHeap()  ));
 
     //start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
 
     //start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1", 500 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 500 ));
     //close cache in remote site. This will automatically kill the remote receivers.
-    vm2.invoke(WANTestBase.class, "closeCache");
-    //vm3.invoke(WANTestBase.class, "closeCache");
+    vm2.invoke(() -> WANTestBase.closeCache());
+    //vm3.invoke(() -> WANTestBase.closeCache());
     
     try {
       inv1.join();
@@ -806,53 +780,50 @@ public void testReplicatedSerialPropagationWithRemoteReceiverStopped() throws Ex
     }
 
     //verify that all is well in local site
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 500 });
-    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty", new Object[] {"ln" });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 500 ));
+    vm4.invoke(() -> WANTestBase.verifyRegionQueueNotEmpty("ln" ));
   }
   
   public void testReplicatedSerialPropagationWithRemoteReceiverRestarted()
       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 ));
 
     // these are part of remote site
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     // these are part of local site
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
     // the log
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 350, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 350, false, false, null, true ));
 
     // create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
     // start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
     // create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
-      "ln", false });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException(
+      "ln", false ));
     
     // start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_1", 8000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 8000 ));
     // close cache in remote site. This will automatically kill the remote
     // receivers.
     Wait.pause(2000);
-    vm2.invoke(WANTestBase.class, "closeCache");
-    // vm3.invoke(WANTestBase.class, "closeCache");
+    vm2.invoke(() -> WANTestBase.closeCache());
+    // vm3.invoke(() -> WANTestBase.closeCache());
 
     try {
       inv1.join();
@@ -861,73 +832,67 @@ public void testReplicatedSerialPropagationWithRemoteReceiverRestarted()
       fail();
     }
     
-    vm4.invoke(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_1", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
 
     // verify that all is well in local site
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 8000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 8000 ));
 
 //    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
 //        new Object[] { "ln" });
 
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
 
-    vm2.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
-        new Object[] { 1, 1 });
+    vm2.invoke(() -> WANTestBase.checkMinimumGatewayReceiverStats( 1, 1 ));
   }
 
   public void testReplicatedSerialPropagationWithRemoteReceiverRestarted_SenderReceiverPersistent()
       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 ));
 
     // these are part of remote site
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     // these are part of local site
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
     // the log
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 350, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 350, false, true, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 350, false, true, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 350, false, true, null, true ));
 
     // create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
     // start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     // create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
-      "ln", false });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException(
+      "ln", false ));
     
     // start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_1", 8000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 8000 ));
     // close cache in remote site. This will automatically kill the remote
     // receivers.
     Wait.pause(2000);
-    vm2.invoke(WANTestBase.class, "closeCache");
-    // vm3.invoke(WANTestBase.class, "closeCache");
+    vm2.invoke(() -> WANTestBase.closeCache());
+    // vm3.invoke(() -> WANTestBase.closeCache());
 
     try {
       inv1.join();
@@ -937,69 +902,63 @@ public void testReplicatedSerialPropagationWithRemoteReceiverRestarted_SenderRec
     }
 
     // verify that all is well in local site
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 8000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 8000 ));
 
-    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
-        new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.verifyRegionQueueNotEmpty( "ln" ));
 
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createPersistentReplicatedRegion( getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
 
-    vm2.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
-        new Object[] { 1, 1 });
+    vm2.invoke(() -> WANTestBase.checkMinimumGatewayReceiverStats( 1, 1 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 8000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 8000 ));
   }
 
   public void testReplicatedSerialPropagationWithRemoteSiteBouncedBack_ReceiverPersistent()
       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 ));
 
     // these are part of remote site
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     // these are part of local site
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
     // the log
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 350, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 350, false, false, null, true ));
 
     // create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
     // start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
     // create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
     
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
-      "ln", false });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException(
+      "ln", false ));
     // start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_1", 8000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 8000 ));
     // close cache in remote site. This will automatically kill the remote
     // receivers.
     Wait.pause(2000);
-    vm1.invoke(WANTestBase.class, "shutdownLocator");
-    vm2.invoke(WANTestBase.class, "closeCache");
-    // vm3.invoke(WANTestBase.class, "closeCache");
+    vm1.invoke(() -> WANTestBase.shutdownLocator());
+    vm2.invoke(() -> WANTestBase.closeCache());
+    // vm3.invoke(() -> WANTestBase.closeCache());
 
     try {
       inv1.join();
@@ -1008,78 +967,71 @@ public void testReplicatedSerialPropagationWithRemoteSiteBouncedBack_ReceiverPer
       fail();
     }
     // Do some extra puts after cache close so that some events are in the queue.
-    vm4.invoke(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_1", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
 
     // verify that all is well in local site
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 8000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 8000 ));
 
-    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
-        new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.verifyRegionQueueNotEmpty( "ln" ));
 
-    vm1.invoke(WANTestBase.class, "bringBackLocatorOnOldPort", new Object[] {
-        2, lnPort, nyPort });
+    vm1.invoke(() -> WANTestBase.bringBackLocatorOnOldPort(
+        2, lnPort, nyPort ));
 
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR_1", 8000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR_1", 8000 ));
     
-    vm2.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
-        new Object[] { 1, 1 });
+    vm2.invoke(() -> WANTestBase.checkMinimumGatewayReceiverStats( 1, 1 ));
   }
 
   public void testReplicatedSerialPropagationWithRemoteSiteBouncedBackWithMultipleRemoteLocators()
       throws Exception {
-    Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort1 = (Integer) vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer nyPort2 = (Integer) vm3.invoke(WANTestBase.class,
-        "createSecondRemoteLocator", new Object[] { 2, nyPort1, lnPort });
+    Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort1 = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer nyPort2 = (Integer) vm3.invoke(() -> WANTestBase.createSecondRemoteLocator( 2, nyPort1, lnPort ));
 
     // these are part of remote site
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort1 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort1 ));
 
     // these are part of local site
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
     // the log
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 350, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 350, false, false, null, true ));
 
     // create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
     // start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
     // create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
-      "ln", false });
+    vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException(
+      "ln", false ));
     // start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_1", 8000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 8000 ));
     // close cache in remote site. This will automatically kill the remote
     // receivers.
     Wait.pause(2000);
-    vm1.invoke(WANTestBase.class, "shutdownLocator");
-    vm2.invoke(WANTestBase.class, "closeCache");
-    // vm3.invoke(WANTestBase.class, "closeCache");
+    vm1.invoke(() -> WANTestBase.shutdownLocator());
+    vm2.invoke(() -> WANTestBase.closeCache());
+    // vm3.invoke(() -> WANTestBase.closeCache());
 
     try {
       inv1.join();
@@ -1087,71 +1039,65 @@ public void testReplicatedSerialPropagationWithRemoteSiteBouncedBackWithMultiple
       e.printStackTrace();
       fail();
     }
-    vm4.invoke(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_1", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
     // verify that all is well in local site
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 8000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 8000 ));
 
-    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
-        new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.verifyRegionQueueNotEmpty( "ln" ));
 
-    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort2 });
+    vm6.invoke(() -> WANTestBase.createReceiver( nyPort2 ));
 
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
 
-    vm6.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
-        new Object[] { 1, 1 });
+    vm6.invoke(() -> WANTestBase.checkMinimumGatewayReceiverStats( 1, 1 ));
   }
 
   public void testReplicatedSerialPropagationWithRemoteReceiverRestartedOnOtherNode()
       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 ));
 
     // these are part of remote site
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
 
     // these are part of local site
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
     // the log
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 350, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 350, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 350, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 350, false, false, null, true ));
 
     // create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
-    vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm3.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+      getTestMethodName() + "_RR_1", null, isOffHeap()  ));
     
     // start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
     // create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  ));
 
     // start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR_1", 8000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 8000 ));
     // close cache in remote site. This will automatically kill the remote
     // receivers.
-    vm2.invoke(WANTestBase.class, "closeCache");
-    vm3.invoke(WANTestBase.class, "closeCache");
+    vm2.invoke(() -> WANTestBase.closeCache());
+    vm3.invoke(() -> WANTestBase.closeCache());
     
     try {
       inv1.join();
@@ -1161,129 +1107,122 @@ public void testReplicatedSerialPropagationWithRemoteReceiverRestartedOnOtherNod
     }
 
     // verify that all is well in local site
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR_1", 8000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 8000 ));
 
-    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
-        new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.verifyRegionQueueNotEmpty( "ln" ));
 
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      getTestMethodName() + "_RR_1", null, isOffHeap()  });
+    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm3.invoke(() -> WANTestBase.createPersistentReplicatedRegion(
+      getTestMethodName() + "_RR_1", null, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
 
-    vm3.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
-        new Object[] { 1, 1 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR_1", 8000 });
+    vm3.invoke(() -> WANTestBase.checkMinimumGatewayReceiverStats( 1, 1 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR_1", 8000 ));
   }
   
   public void testReplicatedSerialPropagationToTwoWanSites() throws Exception {
 
     Integer lnPort = createFirstLocatorWithDSId(1);
-    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
-
-    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[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
-        3, false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
-        3, false, 100, 10, false, false, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    Integer nyPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver( tkPort ));
+
+    vm4.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache(lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "lnSerial1",
+        2, false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial1",
+        2, false, 100, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "lnSerial2",
+        3, false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial2",
+        3, false, 100, 10, false, false, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
 
   public void testReplicatedSerialPropagationHA() 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 });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-
-    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR", 10000 });
+    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 ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+    AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 10000 ));
     Wait.pause(2000);
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
     
     inv1.join();
     inv2.join();
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
   }
   
   /**
@@ -1300,64 +1239,59 @@ public void testReplicatedSerialPropagationHA() throws Exception {
   public void SURtestReplicatedSerialPropagationHA_ReceiverAffinity()
       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 });
-    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm6.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm7.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     LogWriterUtils.getLogWriter().info("Started receivers on remote site");
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( 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.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     LogWriterUtils.getLogWriter().info("Started senders on local site");
 
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
 
-    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR", 10000 });
+    AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 10000 ));
     LogWriterUtils.getLogWriter().info("Started async puts on local site");
     Wait.pause(1000);
 
-    Map oldConnectionInfo = (Map)vm4.invoke(WANTestBase.class,
-        "getSenderToReceiverConnectionInfo", new Object[] { "ln" });
+    Map oldConnectionInfo = (Map)vm4.invoke(() -> WANTestBase.getSenderToReceiverConnectionInfo( "ln" ));
     assertNotNull(oldConnectionInfo);
     String oldServerHost = (String)oldConnectionInfo.get("serverHost");
     int oldServerPort = (Integer)oldConnectionInfo.get("serverPort");
     LogWriterUtils.getLogWriter().info("Got sender to receiver connection information");
 
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
     inv2.join();
     LogWriterUtils.getLogWriter().info("Killed primary sender on local site");
     Wait.pause(5000);// give some time for vm5 to take primary charge
 
-    Map newConnectionInfo = (Map)vm5.invoke(WANTestBase.class,
-        "getSenderToReceiverConnectionInfo", new Object[] { "ln" });
+    Map newConnectionInfo = (Map)vm5.invoke(() -> WANTestBase.getSenderToReceiverConnectionInfo( "ln" ));
     assertNotNull(newConnectionInfo);
     String newServerHost = (String)newConnectionInfo.get("serverHost");
     int newServerPort = (Integer)newConnectionInfo.get("serverPort");
@@ -1369,10 +1303,10 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinity()
         .info(
             "Matched the new connection info with old connection info. Receiver affinity verified.");
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
   }
 
   /**
@@ -1390,52 +1324,48 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinity()
   public void SURtestReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
       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 });
-    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm6.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm7.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     LogWriterUtils.getLogWriter().info("Started receivers on remote site");
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( 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.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     LogWriterUtils.getLogWriter().info("Started senders on local site");
 
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
 
-    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_RR", 10000 });
+    AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 10000 ));
     LogWriterUtils.getLogWriter().info("Started async puts on local site");
     Wait.pause(1000);
 
-    Map oldConnectionInfo = (Map)vm4.invoke(WANTestBase.class,
-        "getSenderToReceiverConnectionInfo", new Object[] { "ln" });
+    Map oldConnectionInfo = (Map)vm4.invoke(() -> WANTestBase.getSenderToReceiverConnectionInfo( "ln" ));
     assertNotNull(oldConnectionInfo);
     String oldServerHost = (String)oldConnectionInfo.get("serverHost");
     int oldServerPort = (Integer)oldConnectionInfo.get("serverPort");
@@ -1443,25 +1373,24 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
 
     // ---------------------------- KILL vm4
     // --------------------------------------
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
     inv2.join();
     LogWriterUtils.getLogWriter().info("Killed vm4 (primary sender) on local site");
     // -----------------------------------------------------------------------------
 
-    vm5.invoke(WANTestBase.class, "waitForSenderToBecomePrimary",
-        new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.waitForSenderToBecomePrimary( "ln" ));
     LogWriterUtils.getLogWriter().info("vm5 sender has now acquired primary status");
     Wait.pause(5000);// give time to process unprocessedEventsMap
 
     // ---------------------------REBUILD vm4
     // --------------------------------------
     LogWriterUtils.getLogWriter().info("Rebuilding vm4....");
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, false, null, true });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
     LogWriterUtils.getLogWriter().info("Rebuilt vm4");
     // -----------------------------------------------------------------------------
 
@@ -1470,14 +1399,12 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
     inv1.join();// once the puts are done, kill vm5
     LogWriterUtils.getLogWriter().info("puts in vm5 are done");
 
-    inv2 = vm5.invokeAsync(WANTestBase.class, "killSender");
+    inv2 = vm5.invokeAsync(() -> WANTestBase.killSender());
     inv2.join();
-    vm4.invoke(WANTestBase.class, "waitForSenderToBecomePrimary",
-        new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.waitForSenderToBecomePrimary( "ln" ));
     // -----------------------------------------------------------------------------
 
-    Map newConnectionInfo = (Map)vm4.invoke(WANTestBase.class,
-        "getSenderToReceiverConnectionInfo", new Object[] { "ln" });
+    Map newConnectionInfo = (Map)vm4.invoke(() -> WANTestBase.getSenderToReceiverConnectionInfo( "ln" ));
     assertNotNull(newConnectionInfo);
     String newServerHost = (String)newConnectionInfo.get("serverHost");
     int newServerPort = (Integer)newConnectionInfo.get("serverPort");
@@ -1488,59 +1415,57 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
         .info(
             "Matched the new connection info with old connection info. Receiver affinity verified.");
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 10000 ));
   }
 
   public void testNormalRegionSerialPropagation() 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 });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( 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.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
 
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     Wait.pause(500);
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "createNormalRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln" });
-    vm5.invoke(WANTestBase.class, "createNormalRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln" });
+    vm4.invoke(() -> WANTestBase.createNormalRegion(
+        getTestMethodName() + "_RR", "ln" ));
+    vm5.invoke(() -> WANTestBase.createNormalRegion(
+        getTestMethodName() + "_RR", "ln" ));
 
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] { "ln", 0,
-        0, 0, 0});
+    vm4.invoke(() -> WANTestBase.checkQueueStats( "ln", 0,
+        0, 0, 0));
 
-    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] { "ln", 0,
-        1000, 0, 0 });
+    vm5.invoke(() -> WANTestBase.checkQueueStats( "ln", 0,
+        1000, 0, 0 ));
     
-    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 1000});
+    vm5.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 1000));
 
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      getTestMethodName() + "_RR", 0});
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+      getTestMethodName() + "_RR", 0));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 0 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 0 ));
     
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {0, 0, 0});
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(0, 0, 0));
     
   }
   
@@ -1551,55 +1476,53 @@ public void testNormalRegionSerialPropagation() throws Exception {
    * Site 2 (NY site): vm2, vm3
    */
   public void testReplicatedSerialPropagationWithRemoteSenderConfiguredButNotStarted() {
-	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, "createReceiver", new Object[] { lnPort });
-	vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+	vm4.invoke(() -> WANTestBase.createReceiver( lnPort ));
+	vm5.invoke(() -> WANTestBase.createReceiver( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( 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.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.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     
-    vm2.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
-        false, 100, 10, false, false, null, true });
-    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
-        false, 100, 10, false, false, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny", isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ny", isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createSender( "ny", 1,
+        false, 100, 10, false, false, null, true ));
+    vm3.invoke(() -> WANTestBase.createSender( "ny", 1,
+        false, 100, 10, false, false, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny", isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ny", isOffHeap() ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
     
-    vm2.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
-    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm2.invoke(() -> WANTestBase.startSender( "ny" ));
+    vm3.invoke(() -> WANTestBase.startSender( "ny" ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
index 4ce572e040db..89749dc9e69c 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
@@ -39,299 +39,287 @@ public void setUp() throws Exception {
   
   public void testPartitionedSerialPropagation() 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, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    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.doPuts( getTestMethodName() + "_PR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testBothReplicatedAndPartitionedSerialPropagation()
       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 });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-
-    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, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap() });
-
-    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, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    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 ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    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.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+    vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testSerialReplicatedAndPartitionedPropagation() 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[] { "lnSerial",
-        2, false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial",
-        2, false, 100, 10, false, false, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-
-    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, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial", 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    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( "lnSerial",
+        2, false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial",
+        2, false, 100, 10, false, false, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial", 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial" ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+    vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testSerialReplicatedAndSerialPartitionedPropagation()
       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[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true });
-
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
-        2, false, 100, 10, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
-        2, false, 100, 10, false, false, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap() });
-
-    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, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "lnSerial1", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial2", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial2", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial2", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial2", 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
-
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    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( "lnSerial1",
+        2, false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial1",
+        2, false, 100, 10, false, false, null, true ));
+
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial2",
+        2, false, 100, 10, false, false, null, true ));
+    vm6.invoke(() -> WANTestBase.createSender( "lnSerial2",
+        2, false, 100, 10, false, false, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "lnSerial1", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial2", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial2", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial2", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial2", 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+    vm6.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+    vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
   
   public void testPartitionedSerialPropagationToTwoWanSites() throws Exception {
 
     Integer lnPort = createFirstLocatorWithDSId(1);
-    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] {2, lnPort });
-    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] {3,lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver",
-        new Object[] {nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver",
-        new Object[] {tkPort });
-
-    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[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
-        3, false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
-        3, false, 100, 10, false, false, null, true });
-
-    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, "startSender", new Object[] { "lnSerial1" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    Integer nyPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort ));
+    Integer tkPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(3,lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver(nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver(tkPort ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "lnSerial1",
+        2, false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial1",
+        2, false, 100, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "lnSerial2",
+        3, false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial2",
+        3, false, 100, 10, false, false, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testPartitionedSerialPropagationHA() throws Exception {
@@ -339,102 +327,97 @@ public void testPartitionedSerialPropagationHA() throws Exception {
     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,
-        "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" });
+    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.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
 
     //do initial 100 puts to create all the buckets
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 100 });
+    vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 100 ));
     
     IgnoredException.addIgnoredException(CancelException.class.getName());
     IgnoredException.addIgnoredException(CacheClosedException.class.getName());
     IgnoredException.addIgnoredException(ForceReattemptException.class.getName());
     //start async puts
-    AsyncInvocation inv = vm5.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { getTestMethodName() + "_PR", 1000 });
+    AsyncInvocation inv = vm5.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
     //close the cache on vm4 in between the puts
-    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm4.invoke(() -> WANTestBase.killSender());
 
     inv.join();
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 
   public void testPartitionedSerialPropagationWithParallelThreads()
       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, "doMultiThreadedPuts", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_PR", 1000 });
+    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.doMultiThreadedPuts(
+        getTestMethodName() + "_PR", 1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_PR", 1000 ));
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
index 7b5942bde58d..18eb081006dd 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
@@ -34,340 +34,320 @@ public void setUp() throws Exception {
   
   public void testSerialReplicatedWanWithOverflow() {
 
-    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 });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] {
-        getTestMethodName() + "_RR", 120 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 120 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 120 });
+    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 ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.doHeavyPuts(
+        getTestMethodName() + "_RR", 120 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 120 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 120 ));
   }
 
   public void testSerialReplicatedWanWithPersistence() {
 
-    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, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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, true, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, true, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
 
   }
 
   public void testReplicatedSerialPropagationWithConflation() 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, 1000, true, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 1000, true, false, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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, 1000, true, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 1000, true, false, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
   
   public void testReplicatedSerialPropagationWithParallelThreads()
       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 });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        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[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName() + "_RR", "ln", isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "doMultiThreadedPuts", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName() + "_RR", 1000 });
+    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 ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.doMultiThreadedPuts(
+        getTestMethodName() + "_RR", 1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
   }
   
   public void testSerialPropogationWithFilter() 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,
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
+        new MyGatewayEventFilter(), true ));
 
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName(), null, 1, 100, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), null, 1, 100, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 800 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 800 ));
   }
 
   public void testReplicatedSerialPropagationWithFilter() 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,
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), 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[] {
-        getTestMethodName(), "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 800 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 800 });
+        new MyGatewayEventFilter(), true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 800 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 800 ));
   }
   
   public void testReplicatedSerialPropagationWithFilter_AfterAck()
       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 });
-
-    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender",
-        new Object[] { "ln", 2, false, 100, 10, false, false,
-            new MyGatewayEventFilter_AfterAck(), true });
-    vm5.invoke(WANTestBase.class, "createSender",
-        new Object[] { "ln", 2, false, 100, 10, false, false,
-            new MyGatewayEventFilter_AfterAck(), true });
-
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), null, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap() });
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        getTestMethodName(), "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
-
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
-    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        0 });
-
-    Integer vm4Acks = (Integer)vm4.invoke(WANTestBase.class,
-        "validateAfterAck", new Object[] { "ln"});
-    Integer vm5Acks = (Integer)vm5.invoke(WANTestBase.class,
-        "validateAfterAck", new Object[] { "ln"});
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    vm6.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm7.invoke(() -> WANTestBase.createReceiver( nyPort ));
+
+    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2, false, 100, 10, false, false,
+            new MyGatewayEventFilter_AfterAck(), true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2, false, 100, 10, false, false,
+            new MyGatewayEventFilter_AfterAck(), true ));
+
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), null, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName(), "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
+
+    vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
+    vm5.invoke(() -> WANTestBase.validateQueueContents( "ln",
+        0 ));
+
+    Integer vm4Acks = (Integer)vm4.invoke(() -> WANTestBase.validateAfterAck( "ln"));
+    Integer vm5Acks = (Integer)vm5.invoke(() -> WANTestBase.validateAfterAck( "ln"));
 
     assertEquals(2000, (vm4Acks + vm5Acks));
 
-    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
-    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        getTestMethodName(), 1000 });
+    vm6.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
+    vm7.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName(), 1000 ));
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index 3705610ebb79..85aae7f09fed 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -46,228 +46,219 @@ public void setUp() throws Exception {
   }
   
   public void testReplicatedSerialPropagation() 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 });
-
-    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 });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_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()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
-
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    vm2.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 ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap()  ));
+
+    vm5.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 1000 ));
     
     pause(2000);
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(100, 1000, 1000 ));
     
-    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
-      0, 1000, 1000, 1000});
-    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
-      100});
+    vm4.invoke(() -> WANTestBase.checkQueueStats("ln",
+      0, 1000, 1000, 1000));
+    vm4.invoke(() -> WANTestBase.checkBatchStats("ln",
+      100));
     
-    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
-      0, 1000, 0, 0});
-    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
-      0});
+    vm5.invoke(() -> WANTestBase.checkQueueStats("ln",
+      0, 1000, 0, 0));
+    vm5.invoke(() -> WANTestBase.checkBatchStats("ln",
+      0));
     
   }
   
   public void testReplicatedSerialPropagationWithMultipleDispatchers() 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 });
-
-	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, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
-		false, 100, 10, false, false, null, true, 2, OrderPolicy.KEY });
-	vm5.invoke(WANTestBase.class, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
-		false, 100, 10, false, false, null, true, 2, OrderPolicy.KEY });
-
-	vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-		testName + "_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()  });
-	vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-		testName + "_RR", "ln", isOffHeap()  });
-	vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-		testName + "_RR", "ln", isOffHeap()  });
-	vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-		testName + "_RR", "ln", isOffHeap()  });
-
-	vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-		1000 });
-
-	vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-		testName + "_RR", 1000 });
+	Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+	Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+	vm2.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.createSenderWithMultipleDispatchers( "ln", 2,
+		false, 100, 10, false, false, null, true, 2, OrderPolicy.KEY ));
+	vm5.invoke(() -> WANTestBase.createSenderWithMultipleDispatchers( "ln", 2,
+		false, 100, 10, false, false, null, true, 2, OrderPolicy.KEY ));
+
+	vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+		testName + "_RR", null, isOffHeap()  ));
+
+	vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+	vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+	vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+		testName + "_RR", "ln", isOffHeap()  ));
+	vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+		testName + "_RR", "ln", isOffHeap()  ));
+	vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+		testName + "_RR", "ln", isOffHeap()  ));
+	vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+		testName + "_RR", "ln", isOffHeap()  ));
+
+	vm5.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+		1000 ));
+
+	vm2.invoke(() -> WANTestBase.validateRegionSize(
+		testName + "_RR", 1000 ));
 	    
 	pause(2000);
-	vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+	vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(100, 1000, 1000 ));
 	    
-	vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
-		0, 1000, 1000, 1000});
-	vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
-		100});
+	vm4.invoke(() -> WANTestBase.checkQueueStats("ln",
+		0, 1000, 1000, 1000));
+	vm4.invoke(() -> WANTestBase.checkBatchStats("ln",
+		100));
 	    
-	vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
-		0, 1000, 0, 0});
-	vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
-		0});
+	vm5.invoke(() -> WANTestBase.checkQueueStats("ln",
+		0, 1000, 0, 0));
+	vm5.invoke(() -> WANTestBase.checkBatchStats("ln",
+		0));
 	    
 	  }
   
   public void testWANStatsTwoWanSites() throws Exception {
 
     Integer lnPort = createFirstLocatorWithDSId(1);
-    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
-
-    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[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
-        2, false, 100, 10, false, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
-        3, false, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
-        3, false, 100, 10, false, false, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+    Integer nyPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    Integer tkPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver( tkPort ));
+
+    vm4.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache(lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "lnSerial1",
+        2, false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial1",
+        2, false, 100, 10, false, false, null, true ));
+
+    vm4.invoke(() -> WANTestBase.createSender( "lnSerial2",
+        3, false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "lnSerial2",
+        3, false, 100, 10, false, false, null, true ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial1" ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+    vm5.invoke(() -> WANTestBase.startSender( "lnSerial2" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 1000 ));
     
     pause(2000);
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
-    vm3.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(100, 1000, 1000 ));
+    vm3.invoke(() -> WANTestBase.checkGatewayReceiverStats(100, 1000, 1000 ));
     
-    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"lnSerial1",
-      0, 1000, 1000, 1000});
-    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"lnSerial1",
-      100});
-    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"lnSerial2",
-      0, 1000, 1000, 1000});
-    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"lnSerial2",
-      100});
-    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"lnSerial1",
-      0, 1000, 0, 0});
-    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"lnSerial1",
-      0});
-    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"lnSerial2",
-      0, 1000, 0, 0});
-    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"lnSerial2",
-      0});
+    vm4.invoke(() -> WANTestBase.checkQueueStats("lnSerial1",
+      0, 1000, 1000, 1000));
+    vm4.invoke(() -> WANTestBase.checkBatchStats("lnSerial1",
+      100));
+    vm4.invoke(() -> WANTestBase.checkQueueStats("lnSerial2",
+      0, 1000, 1000, 1000));
+    vm4.invoke(() -> WANTestBase.checkBatchStats("lnSerial2",
+      100));
+    vm5.invoke(() -> WANTestBase.checkQueueStats("lnSerial1",
+      0, 1000, 0, 0));
+    vm5.invoke(() -> WANTestBase.checkBatchStats("lnSerial1",
+      0));
+    vm5.invoke(() -> WANTestBase.checkQueueStats("lnSerial2",
+      0, 1000, 0, 0));
+    vm5.invoke(() -> WANTestBase.checkBatchStats("lnSerial2",
+      0));
     
   }
 
   public void testReplicatedSerialPropagationHA() 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 });
+    vm2.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,
-        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.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, false, null, true ));
     
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_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()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", null, isOffHeap()  ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap()  ));
     
-    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { testName + "_RR", 10000 });
+    AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts( testName + "_RR", 10000 ));
     pause(2000);
-    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender", new Object[] { "ln" });
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender( "ln" ));
     Boolean isKilled = Boolean.FALSE;
     try {
       isKilled = (Boolean)inv2.getResult();
@@ -277,103 +268,101 @@ public void testReplicatedSerialPropagationHA() throws Exception {
     }
     AsyncInvocation inv3 = null; 
     if(!isKilled){
-      inv3 = vm5.invokeAsync(WANTestBase.class, "killSender", new Object[] { "ln" });
+      inv3 = vm5.invokeAsync(() -> WANTestBase.killSender( "ln" ));
       inv3.join();
     }
     inv1.join();
     inv2.join();
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 10000 ));
   
-    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStatsHA", new Object[] {1000, 10000, 10000 });
+    vm2.invoke(() -> WANTestBase.checkGatewayReceiverStatsHA(1000, 10000, 10000 ));
     
-    vm5.invoke(WANTestBase.class, "checkStats_Failover", new Object[] {"ln", 10000});
+    vm5.invoke(() -> WANTestBase.checkStats_Failover("ln", 10000));
   }
   
   public void testReplicatedSerialPropagationUNPorcessedEvents() 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 ));
 
     //these are part of 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 ));
 
     //these are part of 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 ));
 
     //senders are created on local site
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 20, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 20, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 20, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 20, false, false, null, true ));
 
     //create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", null, isOffHeap()  ));
 
     //create another RR (RR_2) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", null, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_2", null, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_2", null, isOffHeap()  ));
     
     //start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", "ln", isOffHeap()  ));
 
     //create another RR (RR_2) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_2", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_2", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_2", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_2", "ln", isOffHeap()  ));
     
     //start puts in RR_1 in another thread
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_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.doPuts( testName + "_RR_2", 500 ));
     //sleep for some time to let all the events propagate to remote site
     Thread.sleep(20);
-    //vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR_1", 1000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR_2", 500 });
+    //vm4.invoke(() -> WANTestBase.verifyQueueSize( "ln", 0 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR_1", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR_2", 500 ));
     
     pause(2000);
-    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
-      0, 1500, 1500, 1500});
-    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
-      75});
-    vm4.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln", 0});
+    vm4.invoke(() -> WANTestBase.checkQueueStats("ln",
+      0, 1500, 1500, 1500));
+    vm4.invoke(() -> WANTestBase.checkBatchStats("ln",
+      75));
+    vm4.invoke(() -> WANTestBase.checkUnProcessedStats("ln", 0));
     
     
-    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
-      0, 1500, 0, 0});
-    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
-      0});
-    vm5.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln", 1500});
+    vm5.invoke(() -> WANTestBase.checkQueueStats("ln",
+      0, 1500, 0, 0));
+    vm5.invoke(() -> WANTestBase.checkBatchStats("ln",
+      0));
+    vm5.invoke(() -> WANTestBase.checkUnProcessedStats("ln", 1500));
   }
   
   /**
@@ -387,48 +376,46 @@ public void testReplicatedSerialPropagationUNPorcessedEvents() throws Exception
    * @throws Exception
    */
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy() 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 ));
 
     //these are part of remote site
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     //these are part of 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 ));
 
     //senders are created on local site
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 100, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 100, false, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 100, false, false, null, true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 100, false, false, null, true ));
 
     //create one RR (RR_1) on remote site
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", null, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", null, isOffHeap()  ));
 
     //start the senders on local site
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
     //create one RR (RR_1) on local site
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", "ln", isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", "ln", isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", "ln", isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR_1", "ln", isOffHeap()  ));
 
     //start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 20000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( testName + "_RR_1", 20000 ));
     //destroy RR_1 in remote site
-    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_1", 500});
+    vm2.invoke(() -> WANTestBase.destroyRegion( testName + "_RR_1", 500));
     
     try {
       inv1.join();
@@ -438,117 +425,113 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exce
     }
 
     //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", 20000 });
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR_1", 20000 ));
     //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 
     //more in depth validations.
-    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty", new Object[] {"ln" });
+    vm4.invoke(() -> WANTestBase.verifyRegionQueueNotEmpty("ln" ));
     
-    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln", true, true});
+    vm4.invoke(() -> WANTestBase.checkBatchStats("ln", true, true));
     
-    vm5.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln", 20000});
+    vm5.invoke(() -> WANTestBase.checkUnProcessedStats("ln", 20000));
     
-    vm2.invoke(WANTestBase.class, "checkExcepitonStats", new Object[] {1});
+    vm2.invoke(() -> WANTestBase.checkExcepitonStats(1));
     
   }
   
   public void testSerialPropogationWithFilter() 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,
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        new MyGatewayEventFilter(), true ));
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false,
-        new MyGatewayEventFilter(), true });
+        new MyGatewayEventFilter(), true ));
 
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", 1, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", 1, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", 1, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", 1, 100, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, null, 1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, null, 1, 100, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    vm4.invoke(() -> WANTestBase.doPuts( testName, 1000 ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 800 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, 800 ));
     
     pause(2000);
-    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
-      0, 1000, 900, 800});
-    vm4.invoke(WANTestBase.class, "checkEventFilteredStats", new Object[] {"ln",
-      200});
-    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
-      80});
-    vm4.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln", 0});
+    vm4.invoke(() -> WANTestBase.checkQueueStats("ln",
+      0, 1000, 900, 800));
+    vm4.invoke(() -> WANTestBase.checkEventFilteredStats("ln",
+      200));
+    vm4.invoke(() -> WANTestBase.checkBatchStats("ln",
+      80));
+    vm4.invoke(() -> WANTestBase.checkUnProcessedStats("ln", 0));
     
     
-    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
-      0, 1000, 0, 0});
-    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
-      0});
-    vm5.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln",900});
+    vm5.invoke(() -> WANTestBase.checkQueueStats("ln",
+      0, 1000, 0, 0));
+    vm5.invoke(() -> WANTestBase.checkBatchStats("ln",
+      0));
+    vm5.invoke(() -> WANTestBase.checkUnProcessedStats("ln",900));
   }
   
   public void testSerialPropagationConflation() 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,
-        false, 100, 10, true, false, null, true });
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, true, false, null, true ));
 
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap()  });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap()  });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap()  });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap()  });
+    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", 0, 100, isOffHeap()  ));
+    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", 0, 100, isOffHeap()  ));
+    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", 0, 100, isOffHeap()  ));
+    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, "ln", 0, 100, isOffHeap()  ));
 
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
 
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null,1, 100, isOffHeap()  });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null,1, 100, isOffHeap()  });
+    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, null,1, 100, isOffHeap()  ));
+    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
+        testName, null,1, 100, isOffHeap()  ));
 
     final Map keyValues = new HashMap();
     final Map updateKeyValues = new HashMap();
@@ -556,42 +539,42 @@ public void testSerialPropagationConflation() throws Exception {
       keyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( testName, keyValues ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+    vm4.invoke(() -> WANTestBase.checkQueueSize( "ln", keyValues.size() ));
     for(int i=0;i<500;i++) {
       updateKeyValues.put(i, i+"_updated");
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( testName, updateKeyValues ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size()  + updateKeyValues.size() });
+    vm4.invoke(() -> WANTestBase.checkQueueSize( "ln", keyValues.size()  + updateKeyValues.size() ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 0 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, 0 ));
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    vm4.invoke(() -> WANTestBase.putGivenKeyValue( testName, updateKeyValues ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size()  + updateKeyValues.size() });
+    vm4.invoke(() -> WANTestBase.checkQueueSize( "ln", keyValues.size()  + updateKeyValues.size() ));
 
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
 
     keyValues.putAll(updateKeyValues);
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, keyValues.size() });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName, keyValues.size() });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName, keyValues.size() ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      testName, keyValues.size() ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
+    vm2.invoke(() -> WANTestBase.validateRegionContents(
+        testName, keyValues ));
+    vm3.invoke(() -> WANTestBase.validateRegionContents(
+        testName, keyValues ));
     
     pause(2000);
-    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
-      0, 2000, 2000, 1500});
-    vm4.invoke(WANTestBase.class, "checkConflatedStats", new Object[] {"ln",
-      500});
+    vm4.invoke(() -> WANTestBase.checkQueueStats("ln",
+      0, 2000, 2000, 1500));
+    vm4.invoke(() -> WANTestBase.checkConflatedStats("ln",
+      500));
   }
     
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index 38d88270a3ac..f7d19875e0ef 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -494,14 +494,14 @@ public static void verifyReceiverCreationWithAttributes(boolean isRunning,
   @Override
   protected final void postTearDownCacheTestCase() throws Exception {
     closeCache();
-    vm0.invoke(WANCommandTestBase.class, "closeCache");
-    vm1.invoke(WANCommandTestBase.class, "closeCache");
-    vm2.invoke(WANCommandTestBase.class, "closeCache");
-    vm3.invoke(WANCommandTestBase.class, "closeCache");
-    vm4.invoke(WANCommandTestBase.class, "closeCache");
-    vm5.invoke(WANCommandTestBase.class, "closeCache");
-    vm6.invoke(WANCommandTestBase.class, "closeCache");
-    vm7.invoke(WANCommandTestBase.class, "closeCache");
+    vm0.invoke(() -> WANCommandTestBase.closeCache());
+    vm1.invoke(() -> WANCommandTestBase.closeCache());
+    vm2.invoke(() -> WANCommandTestBase.closeCache());
+    vm3.invoke(() -> WANCommandTestBase.closeCache());
+    vm4.invoke(() -> WANCommandTestBase.closeCache());
+    vm5.invoke(() -> WANCommandTestBase.closeCache());
+    vm6.invoke(() -> WANCommandTestBase.closeCache());
+    vm7.invoke(() -> WANCommandTestBase.closeCache());
   }
 
   public static void closeCache() {
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index a06b32e01574..b8850714b5a0 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -54,8 +54,7 @@ public void setUp() throws Exception {
   public void testCreateGatewayReceiverWithDefault() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -63,15 +62,11 @@ public void testCreateGatewayReceiverWithDefault() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER;
     CommandResult cmdResult = executeCommand(command);
@@ -95,27 +90,24 @@ public void testCreateGatewayReceiverWithDefault() {
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START,
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START,
             GatewayReceiver.DEFAULT_START_PORT,
             GatewayReceiver.DEFAULT_END_PORT,
             GatewayReceiver.DEFAULT_BIND_ADDRESS,
             GatewayReceiver.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
-            GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null });
-    vm4.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START,
+            GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START,
             GatewayReceiver.DEFAULT_START_PORT,
             GatewayReceiver.DEFAULT_END_PORT,
             GatewayReceiver.DEFAULT_BIND_ADDRESS,
             GatewayReceiver.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
-            GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null });
-    vm5.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START,
+            GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START,
             GatewayReceiver.DEFAULT_START_PORT,
             GatewayReceiver.DEFAULT_END_PORT,
             GatewayReceiver.DEFAULT_BIND_ADDRESS,
             GatewayReceiver.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
-            GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null });
+            GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null ));
   }
 
   /**
@@ -124,8 +116,7 @@ public void testCreateGatewayReceiverWithDefault() {
   public void testCreateGatewayReceiver() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -133,15 +124,11 @@ public void testCreateGatewayReceiver() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART+ "=true"
@@ -171,15 +158,12 @@ public void testCreateGatewayReceiver() {
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
-    vm4.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
-    vm5.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
   }
   
   /**
@@ -188,8 +172,7 @@ public void testCreateGatewayReceiver() {
   public void testCreateGatewayReceiverWithGatewayTransportFilter() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -197,15 +180,11 @@ public void testCreateGatewayReceiverWithGatewayTransportFilter() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART+ "=false"
@@ -239,15 +218,12 @@ public void testCreateGatewayReceiverWithGatewayTransportFilter() {
     List transportFilters = new ArrayList();
     transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter1");
     
-    vm3.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { true, 10000,
-            11000, "localhost", 100000, 512000, transportFilters });
-    vm4.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { true, 10000,
-            11000, "localhost", 100000, 512000, transportFilters });
-    vm5.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { true, 10000,
-            11000, "localhost", 100000, 512000, transportFilters });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( true, 10000,
+            11000, "localhost", 100000, 512000, transportFilters ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( true, 10000,
+            11000, "localhost", 100000, 512000, transportFilters ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( true, 10000,
+            11000, "localhost", 100000, 512000, transportFilters ));
   }
   
   /**
@@ -256,8 +232,7 @@ public void testCreateGatewayReceiverWithGatewayTransportFilter() {
   public void testCreateGatewayReceiverWithMultipleGatewayTransportFilters() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -265,15 +240,11 @@ public void testCreateGatewayReceiverWithMultipleGatewayTransportFilters() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER + " --"
         + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost" + " --"
@@ -309,15 +280,12 @@ public void testCreateGatewayReceiverWithMultipleGatewayTransportFilters() {
     transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter1");
     transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter2");
     
-    vm3.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
-            11000, "localhost", 100000, 512000, transportFilters });
-    vm4.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
-            11000, "localhost", 100000, 512000, transportFilters });
-    vm5.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
-            11000, "localhost", 100000, 512000, transportFilters });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
+            11000, "localhost", 100000, 512000, transportFilters ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
+            11000, "localhost", 100000, 512000, transportFilters ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
+            11000, "localhost", 100000, 512000, transportFilters ));
   }
 
   /**
@@ -327,8 +295,7 @@ public void testCreateGatewayReceiverWithMultipleGatewayTransportFilters() {
   public void testCreateGatewayReceiver_Error() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -336,15 +303,11 @@ public void testCreateGatewayReceiver_Error() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
@@ -380,8 +343,7 @@ public void testCreateGatewayReceiver_Error() {
   public void testCreateGatewayReceiver_onMember() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -389,18 +351,13 @@ public void testCreateGatewayReceiver_onMember() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
     
-    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -431,9 +388,8 @@ public void testCreateGatewayReceiver_onMember() {
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
   }
 
   /**
@@ -442,8 +398,7 @@ public void testCreateGatewayReceiver_onMember() {
   public void testCreateGatewayReceiver_onMultipleMembers() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -451,20 +406,14 @@ public void testCreateGatewayReceiver_onMultipleMembers() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
     
-    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
-    final DistributedMember vm4Member = (DistributedMember) vm4.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
+    final DistributedMember vm4Member = (DistributedMember) vm4.invoke(() -> WANCommandTestBase.getMember());
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -495,12 +444,10 @@ public void testCreateGatewayReceiver_onMultipleMembers() {
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
-    vm4.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
   }
   
   /**
@@ -509,8 +456,7 @@ public void testCreateGatewayReceiver_onMultipleMembers() {
   public void testCreateGatewayReceiver_onGroup() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -518,15 +464,11 @@ public void testCreateGatewayReceiver_onGroup() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "receiverGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "receiverGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "receiverGroup1" });
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -557,15 +499,12 @@ public void testCreateGatewayReceiver_onGroup() {
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
-    vm4.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
-    vm5.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
   }
 
   /**
@@ -575,8 +514,7 @@ public void testCreateGatewayReceiver_onGroup() {
   public void testCreateGatewayReceiver_onGroup_Scenario2() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -584,15 +522,11 @@ public void testCreateGatewayReceiver_onGroup_Scenario2() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "receiverGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "receiverGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "receiverGroup2" });
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup2" ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -623,12 +557,10 @@ public void testCreateGatewayReceiver_onGroup_Scenario2() {
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
-    vm4.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
   }
 
   /**
@@ -637,8 +569,7 @@ public void testCreateGatewayReceiver_onGroup_Scenario2() {
   public void testCreateGatewayReceiver_onMultipleGroups() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -646,15 +577,11 @@ public void testCreateGatewayReceiver_onMultipleGroups() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer)vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "receiverGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "receiverGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "receiverGroup2" });
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "receiverGroup2" ));
 
     String command = CliStrings.CREATE_GATEWAYRECEIVER 
         + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
@@ -685,15 +612,12 @@ public void testCreateGatewayReceiver_onMultipleGroups() {
       fail("testCreateGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
-    vm4.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
-    vm5.invoke(WANCommandTestBase.class,
-        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
-            11000, "localhost", 100000, 512000, null });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverCreationWithAttributes( false, 10000,
+            11000, "localhost", 100000, 512000, null ));
   }
 
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
index 9ebf4e48f615..21062570297b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
@@ -61,8 +61,7 @@ private CommandResult executeCommandWithIgnoredExceptions(String command) {
    */
   public void testCreateGatewaySenderWithDefault() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -70,15 +69,11 @@ public void testCreateGatewaySenderWithDefault() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
         + CliStrings.CREATE_GATEWAYSENDER__ID + "=ln" 
@@ -101,12 +96,12 @@ public void testCreateGatewaySenderWithDefault() {
       fail("testCreateGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
   
   /**
@@ -114,8 +109,7 @@ public void testCreateGatewaySenderWithDefault() {
    */
   public void testCreateGatewaySender() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -123,15 +117,11 @@ public void testCreateGatewaySender() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -168,22 +158,19 @@ public void testCreateGatewaySender() {
       fail("testCreateGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
     
-    vm3.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null ));
   }
 
   /**
@@ -193,8 +180,7 @@ public void testCreateGatewaySender() {
    */
   public void testCreateGatewaySender_Error() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -202,15 +188,11 @@ public void testCreateGatewaySender_Error() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -254,8 +236,7 @@ public void testCreateGatewaySender_Error() {
    */
   public void testCreateGatewaySenderWithGatewayEventFilters() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -263,15 +244,11 @@ public void testCreateGatewaySenderWithGatewayEventFilters() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -310,25 +287,22 @@ public void testCreateGatewaySenderWithGatewayEventFilters() {
       fail("testCreateGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
     
     List eventFilters = new ArrayList();
     eventFilters.add("com.gemstone.gemfire.cache30.MyGatewayEventFilter1");
     eventFilters.add("com.gemstone.gemfire.cache30.MyGatewayEventFilter2");
-    vm3.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, eventFilters, null });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, eventFilters, null });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, eventFilters, null });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, eventFilters, null ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, eventFilters, null ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, eventFilters, null ));
   }
 
   /**
@@ -336,8 +310,7 @@ public void testCreateGatewaySenderWithGatewayEventFilters() {
    */
   public void testCreateGatewaySenderWithGatewayTransportFilters() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -345,15 +318,11 @@ public void testCreateGatewaySenderWithGatewayTransportFilters() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -391,24 +360,21 @@ public void testCreateGatewaySenderWithGatewayTransportFilters() {
       fail("testCreateGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
     
     List transportFilters = new ArrayList();
     transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter1");
-    vm3.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, transportFilters });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, transportFilters });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, transportFilters });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, transportFilters ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, transportFilters ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, transportFilters ));
   }
 
   /**
@@ -416,8 +382,7 @@ public void testCreateGatewaySenderWithGatewayTransportFilters() {
    */
   public void testCreateGatewaySender_OnMember() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -425,18 +390,13 @@ public void testCreateGatewaySender_OnMember() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
     
-    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -474,12 +434,11 @@ public void testCreateGatewaySender_OnMember() {
       fail("testCreateGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
     
-    vm3.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, false, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, 2, OrderPolicy.THREAD, null, null ));
   }
 
   /**
@@ -487,8 +446,7 @@ public void testCreateGatewaySender_OnMember() {
    */
   public void testCreateGatewaySender_Group() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -496,15 +454,11 @@ public void testCreateGatewaySender_Group() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "SenderGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "SenderGroup1" });
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup1" ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -542,12 +496,12 @@ public void testCreateGatewaySender_Group() {
       fail("testCreateGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
   
   /**
@@ -556,8 +510,7 @@ public void testCreateGatewaySender_Group() {
    */
   public void testCreateGatewaySender_Group_Scenario2() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -565,15 +518,11 @@ public void testCreateGatewaySender_Group_Scenario2() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "SenderGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { punePort, "SenderGroup2" });
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( punePort, "SenderGroup2" ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -611,10 +560,10 @@ public void testCreateGatewaySender_Group_Scenario2() {
       fail("testCreateGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
   
   /**
@@ -622,8 +571,7 @@ public void testCreateGatewaySender_Group_Scenario2() {
    */
   public void testCreateParallelGatewaySender() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -631,15 +579,11 @@ public void testCreateParallelGatewaySender() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
@@ -674,22 +618,19 @@ public void testCreateParallelGatewaySender() {
       fail("testCreateGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
     
-    vm3.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, GatewaySender.DEFAULT_DISPATCHER_THREADS, null, null, null });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, GatewaySender.DEFAULT_DISPATCHER_THREADS, null, null, null });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderAttributes",
-        new Object[] { "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
-            true, false, 1000, 100, GatewaySender.DEFAULT_DISPATCHER_THREADS, null, null, null });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, GatewaySender.DEFAULT_DISPATCHER_THREADS, null, null, null ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, GatewaySender.DEFAULT_DISPATCHER_THREADS, null, null, null ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderAttributes( "ln", 2, true, true, 1000, socketReadTimeout, true, 1000, 5000,
+            true, false, 1000, 100, GatewaySender.DEFAULT_DISPATCHER_THREADS, null, null, null ));
   }
   
   /**
@@ -698,8 +639,7 @@ public void testCreateParallelGatewaySender() {
    */
   public void testCreateParallelGatewaySender_Error() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -708,15 +648,11 @@ public void testCreateParallelGatewaySender_Error() {
         + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
 
     int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT+1000;
     String command = CliStrings.CREATE_GATEWAYSENDER + " --"
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
index 927d63b62b61..1ef7f11ff1ff 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
@@ -50,22 +50,18 @@ public void setUp() throws Exception {
   public void testStartGatewayReceiver_ErrorConditions() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createReceiver",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
 
     String command = CliStrings.START_GATEWAYRECEIVER + " --"
         + CliStrings.START_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId() + " --"
@@ -86,30 +82,22 @@ public void testStartGatewayReceiver_ErrorConditions() {
   public void testStartGatewayReceiver() {
     
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createReceiver",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createReceiver",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createReceiver",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
     
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
     
     Wait.pause(10000);
     String command = CliStrings.START_GATEWAYRECEIVER;
@@ -127,12 +115,9 @@ public void testStartGatewayReceiver() {
       fail("testStartGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
   }
 
   /**
@@ -142,33 +127,24 @@ public void testStartGatewayReceiver() {
   public void testStartGatewayReceiver_onMember() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
     
-    vm3.invoke(WANCommandTestBase.class, "createReceiver",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createReceiver",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createReceiver",
-        new Object[] { punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
+    vm3.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
     
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
     Wait.pause(10000);
     String command = CliStrings.START_GATEWAYRECEIVER + " --"
         + CliStrings.START_GATEWAYRECEIVER__MEMBER+ "=" + vm1Member.getId();
@@ -184,12 +160,9 @@ public void testStartGatewayReceiver_onMember() {
       fail("testStartGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
   }
 
   /**
@@ -199,30 +172,22 @@ public void testStartGatewayReceiver_onMember() {
   public void testStartGatewayReceiver_Group() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-    vm4.invoke(WANCommandTestBase.class, "createReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-    vm5.invoke(WANCommandTestBase.class, "createReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1" ));
+    vm4.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1" ));
+    vm5.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
     
     Wait.pause(10000);
     String command = CliStrings.START_GATEWAYRECEIVER + " --"
@@ -244,12 +209,9 @@ public void testStartGatewayReceiver_Group() {
       fail("testStartGatewayReceiver_Group failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
   }
 
   /**
@@ -260,38 +222,26 @@ public void testStartGatewayReceiver_Group() {
   public void testStartGatewayReceiver_MultipleGroup() {
     
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
     
-    vm3.invoke(WANCommandTestBase.class, "createReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-    vm4.invoke(WANCommandTestBase.class, "createReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-    vm5.invoke(WANCommandTestBase.class, "createReceiverWithGroup",
-        new Object[] { punePort, "RG1, RG2" });
-    vm6.invoke(WANCommandTestBase.class, "createReceiverWithGroup",
-        new Object[] { punePort, "RG1, RG2" });
-    vm7.invoke(WANCommandTestBase.class, "createReceiverWithGroup",
-        new Object[] { punePort, "RG3" });
+    vm3.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1" ));
+    vm4.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1" ));
+    vm5.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1, RG2" ));
+    vm6.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG1, RG2" ));
+    vm7.invoke(() -> WANCommandTestBase.createReceiverWithGroup( punePort, "RG3" ));
     
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm6.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm7.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm6.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm7.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
 
     Wait.pause(10000);
     String command = CliStrings.START_GATEWAYRECEIVER + " --"
@@ -313,16 +263,11 @@ public void testStartGatewayReceiver_MultipleGroup() {
       fail("testStartGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true});
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm6.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm7.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm6.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm7.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
   }
 
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
index 574c5d97b10e..08bd07ddf9da 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
@@ -50,22 +50,18 @@ public void setUp() throws Exception {
   public void testStopGatewayReceiver_ErrorConditions() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createReceiver",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createReceiver( punePort ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
 
     String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
         + CliStrings.STOP_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId()
@@ -87,30 +83,22 @@ public void testStopGatewayReceiver_ErrorConditions() {
   public void testStopGatewayReceiver() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createAndStartReceiver",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createAndStartReceiver",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createAndStartReceiver",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
 
     Wait.pause(10000);
     String command = CliStrings.STOP_GATEWAYRECEIVER;
@@ -130,12 +118,9 @@ public void testStopGatewayReceiver() {
       fail("testStopGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
   }
 
   /**
@@ -145,33 +130,24 @@ public void testStopGatewayReceiver() {
   public void testStopGatewayReceiver_onMember() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createAndStartReceiver",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createAndStartReceiver",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createAndStartReceiver",
-        new Object[] { punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
     Wait.pause(10000);
     String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
         + CliStrings.STOP_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId();
@@ -188,12 +164,9 @@ public void testStopGatewayReceiver_onMember() {
       fail("testStopGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
   }
 
   /**
@@ -203,30 +176,22 @@ public void testStopGatewayReceiver_onMember() {
   public void testStopGatewayReceiver_Group() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-    vm4.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-    vm5.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
+    vm3.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
 
     Wait.pause(10000);
     String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
@@ -249,12 +214,9 @@ public void testStopGatewayReceiver_Group() {
       fail("testStopGatewayReceiver_Group failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
   }
 
   /**
@@ -265,38 +227,26 @@ public void testStopGatewayReceiver_Group() {
   public void testStopGatewayReceiver_MultipleGroup() {
 
     VM puneLocator = Host.getLocator();
-    int punePort = (Integer) puneLocator.invoke(WANCommandTestBase.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort());
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-    vm4.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-    vm5.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup",
-        new Object[] { punePort, "RG1" });
-    vm6.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup",
-        new Object[] { punePort, "RG1, RG2" });
-    vm7.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup",
-        new Object[] { punePort, "RG3" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm6.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
-    vm7.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1" ));
+    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG1, RG2" ));
+    vm7.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( punePort, "RG3" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm6.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
+    vm7.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
 
     Wait.pause(10000);
     String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
@@ -319,15 +269,10 @@ public void testStopGatewayReceiver_MultipleGroup() {
       fail("testStopGatewayReceiver failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm4.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm5.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm6.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { false });
-    vm7.invoke(WANCommandTestBase.class, "verifyReceiverState",
-        new Object[] { true });
+    vm3.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm4.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm5.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm6.invoke(() -> WANCommandTestBase.verifyReceiverState( false ));
+    vm7.invoke(() -> WANCommandTestBase.verifyReceiverState( true ));
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
index d4211e80a7a8..7e6a06d895c9 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
@@ -48,8 +48,7 @@ public void setUp() throws Exception {
    */
   public void testStartGatewaySender_ErrorConditions() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -57,16 +56,13 @@ public void testStartGatewaySender_ErrorConditions() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
     
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
 
     String command = CliStrings.START_GATEWAYSENDER + " --"
         + CliStrings.START_GATEWAYSENDER__ID + "=ln --"
@@ -96,8 +92,7 @@ private CommandResult executeCommandWithIgnoredExceptions(String command) {
 
   public void testStartGatewaySender() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -105,28 +100,24 @@ public void testStartGatewaySender() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
 
     Wait.pause(10000);
     String command = CliStrings.START_GATEWAYSENDER + " --"
@@ -147,12 +138,12 @@ public void testStartGatewaySender() {
       fail("testStartGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
 
   /**
@@ -161,8 +152,7 @@ public void testStartGatewaySender() {
    */
   public void testStartGatewaySender_onMember() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -170,19 +160,16 @@ public void testStartGatewaySender_onMember() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
     Wait.pause(10000);
     String command = CliStrings.START_GATEWAYSENDER + " --"
         + CliStrings.START_GATEWAYSENDER__ID + "=ln --"
@@ -198,8 +185,8 @@ public void testStartGatewaySender_onMember() {
       fail("testStartGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
 
   /**
@@ -208,8 +195,7 @@ public void testStartGatewaySender_onMember() {
    */
   public void testStartGatewaySender_Group() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -217,28 +203,27 @@ public void testStartGatewaySender_Group() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
     
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
 
     Wait.pause(10000);
     String command = CliStrings.START_GATEWAYSENDER + " --"
@@ -261,12 +246,12 @@ public void testStartGatewaySender_Group() {
       fail("testStartGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
 
   /**
@@ -276,8 +261,7 @@ public void testStartGatewaySender_Group() {
    */
   public void testStartGatewaySender_MultipleGroup() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -285,40 +269,39 @@ public void testStartGatewaySender_MultipleGroup() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1, SenderGroup2" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm6.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1, SenderGroup2" });
-    vm6.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm7.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup3" });
-    vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm6.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1, SenderGroup2" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm6.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1, SenderGroup2" ));
+    vm6.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm7.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup3" ));
+    vm7.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
 
     Wait.pause(10000);
     String command = CliStrings.START_GATEWAYSENDER + " --"
@@ -340,16 +323,16 @@ public void testStartGatewaySender_MultipleGroup() {
       fail("testStartGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm6.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
   }
 
   /**
@@ -359,8 +342,7 @@ public void testStartGatewaySender_MultipleGroup() {
    */
   public void testStartGatewaySender_Group_MissingSenderFromGroup() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -368,24 +350,23 @@ public void testStartGatewaySender_Group_MissingSenderFromGroup() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
 
     Wait.pause(10000);
     String command = CliStrings.START_GATEWAYSENDER + " --"
@@ -409,10 +390,10 @@ public void testStartGatewaySender_Group_MissingSenderFromGroup() {
       fail("testStartGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
 
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
index 20b72515a816..7c90d346dc3d 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
@@ -52,8 +52,7 @@ private CommandResult executeCommandWithIgnoredExceptions(String command) {
 
   public void testStopGatewaySender_ErrorConditions() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -61,16 +60,13 @@ public void testStopGatewaySender_ErrorConditions() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
 
     String command = CliStrings.STOP_GATEWAYSENDER + " --"
         + CliStrings.STOP_GATEWAYSENDER__ID + "=ln --"
@@ -90,8 +86,7 @@ public void testStopGatewaySender_ErrorConditions() {
 
   public void testStopGatewaySender() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -99,32 +94,28 @@ public void testStopGatewaySender() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
 
     Wait.pause(10000);
     String command = CliStrings.STOP_GATEWAYSENDER + " --"
@@ -146,12 +137,12 @@ public void testStopGatewaySender() {
       fail("testStopGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
   }
 
   /**
@@ -160,8 +151,7 @@ public void testStopGatewaySender() {
    */
   public void testStopGatewaySender_onMember() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -169,21 +159,18 @@ public void testStopGatewaySender_onMember() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
 
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
     Wait.pause(10000);
     String command = CliStrings.STOP_GATEWAYSENDER + " --"
         + CliStrings.STOP_GATEWAYSENDER__ID + "=ln --"
@@ -199,8 +186,8 @@ public void testStopGatewaySender_onMember() {
       fail("testStopGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
   }
 
   /**
@@ -209,8 +196,7 @@ public void testStopGatewaySender_onMember() {
    */
   public void testStopGatewaySender_Group() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -218,32 +204,31 @@ public void testStopGatewaySender_Group() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
 
     Wait.pause(10000);
     String command = CliStrings.STOP_GATEWAYSENDER + " --"
@@ -268,12 +253,12 @@ public void testStopGatewaySender_Group() {
       fail("testStopGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
   }
 
   /**
@@ -283,8 +268,7 @@ public void testStopGatewaySender_Group() {
    */
   public void testStopGatewaySender_MultipleGroup() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -292,46 +276,45 @@ public void testStopGatewaySender_MultipleGroup() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1, SenderGroup2" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm6.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup2" });
-    vm6.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm7.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup3" });
-    vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm6.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1, SenderGroup2" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm6.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup2" ));
+    vm6.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm7.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup3" ));
+    vm7.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
 
     Wait.pause(10000);
     String command = CliStrings.STOP_GATEWAYSENDER + " --"
@@ -355,15 +338,15 @@ public void testStopGatewaySender_MultipleGroup() {
       fail("testStopGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm6.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", false, false });
-    vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", false, false ));
+    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index 25eca2edc31f..d54895db05cb 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -44,8 +44,7 @@ public void setUp() throws Exception {
 
   public void testListGatewayWithNoSenderReceiver() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -53,15 +52,11 @@ public void testListGatewayWithNoSenderReceiver() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
     
     Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY;
@@ -78,8 +73,7 @@ public void testListGatewayWithNoSenderReceiver() {
   
   public void testListGatewaySender() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -87,30 +81,26 @@ public void testListGatewaySender() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm6.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
-    vm7.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
+    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
+    vm7.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, false });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, false });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, false ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
 
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, false });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, false });
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, false ));
 
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, false });
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, false ));
 
     Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY;
@@ -135,8 +125,7 @@ public void testListGatewaySender() {
 
   public void testListGatewayReceiver() {
 
-    Integer lnPort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -144,24 +133,21 @@ public void testListGatewayReceiver() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort });
-    vm4.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort });
+    vm3.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
+    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
 
     vm5
-        .invoke(WANCommandTestBase.class, "createCache",
-            new Object[] { nyPort });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 1, false, 100, 400, false, false, null, false });
+        .invoke(() -> WANCommandTestBase.createCache( nyPort ));
+    vm5.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 1, false, 100, 400, false, false, null, false ));
     vm6
-        .invoke(WANCommandTestBase.class, "createCache",
-            new Object[] { nyPort });
-    vm6.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 1, false, 100, 400, false, false, null, false });
-    vm6.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 1, true, 100, 400, false, false, null, false });
+        .invoke(() -> WANCommandTestBase.createCache( nyPort ));
+    vm6.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 1, false, 100, 400, false, false, null, false ));
+    vm6.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 1, true, 100, 400, false, false, null, false ));
 
     Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY;
@@ -188,8 +174,7 @@ public void testListGatewayReceiver() {
   
   public void testListGatewaySenderGatewayReceiver() throws GfJsonException {
 
-    Integer lnPort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -197,33 +182,29 @@ public void testListGatewaySenderGatewayReceiver() throws GfJsonException {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm6.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
+    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { lnPort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, false });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, false });
+    vm3.invoke(() -> WANCommandTestBase.createCache( lnPort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, false ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
 
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { lnPort });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, false });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, false });
+    vm4.invoke(() -> WANCommandTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, false ));
 
-    vm5.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort });
+    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
 
-    vm7.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { nyPort });
-    vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 1, false, 100, 400, false, false, null, false });
-    vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 1, true, 100, 400, false, false, null, false });
+    vm7.invoke(() -> WANCommandTestBase.createCache( nyPort ));
+    vm7.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 1, false, 100, 400, false, false, null, false ));
+    vm7.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 1, true, 100, 400, false, false, null, false ));
 
     Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY;
@@ -254,8 +235,7 @@ public void testListGatewaySenderGatewayReceiver() throws GfJsonException {
   
   public void testListGatewaySenderGatewayReceiver_group() {
 
-    Integer lnPort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -263,36 +243,32 @@ public void testListGatewaySenderGatewayReceiver_group() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm6.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
+    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { lnPort, "Serial_Sender, Paralle_Sender"});
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, false });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, false });
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort, "Serial_Sender, Paralle_Sender"));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, false ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
 
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { lnPort,"Serial_Sender, Paralle_Sender"});
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, false });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, false });
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort,"Serial_Sender, Paralle_Sender"));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, false ));
 
-    vm5.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup", new Object[] { lnPort, "Paralle_Sender,Receiver_Group" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-      "ln_Parallel", 2, true, 100, 400, false, false, null, false });
+    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "Paralle_Sender,Receiver_Group" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender(
+      "ln_Parallel", 2, true, 100, 400, false, false, null, false ));
     
 
-    vm7.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { nyPort });
-    vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 1, false, 100, 400, false, false, null, false });
-    vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 1, true, 100, 400, false, false, null, false });
+    vm7.invoke(() -> WANCommandTestBase.createCache( nyPort ));
+    vm7.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 1, false, 100, 400, false, false, null, false ));
+    vm7.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 1, true, 100, 400, false, false, null, false ));
 
     Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY + " --" + CliStrings.LIST_GATEWAY__GROUP + "=Serial_Sender";
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index 10d1148adbd5..a1e806b70728 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -43,8 +43,7 @@ public void setUp() throws Exception {
 
   public void testPauseGatewaySender_ErrorConditions() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -52,16 +51,13 @@ public void testPauseGatewaySender_ErrorConditions() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
 
     String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
         + CliStrings.PAUSE_GATEWAYSENDER__ID + "=ln --"
@@ -81,8 +77,7 @@ public void testPauseGatewaySender_ErrorConditions() {
 
   public void testPauseGatewaySender() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -90,32 +85,28 @@ public void testPauseGatewaySender() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
 
     Wait.pause(10000);
     String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
@@ -137,12 +128,12 @@ public void testPauseGatewaySender() {
       fail("testPauseGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
   }
 
   /**
@@ -151,8 +142,7 @@ public void testPauseGatewaySender() {
    */
   public void testPauseGatewaySender_onMember() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -160,21 +150,18 @@ public void testPauseGatewaySender_onMember() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
 
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
     Wait.pause(10000);
     String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
         + CliStrings.PAUSE_GATEWAYSENDER__ID + "=ln --"
@@ -190,8 +177,8 @@ public void testPauseGatewaySender_onMember() {
       fail("testPauseGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
   }
 
   /**
@@ -200,8 +187,7 @@ public void testPauseGatewaySender_onMember() {
    */
   public void testPauseGatewaySender_Group() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -209,32 +195,31 @@ public void testPauseGatewaySender_Group() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
 
     Wait.pause(10000);
     String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
@@ -258,12 +243,12 @@ public void testPauseGatewaySender_Group() {
       fail("testPauseGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
   }
 
   /**
@@ -273,8 +258,7 @@ public void testPauseGatewaySender_Group() {
    */
   public void testPauseGatewaySender_MultipleGroup() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -282,46 +266,45 @@ public void testPauseGatewaySender_MultipleGroup() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1, SenderGroup2" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm6.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup2" });
-    vm6.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm7.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup3" });
-    vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm6.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1, SenderGroup2" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm6.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup2" ));
+    vm6.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm7.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup3" ));
+    vm7.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
 
     Wait.pause(10000);
     String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
@@ -344,22 +327,21 @@ public void testPauseGatewaySender_MultipleGroup() {
       fail("testPauseGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm6.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
 
   public void testResumeGatewaySender_ErrorConditions() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -367,16 +349,13 @@ public void testResumeGatewaySender_ErrorConditions() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
 
     String command = CliStrings.RESUME_GATEWAYSENDER + " --"
         + CliStrings.RESUME_GATEWAYSENDER__ID + "=ln --"
@@ -397,8 +376,7 @@ public void testResumeGatewaySender_ErrorConditions() {
 
   public void testResumeGatewaySender() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -406,43 +384,39 @@ public void testResumeGatewaySender() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-
-    vm3.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+
+    vm3.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
 
     Wait.pause(10000);
     String command = CliStrings.RESUME_GATEWAYSENDER + " --"
@@ -464,12 +438,12 @@ public void testResumeGatewaySender() {
       fail("testResumeGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
 
   /**
@@ -478,8 +452,7 @@ public void testResumeGatewaySender() {
    */
   public void testResumeGatewaySender_onMember() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -487,26 +460,23 @@ public void testResumeGatewaySender_onMember() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { punePort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
+    vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
 
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
 
-    vm3.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm3.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
     Wait.pause(10000);
     String command = CliStrings.RESUME_GATEWAYSENDER + " --"
         + CliStrings.RESUME_GATEWAYSENDER__ID + "=ln --"
@@ -522,8 +492,8 @@ public void testResumeGatewaySender_onMember() {
       fail("testResumeGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
 
   /**
@@ -532,8 +502,7 @@ public void testResumeGatewaySender_onMember() {
    */
   public void testResumeGatewaySender_Group() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -541,43 +510,42 @@ public void testResumeGatewaySender_Group() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-
-    vm3.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+
+    vm3.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
 
     Wait.pause(10000);
     String command = CliStrings.RESUME_GATEWAYSENDER + " --"
@@ -600,12 +568,12 @@ public void testResumeGatewaySender_Group() {
       fail("testResumeGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
   }
 
   /**
@@ -615,8 +583,7 @@ public void testResumeGatewaySender_Group() {
    */
   public void testResumeGatewaySender_MultipleGroup() {
 
-    Integer punePort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -624,63 +591,62 @@ public void testResumeGatewaySender_MultipleGroup() {
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, punePort });
-
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1" });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup1, SenderGroup2" });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm6.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup2" });
-    vm6.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-    vm7.invoke(WANCommandTestBase.class, "createCacheWithGroups", new Object[] {
-        punePort, "SenderGroup3" });
-    vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] { "ln",
-        2, false, 100, 400, false, false, null, true });
-
-    vm3.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANCommandTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm6.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-
-    vm3.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm4.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm7.invoke(WANCommandTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm6.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
-    vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
+
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1" ));
+    vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup1, SenderGroup2" ));
+    vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm6.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup2" ));
+    vm6.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+    vm7.invoke(() -> WANCommandTestBase.createCacheWithGroups(
+        punePort, "SenderGroup3" ));
+    vm7.invoke(() -> WANCommandTestBase.createSender( "ln",
+        2, false, 100, 400, false, false, null, true ));
+
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm6.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+    vm7.invoke(() -> WANCommandTestBase.startSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+
+    vm3.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+    vm4.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+    vm6.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+    vm7.invoke(() -> WANCommandTestBase.pauseSender( "ln" ));
+
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
+    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
 
     Wait.pause(10000);
     String command = CliStrings.RESUME_GATEWAYSENDER + " --"
@@ -703,15 +669,15 @@ public void testResumeGatewaySender_MultipleGroup() {
       fail("testResumeGatewaySender failed as did not get CommandResult");
     }
 
-    vm3.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm4.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm6.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, false });
-    vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
-        "ln", true, true });
+    vm3.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm4.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm5.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm6.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, false ));
+    vm7.invoke(() -> WANCommandTestBase.verifySenderState(
+        "ln", true, true ));
   }
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
index bc2c28fd979b..d01c4c7008d2 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
@@ -44,39 +44,34 @@ public void setUp() throws Exception {
   
   public void testGatewaySenderStatus(){
 
-    Integer lnPort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
     createDefaultSetup(props);
     
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm6.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
+    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { lnPort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, true });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, true});
+    vm3.invoke(() -> WANCommandTestBase.createCache( lnPort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, true ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, true));
 
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { lnPort });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-      "ln_Serial", 2, false, 100, 400, false, false, null, true});
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, true});
+    vm4.invoke(() -> WANCommandTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+      "ln_Serial", 2, false, 100, 400, false, false, null, true));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, true));
     
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { lnPort });
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-      "ln_Serial", 2, false, 100, 400, false, false, null, true});
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, true});
+    vm5.invoke(() -> WANCommandTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANCommandTestBase.createSender(
+      "ln_Serial", 2, false, 100, 400, false, false, null, true));
+    vm5.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, true));
 
     Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -102,20 +97,14 @@ public void testGatewaySenderStatus(){
       fail("testListGatewaySender failed as did not get CommandResult");
     }
     
-    vm3.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Serial" });
-    vm3.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Parallel" });
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
 
-    vm4.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Serial" });
-    vm4.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Parallel" });
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
 
-    vm5.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Serial" });
-    vm5.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Parallel" });
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
+    vm5.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
 
     Wait.pause(10000);
     command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -145,38 +134,32 @@ public void testGatewaySenderStatus(){
   
   public void testGatewaySenderStatus_OnMember(){
 
-    Integer lnPort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm6.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
+    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { lnPort });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, true });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, true});
+    vm3.invoke(() -> WANCommandTestBase.createCache( lnPort ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, true ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, true));
 
-    vm4.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { lnPort });
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-      "ln_Serial", 2, false, 100, 400, false, false, null, true});
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, true});
+    vm4.invoke(() -> WANCommandTestBase.createCache( lnPort ));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+      "ln_Serial", 2, false, 100, 400, false, false, null, true));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, true));
     
-    vm5.invoke(WANCommandTestBase.class, "createCache",
-        new Object[] { lnPort });
+    vm5.invoke(() -> WANCommandTestBase.createCache( lnPort ));
 
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
     
     Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -199,15 +182,11 @@ public void testGatewaySenderStatus_OnMember(){
       fail("testListGatewaySender failed as did not get CommandResult");
     }
     
-    vm3.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Serial" });
-    vm3.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Parallel" });
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
 
-    vm4.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Serial" });
-    vm4.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Parallel" });
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
 
     Wait.pause(10000);
     command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -234,8 +213,7 @@ public void testGatewaySenderStatus_OnMember(){
       fail("testListGatewaySender failed as did not get CommandResult");
     }
     
-    final DistributedMember vm5Member = (DistributedMember) vm5.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm5Member = (DistributedMember) vm5.invoke(() -> WANCommandTestBase.getMember());
    
     command = CliStrings.STATUS_GATEWAYSENDER + " --"
     + CliStrings.STATUS_GATEWAYSENDER__ID + "=ln_Serial --"
@@ -256,45 +234,38 @@ public void testGatewaySenderStatus_OnMember(){
   
   public void testGatewaySenderStatus_OnGroups(){
 
-    Integer lnPort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm7.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
+    vm7.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { lnPort, "Serial_Sender, Paralle_Sender"});
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Serial", 2, false, 100, 400, false, false, null, true });
-    vm3.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, true});
+    vm3.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort, "Serial_Sender, Paralle_Sender"));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Serial", 2, false, 100, 400, false, false, null, true ));
+    vm3.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, true));
 
-    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { lnPort,"Serial_Sender, Paralle_Sender"});
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-      "ln_Serial", 2, false, 100, 400, false, false, null, true});
-    vm4.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, true});
+    vm4.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort,"Serial_Sender, Paralle_Sender"));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+      "ln_Serial", 2, false, 100, 400, false, false, null, true));
+    vm4.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, true));
     
-    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { lnPort,"Paralle_Sender"});
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-      "ln_Serial", 2, false, 100, 400, false, false, null, true});
-    vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] {
-        "ln_Parallel", 2, true, 100, 400, false, false, null, true});
+    vm5.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort,"Paralle_Sender"));
+    vm5.invoke(() -> WANCommandTestBase.createSender(
+      "ln_Serial", 2, false, 100, 400, false, false, null, true));
+    vm5.invoke(() -> WANCommandTestBase.createSender(
+        "ln_Parallel", 2, true, 100, 400, false, false, null, true));
 
-    vm6.invoke(WANCommandTestBase.class, "createCacheWithGroups",
-        new Object[] { lnPort,"Serial_Sender"});
+    vm6.invoke(() -> WANCommandTestBase.createCacheWithGroups( lnPort,"Serial_Sender"));
     
-    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
     
     Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -322,15 +293,11 @@ public void testGatewaySenderStatus_OnGroups(){
       fail("testListGatewaySender failed as did not get CommandResult");
     }
     
-    vm3.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Serial" });
-    vm3.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Parallel" });
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
+    vm3.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
 
-    vm4.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Serial" });
-    vm4.invoke(WANCommandTestBase.class, "startSender",
-        new Object[] { "ln_Parallel" });
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Serial" ));
+    vm4.invoke(() -> WANCommandTestBase.startSender( "ln_Parallel" ));
 
     Wait.pause(10000);
     command = CliStrings.STATUS_GATEWAYSENDER + " --"
@@ -360,22 +327,20 @@ public void testGatewaySenderStatus_OnGroups(){
   
   public void testGatewayReceiverStatus(){
 
-    Integer lnPort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm6.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
+    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort });
-    vm4.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort });
-    vm5.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort });
+    vm3.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
+    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
+    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
     
     Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYRECEIVER; 
@@ -404,9 +369,9 @@ public void testGatewayReceiverStatus(){
       fail("testGatewayReceiverStatus failed as did not get CommandResult");
     }
     
-    vm3.invoke(WANCommandTestBase.class, "stopReceiver");
-    vm4.invoke(WANCommandTestBase.class, "stopReceiver");
-    vm5.invoke(WANCommandTestBase.class, "stopReceiver");
+    vm3.invoke(() -> WANCommandTestBase.stopReceiver());
+    vm4.invoke(() -> WANCommandTestBase.stopReceiver());
+    vm5.invoke(() -> WANCommandTestBase.stopReceiver());
     
     Wait.pause(10000);
     
@@ -438,25 +403,22 @@ public void testGatewayReceiverStatus(){
   
   public void testGatewayReceiverStatus_OnMember(){
 
-    Integer lnPort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm6.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
+    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort });
-    vm4.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort });
-    vm5.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort });
+    vm3.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
+    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
+    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiver( lnPort ));
     
-    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(
-        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> WANCommandTestBase.getMember());
     
     Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYRECEIVER+ " --"
@@ -481,9 +443,9 @@ public void testGatewayReceiverStatus_OnMember(){
       fail("testGatewayReceiverStatus failed as did not get CommandResult");
     }
     
-    vm3.invoke(WANCommandTestBase.class, "stopReceiver");
-    vm4.invoke(WANCommandTestBase.class, "stopReceiver");
-    vm5.invoke(WANCommandTestBase.class, "stopReceiver");
+    vm3.invoke(() -> WANCommandTestBase.stopReceiver());
+    vm4.invoke(() -> WANCommandTestBase.stopReceiver());
+    vm5.invoke(() -> WANCommandTestBase.stopReceiver());
     
     Wait.pause(10000);
     
@@ -514,23 +476,21 @@ public void testGatewayReceiverStatus_OnMember(){
   
   public void testGatewayReceiverStatus_OnGroups(){
 
-    Integer lnPort = (Integer) vm1.invoke(WANCommandTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
 
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]");
     createDefaultSetup(props);
 
-    Integer nyPort = (Integer) vm2.invoke(WANCommandTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm7.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { nyPort });
+    vm7.invoke(() -> WANCommandTestBase.createAndStartReceiver( nyPort ));
 
-    vm3.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup", new Object[] { lnPort, "RG1, RG2" });
-    vm4.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup", new Object[] { lnPort, "RG1, RG2"  });
-    vm5.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup", new Object[] { lnPort, "RG1"  });
-    vm6.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup", new Object[] { lnPort, "RG2"  });
+    vm3.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "RG1, RG2" ));
+    vm4.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "RG1, RG2"  ));
+    vm5.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "RG1"  ));
+    vm6.invoke(() -> WANCommandTestBase.createAndStartReceiverWithGroup( lnPort, "RG2"  ));
     
     Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYRECEIVER + " --"
@@ -555,9 +515,9 @@ public void testGatewayReceiverStatus_OnGroups(){
       fail("testGatewayReceiverStatus failed as did not get CommandResult");
     }
     
-    vm3.invoke(WANCommandTestBase.class, "stopReceiver");
-    vm4.invoke(WANCommandTestBase.class, "stopReceiver");
-    vm5.invoke(WANCommandTestBase.class, "stopReceiver");
+    vm3.invoke(() -> WANCommandTestBase.stopReceiver());
+    vm4.invoke(() -> WANCommandTestBase.stopReceiver());
+    vm5.invoke(() -> WANCommandTestBase.stopReceiver());
 
     Wait.pause(10000);
     command = CliStrings.STATUS_GATEWAYRECEIVER + " --"+ CliStrings.STATUS_GATEWAYRECEIVER__GROUP + "=RG1";
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
index 0fe7b1814b5d..f0096188b189 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
@@ -59,44 +59,37 @@ public void testMBeanCallback() throws Exception {
     VM managing =    getManagingNode();
     VM puneLocator = Host.getLocator();
     
-    int punePort = (Integer) puneLocator.invoke(WANManagementDUnitTest.class, "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANManagementDUnitTest.getLocatorPort());
 
-    Integer nyPort = (Integer)nyLocator.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 12, punePort });
+    Integer nyPort = (Integer)nyLocator.invoke(() -> WANTestBase.createFirstRemoteLocator( 12, punePort ));
     
  
 
-    puneSender.invoke(WANTestBase.class, "createCache", new Object[] { punePort });
-    managing.invoke(WANTestBase.class, "createManagementCache", new Object[] { punePort });
+    puneSender.invoke(() -> WANTestBase.createCache( punePort ));
+    managing.invoke(() -> WANTestBase.createManagementCache( punePort ));
     startManagingNode(managing);
 
     // keep a larger batch to minimize number of exception occurrences in the
     // log
-    puneSender.invoke(WANTestBase.class, "createSender", new Object[] { "pn",
-        12, true, 100, 300, false, false, null, true });
-    managing.invoke(WANTestBase.class, "createSender", new Object[] { "pn",
-      12, true, 100, 300, false, false, null, true });
+    puneSender.invoke(() -> WANTestBase.createSender( "pn",
+        12, true, 100, 300, false, false, null, true ));
+    managing.invoke(() -> WANTestBase.createSender( "pn",
+      12, true, 100, 300, false, false, null, true ));
 
 
-    puneSender.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "pn", 1, 100, false });
-    managing.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "pn", 1, 100, false });
+    puneSender.invoke(() -> WANTestBase.createPartitionedRegion( getTestMethodName() + "_PR", "pn", 1, 100, false ));
+    managing.invoke(() -> WANTestBase.createPartitionedRegion( getTestMethodName() + "_PR", "pn", 1, 100, false ));
     
-    nyReceiver.invoke(WANTestBase.class, "createReceiver",
-        new Object[] { nyPort });
-    nyReceiver.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", null, 1, 100, false });
+    nyReceiver.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    nyReceiver.invoke(() -> WANTestBase.createPartitionedRegion( getTestMethodName() + "_PR", null, 1, 100, false ));
 
-    puneSender.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
-    managing.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
+    puneSender.invoke(() -> WANTestBase.startSender( "pn" ));
+    managing.invoke(() -> WANTestBase.startSender( "pn" ));
 
 
     // make sure all the senders are running before doing any puts
-    puneSender.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "pn" });
-    managing.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "pn" });
+    puneSender.invoke(() -> WANTestBase.waitForSenderRunningState( "pn" ));
+    managing.invoke(() -> WANTestBase.waitForSenderRunningState( "pn" ));
 
     
  
@@ -109,8 +102,7 @@ public void testMBeanCallback() throws Exception {
     stopGatewaySender(puneSender);
     startGatewaySender(puneSender);
     
-    DistributedMember puneMember = (DistributedMember) puneSender.invoke(
-        WANManagementDUnitTest.class, "getMember");
+    DistributedMember puneMember = (DistributedMember) puneSender.invoke(() -> WANManagementDUnitTest.getMember());
 
     checkProxySender(managing, puneMember);
     checkSenderNavigationAPIS(managing, puneMember);
@@ -125,43 +117,35 @@ public void testReceiverMBean() throws Exception {
     VM managing = getManagingNode();
     VM puneLocator = Host.getLocator();
 
-    int punePort = (Integer) puneLocator.invoke(WANManagementDUnitTest.class,
-        "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANManagementDUnitTest.getLocatorPort());
 
-    Integer nyPort = (Integer) nyLocator.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 12, punePort });
+    Integer nyPort = (Integer) nyLocator.invoke(() -> WANTestBase.createFirstRemoteLocator( 12, punePort ));
 
-    puneSender.invoke(WANTestBase.class, "createCache",
-        new Object[] { punePort });
+    puneSender.invoke(() -> WANTestBase.createCache( punePort ));
 
-    nyReceiver.invoke(WANTestBase.class, "createReceiver",
-        new Object[] { nyPort });
-    nyReceiver.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", null, 1, 100, false });
+    nyReceiver.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    nyReceiver.invoke(() -> WANTestBase.createPartitionedRegion( getTestMethodName() + "_PR", null, 1, 100, false ));
     
     // keep a larger batch to minimize number of exception occurrences in the
     // log
-    puneSender.invoke(WANTestBase.class, "createSender", new Object[] { "pn",
-        12, true, 100, 300, false, false, null, true });
+    puneSender.invoke(() -> WANTestBase.createSender( "pn",
+        12, true, 100, 300, false, false, null, true ));
 
-    puneSender.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "pn", 1, 100, false });
+    puneSender.invoke(() -> WANTestBase.createPartitionedRegion( getTestMethodName() + "_PR", "pn", 1, 100, false ));
 
-    puneSender.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
+    puneSender.invoke(() -> WANTestBase.startSender( "pn" ));
 
     // make sure all the senders are running before doing any puts
-    puneSender.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "pn" });
+    puneSender.invoke(() -> WANTestBase.waitForSenderRunningState( "pn" ));
 
-    managing.invoke(WANTestBase.class, "createManagementCache", new Object[] { nyPort });
+    managing.invoke(() -> WANTestBase.createManagementCache( nyPort ));
     startManagingNode(managing);
 
 
     checkSenderMBean(puneSender, getTestMethodName() + "_PR");
     checkReceiverMBean(nyReceiver);
 
-    DistributedMember nyMember = (DistributedMember) nyReceiver.invoke(
-        WANManagementDUnitTest.class, "getMember");
+    DistributedMember nyMember = (DistributedMember) nyReceiver.invoke(() -> WANManagementDUnitTest.getMember());
 
     checkProxyReceiver(managing, nyMember);
     checkReceiverNavigationAPIS(managing, nyMember);
@@ -178,41 +162,37 @@ public void testAsyncEventQueue() throws Exception {
     VM managing =    getManagingNode();
     VM puneLocator = Host.getLocator();
     
-    int punePort = (Integer) puneLocator.invoke(WANManagementDUnitTest.class, "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> WANManagementDUnitTest.getLocatorPort());
 
-    Integer nyPort = (Integer)nyLocator.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 12, punePort });
+    Integer nyPort = (Integer)nyLocator.invoke(() -> WANTestBase.createFirstRemoteLocator( 12, punePort ));
     
  
 
-    puneSender.invoke(WANTestBase.class, "createCache", new Object[] { punePort });
-    managing.invoke(WANTestBase.class, "createManagementCache", new Object[] { punePort });
+    puneSender.invoke(() -> WANTestBase.createCache( punePort ));
+    managing.invoke(() -> WANTestBase.createManagementCache( punePort ));
     startManagingNode(managing);
 
 
-    puneSender.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
-      "pn", false, 100, 100, false, false, "puneSender", false });
-    managing.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
-      "pn", false, 100, 100, false, false, "managing", false });
+    puneSender.invoke(() -> WANTestBase.createAsyncEventQueue(
+      "pn", false, 100, 100, false, false, "puneSender", false ));
+    managing.invoke(() -> WANTestBase.createAsyncEventQueue(
+      "pn", false, 100, 100, false, false, "managing", false ));
 
 
-    puneSender.invoke(WANTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] {
-      getTestMethodName() + "_RR", "pn", false });
-    managing.invoke(WANTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[] {
-      getTestMethodName() + "_RR", "pn", false });
+    puneSender.invoke(() -> WANTestBase.createReplicatedRegionWithAsyncEventQueue(
+      getTestMethodName() + "_RR", "pn", false ));
+    managing.invoke(() -> WANTestBase.createReplicatedRegionWithAsyncEventQueue(
+      getTestMethodName() + "_RR", "pn", false ));
 
     
-    nyReceiver.invoke(WANTestBase.class, "createReceiver",
-        new Object[] { nyPort });
-    nyReceiver.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", null, 1, 100, false });
+    nyReceiver.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    nyReceiver.invoke(() -> WANTestBase.createPartitionedRegion( getTestMethodName() + "_PR", null, 1, 100, false ));
     
     checkAsyncQueueMBean(puneSender);
     checkAsyncQueueMBean(managing);
     
     
-    DistributedMember puneMember = (DistributedMember) puneSender.invoke(
-        WANManagementDUnitTest.class, "getMember");
+    DistributedMember puneMember = (DistributedMember) puneSender.invoke(() -> WANManagementDUnitTest.getMember());
 
     checkProxyAsyncQueue(managing, puneMember);
     
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
index 44a4db29d449..b355c8953179 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
@@ -67,41 +67,32 @@ public void testMBeanCallback() throws Exception {
     VM managing = getManagingNode();
     VM puneLocator = Host.getLocator();
 
-    int punePort = (Integer) puneLocator.invoke(
-        TestRemoteClusterDUnitTest.class, "getLocatorPort");
+    int punePort = (Integer) puneLocator.invoke(() -> TestRemoteClusterDUnitTest.getLocatorPort());
 
-    Integer nyPort = (Integer) nyLocator.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 12, punePort });
+    Integer nyPort = (Integer) nyLocator.invoke(() -> WANTestBase.createFirstRemoteLocator( 12, punePort ));
 
-    puneSender.invoke(WANTestBase.class, "createCache",
-        new Object[] { punePort });
-    managing.invoke(WANTestBase.class, "createManagementCache",
-        new Object[] { punePort });
+    puneSender.invoke(() -> WANTestBase.createCache( punePort ));
+    managing.invoke(() -> WANTestBase.createManagementCache( punePort ));
     startManagingNode(managing);
 
-    puneSender.invoke(WANTestBase.class, "createSender", new Object[] { "pn",
-        12, true, 100, 300, false, false, null, true });
-    managing.invoke(WANTestBase.class, "createSender", new Object[] { "pn", 12,
-        true, 100, 300, false, false, null, true });
+    puneSender.invoke(() -> WANTestBase.createSender( "pn",
+        12, true, 100, 300, false, false, null, true ));
+    managing.invoke(() -> WANTestBase.createSender( "pn", 12,
+        true, 100, 300, false, false, null, true ));
 
-    puneSender.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", "pn", 1, 100, false });
-    managing.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        getTestMethodName() + "_PR", "pn", 1, 100, false });
+    puneSender.invoke(() -> WANTestBase.createPartitionedRegion( getTestMethodName() + "_PR", "pn", 1, 100, false ));
+    managing.invoke(() -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "pn", 1, 100, false ));
 
-    nyReceiver.invoke(WANTestBase.class, "createReceiver",
-        new Object[] { nyPort });
-    nyReceiver.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { getTestMethodName() + "_PR", null, 1, 100, false });
+    nyReceiver.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    nyReceiver.invoke(() -> WANTestBase.createPartitionedRegion( getTestMethodName() + "_PR", null, 1, 100, false ));
 
-    puneSender.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
-    managing.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
+    puneSender.invoke(() -> WANTestBase.startSender( "pn" ));
+    managing.invoke(() -> WANTestBase.startSender( "pn" ));
 
     // make sure all the senders are running before doing any puts
-    puneSender.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "pn" });
-    managing.invoke(WANTestBase.class, "waitForSenderRunningState",
-        new Object[] { "pn" });
+    puneSender.invoke(() -> WANTestBase.waitForSenderRunningState( "pn" ));
+    managing.invoke(() -> WANTestBase.waitForSenderRunningState( "pn" ));
 
     checkSenderMBean(puneSender, getTestMethodName() + "_PR");
     checkSenderMBean(managing, getTestMethodName() + "_PR");
@@ -111,8 +102,7 @@ public void testMBeanCallback() throws Exception {
     stopGatewaySender(puneSender);
     startGatewaySender(puneSender);
 
-    DistributedMember puneMember = (DistributedMember) puneSender.invoke(
-        TestRemoteClusterDUnitTest.class, "getMember");
+    DistributedMember puneMember = (DistributedMember) puneSender.invoke(() -> TestRemoteClusterDUnitTest.getMember());
 
     checkRemoteClusterStatus(managing, puneMember);
 

From 8faa3841d905005fa182b2a43ac23a8bcb3eeb9b Mon Sep 17 00:00:00 2001
From: Dan Smith 
Date: Wed, 10 Feb 2016 16:53:15 -0800
Subject: [PATCH 04/12] Removing tests for invoke methods I removed

---
 .../gemfire/test/dunit/tests/VMDUnitTest.java | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
index 9cea1cc6f68d..26a67c81862e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
@@ -40,22 +40,6 @@ public VMDUnitTest(String name) {
     super(name);
   }
 
-  ////////  Test Methods
-
-  public void notestInvokeNonExistentMethod() {
-    Host host = Host.getHost(0);
-    VM vm = host.getVM(0);
-    try {
-      vm.invoke(() -> VMDUnitTest.nonExistentMethod());
-      fail("Should have thrown an RMIException");
-
-    } catch (RMIException ex) {
-      String s = "Excepted a NoSuchMethodException, got a " +
-        ex.getCause();;
-      assertTrue(s, ex.getCause() instanceof NoSuchMethodException);
-    }
-  }
-
   /**
    * Accessed via reflection.  DO NOT REMOVE
    * @return
@@ -130,25 +114,6 @@ public byte getByte() {
     }
   }
 
-  public void notestInvokeInstanceLong() {
-    Host host = Host.getHost(0);
-    VM vm = host.getVM(0);
-    assertEquals(LONG_VALUE,
-                 vm.invokeLong(new ClassWithLong(), "getLong"));
-  }
-
-  public void notestInvokeInstanceLongNotLong() {
-    Host host = Host.getHost(0);
-    VM vm = host.getVM(0);
-    try {
-      vm.invokeLong(new ClassWithByte(), "getByte");
-      fail("Should have thrown an IllegalArgumentException");
-
-    } catch (IllegalArgumentException ex) {
-
-    }
-  }
-
   protected static class InvokeRunnable
     implements SerializableRunnableIF {
 

From 493d41b37b9077fb75e6a575220db39d41ccc8c4 Mon Sep 17 00:00:00 2001
From: Dan Smith 
Date: Wed, 10 Feb 2016 17:24:07 -0800
Subject: [PATCH 05/12] Dealing with some variables that need to be effectively
 final.

Now that we are using lambdas, variables passed to the lambda should be
effectively final.
---
 .../cache/execute/PRClientServerTestBase.java |   8 +-
 .../fixed/FixedPartitioningDUnitTest.java     | 112 +++++------
 ...WithColocationAndPersistenceDUnitTest.java |  72 +++----
 .../tier/sockets/InterestListDUnitTest.java   |  17 +-
 .../statistics/StatisticsDUnitTest.java       |   3 +-
 .../ClientAuthenticationDUnitTest.java        | 181 +++++++++++-------
 .../ClientAuthorizationDUnitTest.java         | 111 ++++++-----
 .../ClientMultiUserAuthzDUnitTest.java        |  23 ++-
 .../DeltaClientAuthorizationDUnitTest.java    |  38 +++-
 .../security/P2PAuthenticationDUnitTest.java  |  55 +++---
 .../wan/misc/WanAutoDiscoveryDUnitTest.java   |   4 +-
 .../wan/misc/WanValidationsDUnitTest.java     |   8 +-
 .../SerialGatewaySenderQueueDUnitTest.java    |   8 +-
 13 files changed, 354 insertions(+), 286 deletions(-)

diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
index d09a30fefcad..d59049662183 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
@@ -605,10 +605,10 @@ private void createCacheInClientServer() {
 
     server3.invoke(() -> PRClientServerTestBase.createCacheInVm( props ));
 
-    props = new Properties();
-    props.setProperty("mcast-port", "0");
-    props.setProperty("locators", "");
-    client.invoke(() -> PRClientServerTestBase.createCacheInVm( props ));
+    Properties props2 = new Properties();
+    props2.setProperty("mcast-port", "0");
+    props2.setProperty("locators", "");
+    client.invoke(() -> PRClientServerTestBase.createCacheInVm( props2 ));
   }
   
   public static void createCacheInVm(Properties props) {
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
index c715ae7f0e8f..100e444fcc12 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
@@ -154,14 +154,14 @@ public void testSamePartitionName_Primary_OnTwoMembers() {
 
       member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
       fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 9,
               new QuarterPartitionResolver(), null, false));
 
       member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
       fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 9,
               new QuarterPartitionResolver(), null, false));
@@ -200,7 +200,7 @@ public void testSamePartitionName_DifferentNumBuckets() {
       member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
       fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
       fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 8);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 9,
@@ -247,7 +247,7 @@ public void testNumberOfPartitions() {
       fpa2 = FixedPartitionAttributes.createFixedPartition("Q13", false, 3);
       FixedPartitionAttributes fpa3 = FixedPartitionAttributes
           .createFixedPartition("Q11", false, 3);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -257,7 +257,7 @@ public void testNumberOfPartitions() {
       member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
       fpa1 = FixedPartitionAttributes.createFixedPartition("Q13", true, 3);
       fpa2 = FixedPartitionAttributes.createFixedPartition("Q11", false, 3);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 9,
@@ -301,7 +301,7 @@ public void testNumBuckets_totalNumBuckets() {
       member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
       fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
       fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 5,
@@ -341,7 +341,7 @@ public void testPut_PartitionNotAvailableException() {
 
       member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
       fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
               new QuarterPartitionResolver(), null, false));
@@ -435,14 +435,14 @@ public void testPut_ValidateDataOnMember_OnlyPrimary_Accessor() {
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
             new QuarterPartitionResolver(), null, false));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
             new QuarterPartitionResolver(), null, false));
@@ -479,7 +479,7 @@ public void testBug43283() {
 
       FixedPartitionAttributes fpa2 = FixedPartitionAttributes
           .createFixedPartition(Quarter2, true, 3);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa2);
       AsyncInvocation inv2 = member2
           .invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -488,7 +488,7 @@ public void testBug43283() {
 
       FixedPartitionAttributes fpa3 = FixedPartitionAttributes
           .createFixedPartition(Quarter3, true, 3);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa3);
       AsyncInvocation inv3 = member3
           .invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -540,21 +540,21 @@ public void testPut_ValidateDataOnMember_OnlyPrimary_Datastore() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
             new QuarterPartitionResolver(), null, false));
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
             new QuarterPartitionResolver(), null, false));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
             new QuarterPartitionResolver(), null, false));
@@ -587,21 +587,21 @@ public void testDelete_WithoutPut() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       new QuarterPartitionResolver(), null, false ));
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       new QuarterPartitionResolver(), null, false ));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       new QuarterPartitionResolver(), null, false ));
@@ -639,21 +639,21 @@ public void testPut_NoResolver() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
@@ -686,21 +686,21 @@ public void testPut_CallBackWithResolver() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
@@ -764,21 +764,21 @@ public void testPut_FixedPartitionResolver_NoResolver() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
@@ -813,21 +813,21 @@ public void testPut_FixedPartitionResolver_PartitionResolver() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       null, null, false ));
@@ -860,21 +860,21 @@ public void testFPR_DefaultNumBuckets() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       new QuarterPartitionResolver(), null, false ));
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       new QuarterPartitionResolver(), null, false ));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 0, 40, 12,
       new QuarterPartitionResolver(), null, false ));
@@ -919,7 +919,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor() {
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
     fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     fpaList.add(fpa3);
@@ -930,7 +930,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor() {
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
     fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     fpaList.add(fpa3);
@@ -941,7 +941,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor() {
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
     fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     fpaList.add(fpa3);
@@ -981,7 +981,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore() {
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -990,7 +990,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore() {
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -999,7 +999,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore() {
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1039,21 +1039,21 @@ public void testPut_ValidateDataOnMember_OnlySecondary_Datastore() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12,
             new QuarterPartitionResolver(), null, false ));
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12,
             new QuarterPartitionResolver(), null, false ));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 3, 40, 12,
             new QuarterPartitionResolver(), null, false ));
@@ -1067,7 +1067,7 @@ public void testPut_ValidateDataOnMember_OnlySecondary_Datastore() {
 
     createCacheOnMember();
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     createRegionWithPartitionAttributes("Quarter", fpaList, 3, 40, 12,
         new QuarterPartitionResolver(), null, false);
@@ -1130,7 +1130,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed()
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
     fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     fpaList.add(fpa3);
@@ -1141,7 +1141,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed()
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
     fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     fpaList.add(fpa3);
@@ -1152,7 +1152,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Accessor_CacheClosed()
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
     fpa3 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     fpaList.add(fpa3);
@@ -1230,7 +1230,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore_CacheClosed(
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1239,7 +1239,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore_CacheClosed(
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1248,7 +1248,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore_CacheClosed(
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1277,7 +1277,7 @@ public void testPut_ValidateDataOnMember_PrimarySecondary_Datastore_CacheClosed(
         
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1311,7 +1311,7 @@ public void test_Bug46619_Put_ValidateDataOnMember_PrimarySecondary_Datastore_Ca
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1320,7 +1320,7 @@ public void test_Bug46619_Put_ValidateDataOnMember_PrimarySecondary_Datastore_Ca
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1329,7 +1329,7 @@ public void test_Bug46619_Put_ValidateDataOnMember_PrimarySecondary_Datastore_Ca
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1360,7 +1360,7 @@ public void test_Bug46619_Put_ValidateDataOnMember_PrimarySecondary_Datastore_Ca
         
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1369,7 +1369,7 @@ public void test_Bug46619_Put_ValidateDataOnMember_PrimarySecondary_Datastore_Ca
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember_DisableMovePrimary());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter", fpaList, 1, 40, 12,
@@ -1432,7 +1432,7 @@ public void testPut_ValidateDataOnMember_MultiplePrimaries_Datastore_CacheClosed
             new QuarterPartitionResolver(), null, false ));
 
      member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3));    
     fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3));
     fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3));
@@ -1442,7 +1442,7 @@ public void testPut_ValidateDataOnMember_MultiplePrimaries_Datastore_CacheClosed
             new QuarterPartitionResolver(), null, false ));
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3));
     fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3));
     fpaList.add(FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3));
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
index d07179239e65..8d861b75feff 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
@@ -61,7 +61,7 @@ public void testColocation_WithFPROnChildRegion() {
               fpaList, 0, 40, 8, null, null, false ));
 
       fpa1 = FixedPartitionAttributes.createFixedPartition("Order100", true, 2);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Order",
               fpaList, 0, 40, 8, null, "Customer", false ));
@@ -115,7 +115,7 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("40", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -126,7 +126,7 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -137,7 +137,7 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -228,7 +228,7 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("40", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -239,7 +239,7 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -250,7 +250,7 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -345,7 +345,7 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("40", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -358,7 +358,7 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() {
       fpa3 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       FixedPartitionAttributes fpa4 = FixedPartitionAttributes
           .createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -420,7 +420,7 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -446,7 +446,7 @@ public void testColocation_FPRs_ChildUsingAttributesOfParent_HA() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -503,7 +503,7 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("30", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("40", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -516,7 +516,7 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() {
       fpa3 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       FixedPartitionAttributes fpa4 = FixedPartitionAttributes
           .createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -578,7 +578,7 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("30", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -604,7 +604,7 @@ public void testColocation_FPR_Persistence_ChildUsingAttributesOfParent_HA() {
       fpa1 = FixedPartitionAttributes.createFixedPartition("40", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
       fpa3 = FixedPartitionAttributes.createFixedPartition("20", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       fpaList.add(fpa3);
@@ -653,7 +653,7 @@ public void testFPR_Persistence_OneMemberAlive() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
             fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true ));
@@ -667,7 +667,7 @@ public void testFPR_Persistence_OneMemberAlive() {
 
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
             fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true ));
@@ -676,14 +676,14 @@ public void testFPR_Persistence_OneMemberAlive() {
 
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
             fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true ));
 
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
             fpaList, 0, 40, 12, new QuarterPartitionResolver(), null, true ));
@@ -722,7 +722,7 @@ public void testFPR_Persistence() {
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -743,7 +743,7 @@ public void testFPR_Persistence() {
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -759,7 +759,7 @@ public void testFPR_Persistence() {
     member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member1.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -799,7 +799,7 @@ public void testColocation_FPR_Persistence_Colocation_OneMemberAlive() {
 
       fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer",
@@ -851,7 +851,7 @@ public void testColocation_FPR_Persistence_Colocation_OneMemberAlive() {
       member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
       fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       AsyncInvocation[] async = new AsyncInvocation[2];
@@ -905,7 +905,7 @@ public void testColocation_FPR_Persistence_Colocation() {
 
       fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer",
@@ -949,7 +949,7 @@ public void testColocation_FPR_Persistence_Colocation() {
       member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
       fpa1 = FixedPartitionAttributes.createFixedPartition("20", true, 5);
       fpa2 = FixedPartitionAttributes.createFixedPartition("10", false, 5);
-      fpaList = new ArrayList();
+      fpaList.clear();
       fpaList.add(fpa1);
       fpaList.add(fpa2);
       member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Customer",
@@ -980,7 +980,7 @@ public void testFPR_Persistence2() {
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1000,7 +1000,7 @@ public void testFPR_Persistence2() {
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1009,7 +1009,7 @@ public void testFPR_Persistence2() {
     member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member1.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1042,7 +1042,7 @@ public void testFPR_Persistence3() {
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1051,7 +1051,7 @@ public void testFPR_Persistence3() {
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member3.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1060,7 +1060,7 @@ public void testFPR_Persistence3() {
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member4.invoke(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1086,7 +1086,7 @@ public void testFPR_Persistence3() {
     member4.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter4, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter1, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member4.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1095,7 +1095,7 @@ public void testFPR_Persistence3() {
     member3.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter3, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter4, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member3.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1104,7 +1104,7 @@ public void testFPR_Persistence3() {
     member2.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter2, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter3, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member2.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
@@ -1113,7 +1113,7 @@ public void testFPR_Persistence3() {
     member1.invoke(() -> FixedPartitioningTestBase.createCacheOnMember());
     fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true, 3);
     fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, false, 3);
-    fpaList = new ArrayList();
+    fpaList.clear();
     fpaList.add(fpa1);
     fpaList.add(fpa2);
     member1.invokeAsync(() -> FixedPartitioningTestBase.createRegionWithPartitionAttributes( "Quarter",
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index d43b067be465..3fa3f25a517b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -378,17 +378,14 @@ public void testInterestListRegistrationOnServer()
      * create Entries in all the vms
      * register interest in various ways and ensure that registration listeners
      * are properly invoked
+     * @throws Exception 
      */
-    public void testInterestRegistrationListeners() {
-      int port2 = 0;
-
-      try {
-        createCache();
-        server = addCacheServer();
-        port2 = server.getPort();
-      } catch (Exception ex) {
-        Assert.fail("Cache creation threw an exception", ex);
-      }
+    public void testInterestRegistrationListeners() throws Exception {
+      int port2;
+
+      createCache();
+      server = addCacheServer();
+      port2 = server.getPort();
 
       addRegisterInterestListener();
       vm0.invoke(() -> InterestListDUnitTest.addRegisterInterestListener());
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index c038215b62a6..9fd18e6c98f7 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -543,7 +543,8 @@ public void run2() throws CacheException {
     
     int puts = 0;
     for (int pubVM = 0; pubVM < NUM_PUBS; pubVM++) {
-      int vmPuts = (int)pubs[pubVM].invoke(() -> readIntStat(new File(pubArchives[pubVM]), "PubSubStats", "puts"));
+      int currentPubVM = pubVM;
+      int vmPuts = (int)pubs[pubVM].invoke(() -> readIntStat(new File(pubArchives[currentPubVM]), "PubSubStats", "puts"));
       assertTrue(vmPuts > 0);
       assertEquals(MAX_PUTS * NUM_PUB_THREADS, vmPuts);
       puts += vmPuts;
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
index b8660117f4ac..8446eae10f3c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
@@ -237,10 +237,8 @@ public void itestValidCredentials(Boolean multiUser) {
       LogWriterUtils.getLogWriter().info(
           "testValidCredentials: For second client credentials: "
               + credentials2 + " : " + javaProps2);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
-              null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
-              null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClientsNoException(multiUser, authInit, port1, port2, credentials1,
+          javaProps1, credentials2, javaProps2);
 
       // Perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -277,8 +275,8 @@ public void itestNoCredentials(Boolean multiUser) {
       Integer locPort1 = SecurityTestUtil.getLocatorPort();
       Integer locPort2 = SecurityTestUtil.getLocatorPort();
       String locString = SecurityTestUtil.getLocatorString();
-      Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
-              javaProps )));
+      Integer port1 = createServer1(extraProps, javaProps, authenticator,
+          locPort1, locString);
       Integer port2 = ((Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps,
               javaProps )));
 
@@ -288,8 +286,8 @@ public void itestNoCredentials(Boolean multiUser) {
       LogWriterUtils.getLogWriter().info(
           "testNoCredentials: For first client credentials: " + credentials1
               + " : " + javaProps1);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
-              null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient1NoException(multiUser, authInit, port1, port2, credentials1,
+          javaProps1);
 
       // Perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -335,8 +333,8 @@ public void itestInvalidCredentials(Boolean multiUser) {
       Integer locPort1 = SecurityTestUtil.getLocatorPort();
       Integer locPort2 = SecurityTestUtil.getLocatorPort();
       String locString = SecurityTestUtil.getLocatorString();
-      Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
-              javaProps )));
+      Integer port1 = createServer1(extraProps, javaProps, authenticator,
+          locPort1, locString);
       Integer port2 = ((Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps,
               javaProps )));
 
@@ -346,8 +344,8 @@ public void itestInvalidCredentials(Boolean multiUser) {
       LogWriterUtils.getLogWriter().info(
           "testInvalidCredentials: For first client credentials: "
               + credentials1 + " : " + javaProps1);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
-              null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient1NoException(multiUser, authInit, port1, port2, credentials1,
+          javaProps1);
 
       // Perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -383,8 +381,8 @@ public void itestInvalidAuthInit(Boolean multiUser) {
       // Start the server
       Integer locPort1 = SecurityTestUtil.getLocatorPort();
       String locString = SecurityTestUtil.getLocatorString();
-      Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
-              javaProps )));
+      Integer port1 = createServer1(extraProps, javaProps, authenticator,
+          locPort1, locString);
 
       Properties credentials = gen.getValidCredentials(1);
       javaProps = gen.getJavaProperties();
@@ -397,6 +395,13 @@ public void itestInvalidAuthInit(Boolean multiUser) {
             Integer.valueOf(SecurityTestUtil.AUTHREQ_EXCEPTION) });
   }
 
+  protected Integer createServer1(Properties extraProps, Properties javaProps,
+      String authenticator, Integer locPort1, String locString) {
+    Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
+            javaProps )));
+    return port1;
+  }
+
   public void testNoAuthInitWithCredentials() {
     itestNoAuthInitWithCredentials(Boolean.FALSE);
   }
@@ -419,8 +424,8 @@ public void itestNoAuthInitWithCredentials(Boolean multiUser) {
       Integer locPort1 = SecurityTestUtil.getLocatorPort();
       Integer locPort2 = SecurityTestUtil.getLocatorPort();
       String locString = SecurityTestUtil.getLocatorString();
-      Integer port1 = ((Integer)server1.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort1, locString, authenticator, extraProps,
-              javaProps )));
+      Integer port1 = createServer1(extraProps, javaProps, authenticator,
+          locPort1, locString);
       Integer port2 = ((Integer)server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, authenticator, extraProps,
               javaProps )));
 
@@ -443,9 +448,9 @@ public void itestNoAuthInitWithCredentials(Boolean multiUser) {
       
 
       // Now also try with invalid credentials
-      credentials2 = gen.getInvalidCredentials(5);
-      javaProps2 = gen.getJavaProperties();
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2, port1, port2, null,
+      Properties credentials3 = gen.getInvalidCredentials(5);
+      Properties javaProps3 = gen.getJavaProperties();
+      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials3, javaProps3, port1, port2, null,
           multiUser, new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
   }
 
@@ -472,23 +477,23 @@ public void itestInvalidAuthenticator(Boolean multiUser) {
               extraProps, javaProps ));
 
       // Trying to create the region on client should throw a security exception
-      Properties credentials = gen.getValidCredentials(1);
-      javaProps = gen.getJavaProperties();
+      Properties credentials2 = gen.getValidCredentials(1);
+      Properties javaProps2 = gen.getJavaProperties();
       LogWriterUtils.getLogWriter().info(
           "testInvalidAuthenticator: For first client credentials: "
-              + credentials + " : " + javaProps);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials, javaProps, port1, null,
+              + credentials2 + " : " + javaProps2);
+      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, null,
               new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
       client1.invoke(() -> SecurityTestUtil.closeCache());
       
 
       // Also test with invalid credentials
-      credentials = gen.getInvalidCredentials(1);
-      javaProps = gen.getJavaProperties();
+      Properties credentials3 = gen.getInvalidCredentials(1);
+      Properties javaProps3 = gen.getJavaProperties();
       LogWriterUtils.getLogWriter().info(
           "testInvalidAuthenticator: For first client credentials: "
-              + credentials + " : " + javaProps);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials, javaProps, port1, null,
+              + credentials3 + " : " + javaProps3);
+      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials3, javaProps3, port1, null,
               new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
   }
 
@@ -529,10 +534,8 @@ public void itestNoAuthenticatorWithCredentials(Boolean multiUser) {
       LogWriterUtils.getLogWriter().info(
           "testNoAuthenticatorWithCredentials: For second client credentials: "
               + credentials2 + " : " + javaProps2);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
-              null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
-              null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClientsNoException(multiUser, authInit, port1, port2, credentials1,
+          javaProps1, credentials2, javaProps2);
 
       // Perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -581,10 +584,8 @@ public void itestCredentialsWithFailover(Boolean multiUser) {
       LogWriterUtils.getLogWriter().info(
           "testCredentialsWithFailover: For second client credentials: "
               + credentials2 + " : " + javaProps2);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
-              null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
-              null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClientsNoException(multiUser, authInit, port1, port2, credentials1,
+          javaProps1, credentials2, javaProps2);
 
       // Perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts( new Integer(2) ));
@@ -620,12 +621,12 @@ public void itestCredentialsWithFailover(Boolean multiUser) {
 
       // Now try to connect client1 with invalid credentials
       // Verify that the creation of region throws security exception
-      credentials1 = gen.getInvalidCredentials(7);
-      javaProps1 = gen.getJavaProperties();
+      Properties credentials3 = gen.getInvalidCredentials(7);
+      Properties javaProps3 = gen.getJavaProperties();
       LogWriterUtils.getLogWriter().info(
           "testCredentialsWithFailover: For first client invalid credentials: "
-              + credentials1 + " : " + javaProps1);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
+              + credentials3 + " : " + javaProps3);
+      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials3, javaProps3, port1, port2,
               null, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
 
       if (multiUser) {
@@ -636,6 +637,15 @@ public void itestCredentialsWithFailover(Boolean multiUser) {
       }
   }
 
+  protected void createClientsNoException(Boolean multiUser, String authInit,
+      Integer port1, Integer port2, Properties credentials1,
+      Properties javaProps1, Properties credentials2, Properties javaProps2) {
+    createClient1NoException(multiUser, authInit, port1, port2, credentials1,
+        javaProps1);
+    client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
+            null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+  }
+
   public void testCredentialsForNotifications() {
     itestCredentialsForNotifications(Boolean.FALSE);
   }
@@ -677,12 +687,12 @@ public void itestCredentialsForNotifications(Boolean multiUser) {
       LogWriterUtils.getLogWriter().info(
           "testCredentialsForNotifications: For second client credentials: "
               + credentials2 + " : " + javaProps2);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1, javaProps1, port1, port2,
-              null, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient1NoException(multiUser, authInit, port1, port2, credentials1,
+          javaProps1);
       // Set up zero forward connections to check notification handshake only
       Object zeroConns = new Integer(0);
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
-              zeroConns, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient2NoException(multiUser, authInit, port1, port2, credentials2,
+          javaProps2, zeroConns);
 
       // Register interest on all keys on second client
       client2
@@ -733,8 +743,8 @@ public void itestCredentialsForNotifications(Boolean multiUser) {
       LogWriterUtils.getLogWriter().info(
           "testCredentialsForNotifications: For second client invalid credentials: "
               + credentials2 + " : " + javaProps2);
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
-              zeroConns, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
+      createClient2WithException(multiUser, authInit, port1, port2,
+          credentials2, javaProps2, zeroConns);
 
       // Now try to connect client2 with invalid auth-init method
       // Trying to create the region on client with valid credentials should
@@ -754,14 +764,10 @@ public void itestCredentialsForNotifications(Boolean multiUser) {
         server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, port2,
                 "com.gemstone.gemfire.none", extraProps, javaProps ));
 
-        // Trying to create the region on client with valid/invalid credentials
-        // should throw a security exception
-        client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1,
-                javaProps1, port1, port2, zeroConns, multiUser,
-                new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
-        client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
-                javaProps2, port1, port2, zeroConns, multiUser,
-                new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
+        createClient2WithException(multiUser, authInit, port1, port2,
+            credentials1, javaProps1, zeroConns);
+        createClient1WithException(multiUser, authInit, port1, port2,
+            credentials2, javaProps2, zeroConns);
       }
       else {
         LogWriterUtils.getLogWriter().info(
@@ -780,14 +786,11 @@ public void itestCredentialsForNotifications(Boolean multiUser) {
         client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials1, javaProps1,
                 port1, port2, null, multiUser,
                 new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
-        client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2,
-                port1, port2, zeroConns, multiUser,
-                new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
+        createClient2AuthReqException(multiUser, port1, port2, credentials2,
+            javaProps2, zeroConns);
 
-        // Now also try with invalid credentials on client2
-        client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2,
-                port1, port2, zeroConns, multiUser,
-                new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
+        createClient2AuthReqException(multiUser, port1, port2, credentials2,
+            javaProps2, zeroConns);
       }
       else {
         LogWriterUtils.getLogWriter().info(
@@ -804,12 +807,10 @@ public void itestCredentialsForNotifications(Boolean multiUser) {
                 null, extraProps, javaProps ));
         server2.invoke(() -> ClientAuthenticationDUnitTest.createCacheServer( locPort2, locString, port2,
                 null, extraProps, javaProps ));
-        client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1,
-                javaProps1, port1, port2, null, multiUser,
-                new Integer(SecurityTestUtil.NO_EXCEPTION) ));
-        client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
-                javaProps2, port1, port2, zeroConns, multiUser,
-                new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+        createClient1NoException(multiUser, authInit, port1, port2,
+            credentials1, javaProps1);
+        createClient2NoException(multiUser, authInit, port1, port2,
+            credentials2, javaProps2, zeroConns);
 
         // Register interest on all keys on second client
         client2.invoke(() -> ClientAuthenticationDUnitTest.registerAllInterest());
@@ -821,12 +822,10 @@ public void itestCredentialsForNotifications(Boolean multiUser) {
         client2.invoke(() -> SecurityTestUtil.doLocalGets( new Integer(4) ));
 
         // Now also try with valid credentials on client2
-        client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
-                javaProps2, port1, port2, null, multiUser,
-                new Integer(SecurityTestUtil.NO_EXCEPTION) ));
-        client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials1,
-                javaProps1, port1, port2, zeroConns, multiUser,
-                new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+        createClient1NoException(multiUser, authInit, port1, port2,
+            credentials2, javaProps2);
+        createClient2NoException(multiUser, authInit, port1, port2,
+            credentials1, javaProps1, zeroConns);
 
         // Register interest on all keys on second client
         client2.invoke(() -> ClientAuthenticationDUnitTest.registerAllInterest());
@@ -844,6 +843,44 @@ public void itestCredentialsForNotifications(Boolean multiUser) {
       }
   }
 
+  protected void createClient1NoException(Boolean multiUser, String authInit,
+      Integer port1, Integer port2, Properties credentials2,
+      Properties javaProps2) {
+    client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
+            javaProps2, port1, port2, null, multiUser,
+            new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+  }
+
+  protected void createClient2AuthReqException(Boolean multiUser, Integer port1,
+      Integer port2, Properties credentials2, Properties javaProps2,
+      Object zeroConns) {
+    client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( null, credentials2, javaProps2,
+            port1, port2, zeroConns, multiUser,
+            new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) ));
+  }
+
+  protected void createClient1WithException(Boolean multiUser, String authInit,
+      Integer port1, Integer port2, Properties credentials2,
+      Properties javaProps2, Object zeroConns) {
+    client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2,
+            javaProps2, port1, port2, zeroConns, multiUser,
+            new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
+  }
+
+  protected void createClient2WithException(Boolean multiUser, String authInit,
+      Integer port1, Integer port2, Properties credentials2,
+      Properties javaProps2, Object zeroConns) {
+    client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
+            zeroConns, multiUser, new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) ));
+  }
+
+  protected void createClient2NoException(Boolean multiUser, String authInit,
+      Integer port1, Integer port2, Properties credentials2,
+      Properties javaProps2, Object zeroConns) {
+    client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, credentials2, javaProps2, port1, port2,
+            zeroConns, multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+  }
+
   //////////////////////////////////////////////////////////////////////////////
   // Tests for MULTI_USER_MODE start here
   //////////////////////////////////////////////////////////////////////////////
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
index fe2a62d36c30..0cbc1aabcd85 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
@@ -217,10 +217,8 @@ public void testAllowPutsGets() {
       // Start servers with all required properties
       Properties serverProps = buildProperties(authenticator, accessor, false,
           extraAuthProps, extraAuthzProps);
-      Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
-              SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
-      Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
-              SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+      Integer port1 = createServer1(javaProps, serverProps);
+      Integer port2 = createServer2(javaProps, serverProps);
 
       // Start client1 with valid CREATE credentials
       Properties createCredentials = gen.getAllowedCredentials(
@@ -230,8 +228,8 @@ public void testAllowPutsGets() {
       LogWriterUtils.getLogWriter().info(
           "testAllowPutsGets: For first client credentials: "
               + createCredentials);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, javaProps, port1, port2,
-              null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient1NoException(javaProps, authInit, port1, port2,
+          createCredentials);
 
       // Start client2 with valid GET credentials
       Properties getCredentials = gen.getAllowedCredentials(
@@ -242,8 +240,8 @@ public void testAllowPutsGets() {
           .info(
               "testAllowPutsGets: For second client credentials: "
                   + getCredentials);
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, javaProps, port1, port2,
-              null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient2NoException(javaProps, authInit, port1, port2,
+          getCredentials);
 
       // Perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -254,6 +252,32 @@ public void testAllowPutsGets() {
           new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) ));
   }
 
+  protected void createClient2NoException(Properties javaProps, String authInit,
+      Integer port1, Integer port2, Properties getCredentials) {
+    client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, javaProps, port1, port2,
+            null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+  }
+
+  protected void createClient1NoException(Properties javaProps, String authInit,
+      Integer port1, Integer port2, Properties createCredentials) {
+    client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, javaProps, port1, port2,
+            null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+  }
+
+  protected Integer createServer2(Properties javaProps,
+      Properties serverProps) {
+    Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
+            SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+    return port2;
+  }
+
+  protected Integer createServer1(Properties javaProps,
+      Properties serverProps) {
+    Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
+            SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+    return port1;
+  }
+
   public void testDisallowPutsGets() {
 
       AuthzCredentialGenerator gen = getXmlAuthzGenerator();
@@ -291,18 +315,14 @@ public void testDisallowPutsGets() {
       // Start servers with all required properties
       Properties serverProps = buildProperties(authenticator, accessor, false,
           extraAuthProps, extraAuthzProps);
-      Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
-              SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
-      Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
-              SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+      Integer port1 = createServer1(javaProps, serverProps);
+      Integer port2 = createServer2(javaProps, serverProps);
 
-      // Start client1 with valid CREATE credentials
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1,
-              port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient1NoException(createJavaProps, authInit, port1, port2,
+          createCredentials);
 
-      // Start client2 with invalid GET credentials
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
-              null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient2NoException(getJavaProps, authInit, port1, port2,
+          getCredentials);
 
       // Perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -320,8 +340,8 @@ public void testDisallowPutsGets() {
       LogWriterUtils.getLogWriter().info(
           "testDisallowPutsGets: For second client with GET credentials: "
               + getCredentials);
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
-              null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient2NoException(getJavaProps, authInit, port1, port2,
+          getCredentials);
 
       // Verify that the gets succeed
       client2.invoke(() -> SecurityTestUtil.doGets(
@@ -349,8 +369,7 @@ public void testInvalidAccessor() {
       // Start server1 with invalid accessor
       Properties serverProps = buildProperties(authenticator,
           "com.gemstone.none", false, extraAuthProps, extraAuthzProps);
-      Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
-              SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+      Integer port1 = createServer1(javaProps, serverProps);
       Integer port2 = new Integer(AvailablePort
           .getRandomAvailablePort(AvailablePort.SOCKET));
 
@@ -384,15 +403,13 @@ public void testInvalidAccessor() {
       LogWriterUtils.getLogWriter().info("testInvalidAccessor: Using accessor: " + accessor);
       serverProps = buildProperties(authenticator, accessor, false,
           extraAuthProps, extraAuthzProps);
-      server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps,
-              javaProps ));
+      createServer2(javaProps, serverProps, port2);
       server1.invoke(() -> SecurityTestUtil.closeCache());
 
-      // Client creation should be successful now
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1,
-              port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
-              null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient1NoException(createJavaProps, authInit, port1, port2,
+          createCredentials);
+      createClient2NoException(getJavaProps, authInit, port1, port2,
+          getCredentials);
 
       // Now perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -403,6 +420,12 @@ public void testInvalidAccessor() {
           new Integer(4), new Integer(SecurityTestUtil.NO_EXCEPTION) ));
   }
 
+  protected void createServer2(Properties javaProps, Properties serverProps,
+      Integer port2) {
+    server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps,
+            javaProps ));
+  }
+
   public void testPutsGetsWithFailover() {
       AuthzCredentialGenerator gen = getXmlAuthzGenerator();
       CredentialGenerator cGen = gen.getCredentialGenerator();
@@ -423,8 +446,7 @@ public void testPutsGetsWithFailover() {
       // Start servers with all required properties
       Properties serverProps = buildProperties(authenticator, accessor, false,
           extraAuthProps, extraAuthzProps);
-      Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
-              SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+      Integer port1 = createServer1(javaProps, serverProps);
       // Get a port for second server but do not start it
       // This forces the clients to connect to the first server
       Integer port2 = new Integer(AvailablePort
@@ -438,8 +460,8 @@ public void testPutsGetsWithFailover() {
       LogWriterUtils.getLogWriter().info(
           "testPutsGetsWithFailover: For first client credentials: "
               + createCredentials);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, createJavaProps, port1,
-              port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient1NoException(createJavaProps, authInit, port1, port2,
+          createCredentials);
 
       // Start client2 with valid GET credentials
       Properties getCredentials = gen.getAllowedCredentials(
@@ -449,8 +471,8 @@ public void testPutsGetsWithFailover() {
       LogWriterUtils.getLogWriter().info(
           "testPutsGetsWithFailover: For second client credentials: "
               + getCredentials);
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
-              null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient2NoException(getJavaProps, authInit, port1, port2,
+          getCredentials);
 
       // Perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -459,9 +481,7 @@ public void testPutsGetsWithFailover() {
       client2.invoke(() -> SecurityTestUtil.doGets(
           new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION) ));
 
-      // start the second one and stop the first server to force a failover
-      server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer( SecurityTestUtil.getLocatorPort(), port2, serverProps,
-              javaProps ));
+      createServer2(javaProps, serverProps, port2);
       server1.invoke(() -> SecurityTestUtil.closeCache());
 
       // Perform some put operations from client1
@@ -481,9 +501,8 @@ public void testPutsGetsWithFailover() {
           "testPutsGetsWithFailover: For second client disallowed GET credentials: "
               + noGetCredentials);
 
-      // Re-connect client2 with invalid GET credentials
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, noGetCredentials, getJavaProps, port1,
-              port2, null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient2NoException(getJavaProps, authInit, port1, port2,
+          noGetCredentials);
 
       // Perform some put operations from client1
       client1.invoke(() -> SecurityTestUtil.doPuts(
@@ -504,9 +523,8 @@ public void testPutsGetsWithFailover() {
       client2.invoke(() -> SecurityTestUtil.doNGets(
           new Integer(4), new Integer(SecurityTestUtil.NOTAUTHZ_EXCEPTION) ));
 
-      // Try to connect client2 with reader credentials
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, getJavaProps, port1, port2,
-              null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient2NoException(getJavaProps, authInit, port1, port2,
+          getCredentials);
 
       // Verify that the gets succeed
       client2.invoke(() -> SecurityTestUtil.doNGets(
@@ -632,10 +650,7 @@ public void testUnregisterInterestWithFailover() {
           executeRIOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
               extraAuthzProps, javaProps);
           if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
-            // Failover to the second server and run the block again
-            server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
-                    SecurityTestUtil.getLocatorPort(), port2, serverProps,
-                    javaProps ));
+            createServer2(javaProps, serverProps, port2);
             server1.invoke(() -> SecurityTestUtil.closeCache());
             executeRIOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
                 extraAuthzProps, javaProps);
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java
index fcf735cb5932..74260edb795c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java
@@ -83,10 +83,7 @@ public void testOps1() throws Exception {
           extraAuthProps, extraAuthzProps);
       Integer port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
       Integer port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-      server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port1, serverProps,
-              javaProps));
-      server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port2, serverProps,
-              javaProps));
+      createCacheServers(javaProps, serverProps, port1, port2);
 
       if (!prepareClientsForOps(gen, cGen, new OperationCode[] {
           OperationCode.PUT, OperationCode.PUT}, new OperationCode[] {
@@ -359,10 +356,7 @@ public void testOps2() throws Exception {
           extraAuthProps, extraAuthzProps);
       Integer port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
       Integer port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-      server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port1, serverProps,
-              javaProps));
-      server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port2, serverProps,
-              javaProps));
+      createCacheServers(javaProps, serverProps, port1, port2);
 
       // Start client1 with valid/invalid QUERY credentials
       Properties[] client1Credentials = new Properties[] {
@@ -466,6 +460,14 @@ public void testOps2() throws Exception {
 
   }
 
+  protected void createCacheServers(Properties javaProps,
+      Properties serverProps, Integer port1, Integer port2) {
+    server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port1, serverProps,
+            javaProps));
+    server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port2, serverProps,
+            javaProps));
+  }
+
   public void testOpsWithClientsInDifferentModes() throws Exception {
     Iterator iter = getDummyGeneratorCombos().iterator();
     while (iter.hasNext()) {
@@ -488,10 +490,7 @@ public void testOpsWithClientsInDifferentModes() throws Exception {
           extraAuthProps, extraAuthzProps);
       Integer port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
       Integer port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-      server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port1, serverProps,
-              javaProps));
-      server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(SecurityTestUtil.getLocatorPort(), port2, serverProps,
-              javaProps));
+      createCacheServers(javaProps, serverProps, port1, port2);
 
       if (!prepareClientsForOps(gen, cGen, new OperationCode[] {
           OperationCode.PUT, OperationCode.PUT}, new OperationCode[] {
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
index 44089019b947..5c184d1bd63b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
@@ -141,10 +141,8 @@ public void testAllowPutsGets() throws Exception {
       // Start servers with all required properties
       Properties serverProps = buildProperties(authenticator, accessor, false,
           extraAuthProps, extraAuthzProps);
-      Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
-              SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
-      Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
-              SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+      Integer port1 = createServer1(javaProps, serverProps);
+      Integer port2 = createServer2(javaProps, serverProps);
 
       // Start client1 with valid CREATE credentials
       Properties createCredentials = gen.getAllowedCredentials(
@@ -154,8 +152,7 @@ public void testAllowPutsGets() throws Exception {
       LogWriterUtils.getLogWriter().info(
           "testAllowPutsGets: For first client credentials: "
               + createCredentials);
-      client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, javaProps, port1, port2,
-              null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient1(javaProps, authInit, port1, port2, createCredentials);
 
       // Start client2 with valid GET credentials
       Properties getCredentials = gen.getAllowedCredentials(
@@ -166,8 +163,7 @@ public void testAllowPutsGets() throws Exception {
           .info(
               "testAllowPutsGets: For second client credentials: "
                   + getCredentials);
-      client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, javaProps, port1, port2,
-              null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+      createClient2(javaProps, authInit, port1, port2, getCredentials);
 
       // Perform some put operations from client1
       client1.invoke(() -> DeltaClientAuthorizationDUnitTest.doPuts(
@@ -180,6 +176,32 @@ public void testAllowPutsGets() throws Exception {
           new Integer(2), new Integer(SecurityTestUtil.NO_EXCEPTION), Boolean.FALSE  ));
   }
 
+  protected void createClient2(Properties javaProps, String authInit,
+      Integer port1, Integer port2, Properties getCredentials) {
+    client2.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, getCredentials, javaProps, port1, port2,
+            null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+  }
+
+  protected void createClient1(Properties javaProps, String authInit,
+      Integer port1, Integer port2, Properties createCredentials) {
+    client1.invoke(() -> ClientAuthenticationDUnitTest.createCacheClient( authInit, createCredentials, javaProps, port1, port2,
+            null, new Integer(SecurityTestUtil.NO_EXCEPTION) ));
+  }
+
+  protected Integer createServer2(Properties javaProps,
+      Properties serverProps) {
+    Integer port2 = ((Integer)server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
+            SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+    return port2;
+  }
+
+  protected Integer createServer1(Properties javaProps,
+      Properties serverProps) {
+    Integer port1 = ((Integer)server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
+            SecurityTestUtil.getLocatorPort(), serverProps, javaProps )));
+    return port1;
+  }
+
   public static void doPuts(Integer num, Integer expectedResult,
       boolean newVals) {
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
index dd01b3bf0cc9..d47b1c409020 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
@@ -173,9 +173,7 @@ public void testP2PAuthenticationWithInvalidAuthInitialize() throws Exception {
             authInit);
     setProperty(props, DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME,
             authenticator);
-    locatorVM.invoke(() -> SecurityTestUtil.startLocator(
-            getUniqueName(), new Integer(port), props, javaProps,
-            expectedExceptions));
+    startLocator(props, javaProps, port);
 
     LogWriter dsLogger = LogWriterUtils.createLogWriter(props);
     SecurityTestUtil.addExpectedExceptions(expectedExceptions, dsLogger);
@@ -192,6 +190,13 @@ public void testP2PAuthenticationWithInvalidAuthInitialize() throws Exception {
 
   }
 
+  protected void startLocator(Properties props, Properties javaProps,
+      int port) {
+    locatorVM.invoke(() -> SecurityTestUtil.startLocator(
+            getUniqueName(), new Integer(port), props, javaProps,
+            expectedExceptions));
+  }
+
   // Authenticator is incorrect
   public void testP2PAuthenticationWithInvalidAuthenticator() throws Exception {
     disconnectAllFromDS();
@@ -211,9 +216,7 @@ public void testP2PAuthenticationWithInvalidAuthenticator() throws Exception {
             authInit);
     setProperty(props, DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME,
             authenticator);
-    locatorVM.invoke(() -> SecurityTestUtil.startLocator(
-            getUniqueName(), new Integer(port), props, javaProps,
-            expectedExceptions ));
+    startLocator(props, javaProps, port);
 
     LogWriter dsLogger = LogWriterUtils.createLogWriter(props);
     SecurityTestUtil.addExpectedExceptions(expectedExceptions, dsLogger);
@@ -251,9 +254,7 @@ public void testP2PAuthenticationWithNoCredentials() throws Exception {
             authInit);
     setProperty(props, DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME,
             authenticator);
-    locatorVM.invoke(() -> SecurityTestUtil.startLocator(
-            getUniqueName(), new Integer(port), props, javaProps,
-            expectedExceptions ));
+    startLocator(props, javaProps, port);
 
     LogWriter dsLogger = LogWriterUtils.createLogWriter(props);
     SecurityTestUtil.addExpectedExceptions(expectedExceptions, dsLogger);
@@ -292,9 +293,7 @@ public void testP2PAuthenticationWithValidCredentials() throws Exception {
     Properties credentials = gen.getValidCredentials(1);
     Properties javaProps = gen.getJavaProperties();
     props.putAll(credentials);
-    locatorVM.invoke(() -> SecurityTestUtil.startLocator(
-            getUniqueName(), new Integer(port), props, javaProps,
-            expectedExceptions ));
+    startLocator(props, javaProps, port);
     try {
       createDS(props, javaProps);
       verifyMembers(new Integer(2));
@@ -331,9 +330,7 @@ public void testP2PAuthenticationWithBothValidAndInValidCredentials()
     Properties credentials = gen.getValidCredentials(1);
     Properties javaProps = gen.getJavaProperties();
     props.putAll(credentials);
-    locatorVM.invoke(() -> SecurityTestUtil.startLocator(
-            getUniqueName(), new Integer(port), props, javaProps,
-            expectedExceptions ));
+    startLocator(props, javaProps, port);
     try {
       // invalid credentials for the peer
       credentials = gen.getInvalidCredentials(1);
@@ -411,9 +408,7 @@ public void disabled_testP2PViewChangeReject() throws Exception {
     Properties javaProps = gen.getJavaProperties();
     props.putAll(credentials);
     props.putAll(extraProps);
-    locatorVM.invoke(() -> SecurityTestUtil.startLocator(
-        getUniqueName(), new Integer(port), props, javaProps,
-        expectedExceptions ));
+    startLocator(props, javaProps, port);
     try {
 
     // Start the first peer with different authenticator
@@ -442,12 +437,9 @@ public void disabled_testP2PViewChangeReject() throws Exception {
     javaProps = gen.getJavaProperties();
     props.putAll(credentials);
     props.putAll(extraProps);
-    peer2.invoke(() -> P2PAuthenticationDUnitTest.createDS(
-        props, javaProps ));
+    createDS(peer2, props, javaProps);
 
-    // Start the third peer with the same authenticator as locator
-    peer3.invoke(() -> P2PAuthenticationDUnitTest.createDS(
-        props, javaProps ));
+    createDS(peer3, props, javaProps);
 
     // wait for view propagation
     Wait.pause(2000);
@@ -481,6 +473,12 @@ public void disabled_testP2PViewChangeReject() throws Exception {
     }
   }
 
+  protected void createDS(final VM peer2, Properties props,
+      Properties javaProps) {
+    peer2.invoke(() -> P2PAuthenticationDUnitTest.createDS(
+        props, javaProps ));
+  }
+
   /**
    * The strategy is to test credential size greater than UDP datagram size.
    * 
@@ -516,9 +514,7 @@ public void testP2PLargeCredentialSucceeds() throws Exception {
     Properties javaProps = gen.getJavaProperties();
     props.putAll(credentials);
     props.putAll(extraProps);
-    locatorVM.invoke(() -> SecurityTestUtil.startLocator(
-        getUniqueName(), new Integer(port), props, javaProps,
-        expectedExceptions ));
+    startLocator(props, javaProps, port);
     try {
 
     // Start the first peer with huge credentials
@@ -567,12 +563,9 @@ public void testP2PLargeCredentialSucceeds() throws Exception {
     javaProps = gen.getJavaProperties();
     props.putAll(credentials);
     props.putAll(extraProps);
-    peer2.invoke(() -> P2PAuthenticationDUnitTest.createDS(
-        props, javaProps ));
+    createDS(peer2, props, javaProps);
 
-    // Start the third peer with the same authenticator as locator
-    peer3.invoke(() -> P2PAuthenticationDUnitTest.createDS(
-        props, javaProps ));
+    createDS(peer3, props, javaProps);
 
     // wait for view propagation
     Wait.pause(2000);
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index b92de53861c3..42788d97ce47 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -266,9 +266,9 @@ public void test_LN_Sender_recogises_ALL_NY_Locators() {
         .invoke(() -> WANTestBase.createSecondRemoteLocator(
             2, nyLocPort1, lnLocPort1 ));
     
-    locatorToWaitFor = new InetSocketAddress("localhost", nyLocPort3);
+    InetSocketAddress locatorToWaitFor2 = new InetSocketAddress("localhost", nyLocPort3);
 
-    vm2.invoke(() -> WANTestBase.checkLocatorsinSender("ln", locatorToWaitFor ));
+    vm2.invoke(() -> WANTestBase.checkLocatorsinSender("ln", locatorToWaitFor2 ));
 
   }
   
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
index 2fef83a5c012..88696fe0a721 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -577,7 +577,7 @@ public void testGatewayEventFilters() {
         "ln", 2, false, 100, false, false, eventFiletrs,
         null, true, false  ));
     try {
-      eventFiletrs = new ArrayList();
+      eventFiletrs.clear();
       eventFiletrs.add(new Filter70());
       vm2.invoke(() -> WANTestBase.createSenderForValidations(
           "ln", 2, false, 100, false, false,
@@ -605,7 +605,7 @@ public void testGatewayEventFilters2() {
         "ln", 2, false, 100, false, false, eventFiletrs,
         null, true, false  ));
     try {
-      eventFiletrs = new ArrayList();
+      eventFiletrs.clear();
       eventFiletrs.add(new MyGatewayEventFilter());
       eventFiletrs.add(new Filter70());
       vm2.invoke(() -> WANTestBase.createSenderForValidations(
@@ -635,7 +635,7 @@ public void testGatewayTransportFilters() {
         "ln", 2, false, 100, false, false, null,
         transportFiletrs, true, false  ));
    try {
-      transportFiletrs = new ArrayList();
+      transportFiletrs.clear();
       transportFiletrs.add(new MyGatewayTransportFilter3());
       transportFiletrs.add(new MyGatewayTransportFilter4());
       vm2.invoke(() -> WANTestBase.createSenderForValidations(
@@ -665,7 +665,7 @@ public void testGatewayTransportFiltersOrder() {
         "ln", 2, false, 100, false, false, null,
         transportFiletrs, true, false  ));
    try {
-      transportFiletrs = new ArrayList();
+      transportFiletrs.clear();
       transportFiletrs.add(new MyGatewayTransportFilter2());
       transportFiletrs.add(new MyGatewayTransportFilter1());
       vm2.invoke(() -> WANTestBase.createSenderForValidations(
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index d2406969c041..1bf132b66817 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -121,7 +121,7 @@ public void testPrimarySecondaryQueueDrainInOrder_RR() throws Exception {
     primarySenderUpdates = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue());
     secondarySenderUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
     
-    vm5.invoke(() -> WANTestBase.checkQueueOnSecondary( primarySenderUpdates ));
+    checkPrimarySenderUpdatesOnVM5(primarySenderUpdates);
 //    assertEquals(primarySenderUpdates, secondarySenderUpdates);
     
     vm4.invoke(() -> WANTestBase.resumeSender( "ln"));
@@ -144,6 +144,10 @@ public void testPrimarySecondaryQueueDrainInOrder_RR() throws Exception {
     secondarySenderUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
     assertEquals(secondarySenderUpdates.get("Destroy"), receiverUpdates.get("Create"));
   }
+
+  protected void checkPrimarySenderUpdatesOnVM5(HashMap primarySenderUpdates) {
+    vm5.invoke(() -> WANTestBase.checkQueueOnSecondary( primarySenderUpdates ));
+  }
   
   public void testPrimarySecondaryQueueDrainInOrder_PR() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@ -192,7 +196,7 @@ public void testPrimarySecondaryQueueDrainInOrder_PR() throws Exception {
     Wait.pause(5000);
     HashMap primarySenderUpdates = (HashMap)vm4.invoke(() -> WANTestBase.checkQueue());
     HashMap secondarySenderUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue());
-    vm5.invoke(() -> WANTestBase.checkQueueOnSecondary( primarySenderUpdates ));
+    checkPrimarySenderUpdatesOnVM5(primarySenderUpdates);
     
     vm4.invoke(() -> WANTestBase.resumeSender( "ln"));
     Wait.pause(4000);

From ce74e9779d7ac5cc61545d76f4e994742ec6e093 Mon Sep 17 00:00:00 2001
From: Dan Smith 
Date: Wed, 10 Feb 2016 16:19:01 -0800
Subject: [PATCH 06/12] Commenting out broken code that is now a compile error

These are places where the code invoke was calling a method that doesn't
exist. These tests were either not running, or in some cases never
checking the return value of an invokeAsync call.
---
 .../DistributedTransactionDUnitTest.java      |  3 ++-
 .../cache/partitioned/Bug51400DUnitTest.java  |  4 +++-
 .../CacheServerTransactionsDUnitTest.java     | 10 +++++----
 .../InterestListRecoveryDUnitTest.java        |  4 +++-
 .../AsyncEventListenerDUnitTest.java          |  5 +++--
 .../tier/sockets/DurableClientTestCase.java   |  6 +++--
 .../internal/cache/wan/WANTestBase.java       |  7 +++---
 ...alGatewaySenderEventListenerDUnitTest.java | 22 ++++++++++++-------
 8 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
index 873baa7816aa..ab8fad47e899 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
@@ -1794,7 +1794,8 @@ public Object call() throws Exception {
         return null;
       }
     }
-    server1.invokeAsync(() -> Ops.call());
+     
+    server1.invokeAsync(() -> new Ops().call());
     
     // Now create cache on the third server and let it join the distributed system.
     createPR(new VM[]{server3});
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
index 171567406333..c7fffe40e29e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
@@ -174,7 +174,9 @@ public void ticket51932_testDeadlock() throws Throwable {
     // Set infinite ack interval so that the queue will not be drained.
     int ackInterval = Integer.MAX_VALUE;
 
-    int port1 = (Integer) server0.invoke(() -> Bug51400DUnitTest.createServerCache( maxQSize ));
+    fail("Invoking bad method");
+    int port1 = 0;
+//    int port1 = (Integer) server0.invoke(() -> Bug51400DUnitTest.createServerCache( maxQSize));
 
     client1.invoke(Bug51400DUnitTest.class, "createClientCache",
         new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer[]{port1}, ackInterval});
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index bdc96a791ce9..d4daa390b392 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -373,10 +373,12 @@ public void testDestroysServerToClientTransactionsPropagationWithOneConnection()
    *
    */
   public void YOGESH_testClientToServerCommits(){
-    Integer port1 = ((Integer)server1.invoke(() -> CacheServerTransactionsDUnitTest.createServerCache()));
-    Integer port2 = ((Integer)server2.invoke(() -> CacheServerTransactionsDUnitTest.createServerCache()));
-    client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 ));
-    client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port2 ));
+    fail("Invoking bad method");
+    int port1 = 0;
+//    Integer port1 = ((Integer)server1.invoke(() -> CacheServerTransactionsDUnitTest.createServerCache()));
+//    Integer port2 = ((Integer)server2.invoke(() -> CacheServerTransactionsDUnitTest.createServerCache()));
+//    client1.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port1 ));
+//    client2.invoke(() -> CacheServerTransactionsDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), port2 ));
     client1.invoke(() -> CacheServerTransactionsDUnitTest.commitTransactionOnClient());
     Wait.pause(PAUSE);
     
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index 8beb5a027a63..0f25d01a03da 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
@@ -119,7 +119,9 @@ public void XtestKeyInterestRecoveryWhileServerFailover() throws Exception
     Wait.pause(20000);
     setServerUnavailable("localhost"+PORT2);
     Wait.pause(20000);
-    server1.invoke(() -> InterestListRecoveryDUnitTest.verifyUnregisterK1toK3());
+    fail("invoking bad method");
+    //This method doesn't exist
+//    server1.invoke(() -> InterestListRecoveryDUnitTest.verifyUnregisterK1toK3());
 
   }
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index 25f0ff3839d1..f5ed32b9e3ff 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -610,8 +610,9 @@ public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion_2() {
         500 ));
     vm4.invokeAsync(() -> AsyncEventQueueTestBase.doNextPuts( getTestMethodName() + "_RR",
       500, 1000 ));
-    vm4.invokeAsync(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
-      1000, 1500 ));
+    //Async invocation which was bound to fail
+//    vm4.invokeAsync(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
+//      1000, 1500 ));
     
     vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 1000 ));// primary sender
     vm5.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 0 ));// secondary
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index 3be13eceea8e..1fc2e9f5a23a 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -1272,8 +1272,10 @@ public void durableFailoverAfterReconnect(int redundancyLevel)
     final int mcastPort = ports[1].intValue();
     
     // Start server 2 using the same mcast port as server 1
-    final int server2Port = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true), new Integer(mcastPort))))
-        .intValue();
+    fail("Trying to get a result from a void method");
+    final int server2Port=0;
+//    final int server2Port = ((Integer) this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true), new Integer(mcastPort))))
+//        .intValue();
     
     // Start a durable client
     final String durableClientId = getName() + "_client";
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 374d9294f764..272c79cc3cb3 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -85,6 +85,7 @@
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.FileUtil;
@@ -114,10 +115,10 @@
 import com.gemstone.gemfire.pdx.SimpleClass;
 import com.gemstone.gemfire.pdx.SimpleClass1;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -1518,7 +1519,6 @@ public static void startAsyncEventQueue(String senderId) {
     //q.start();
   }
   
-  /*
   public static Map getSenderToReceiverConnectionInfo(String senderId){	
 	  Set senders = cache.getGatewaySenders();
 	  GatewaySender sender = null;
@@ -1535,7 +1535,7 @@ public static Map getSenderToReceiverConnectionInfo(String senderId){
 			  ((AbstractGatewaySender)sender).getEventProcessor().getDispatcher();
 		  if (dispatcher instanceof GatewaySenderEventRemoteDispatcher) {
 			  ServerLocation serverLocation = 
-				  ((GatewaySenderEventRemoteDispatcher) dispatcher).getConnection().getServer();
+				  ((GatewaySenderEventRemoteDispatcher) dispatcher).getConnection(false).getServer();
 			  connectionInfo.put("serverHost", serverLocation.getHostName());
 			  connectionInfo.put("serverPort", serverLocation.getPort());
 			  
@@ -1543,7 +1543,6 @@ public static Map getSenderToReceiverConnectionInfo(String senderId){
 	  }
 	  return connectionInfo;
   }
-  */
   public static List getSenderStats(String senderId, final int expectedQueueSize){
     Set senders = cache.getGatewaySenders();
     AbstractGatewaySender sender = null;
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index 113eb84058c9..a0a57ba00bdd 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -91,8 +91,9 @@ public void __testGatewaySenderEventListenerInvocationWithoutLocator() {
     
     vm4.invoke(() -> WANTestBase.printEventListenerMap());
     vm5.invoke(() -> WANTestBase.printEventListenerMap());
-    
-    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", keyValues ));
+
+    fail("tried to invoke missing method");
+//    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", keyValues ));
   }
   
   /**
@@ -150,8 +151,9 @@ public void testGatewaySenderEventListenerInvocation() {
         getTestMethodName() + "_RR", 0 ));
     vm3.invoke(() -> WANTestBase.validateRegionSize(
         getTestMethodName() + "_RR", 0 ));
-    
-    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", keyValues ));
+
+    fail("tried to invoke missing method");
+//    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", keyValues ));
   }
 
   /**
@@ -206,7 +208,8 @@ public void testGatewaySender2EventListenerInvocation() {
     vm3.invoke(() -> WANTestBase.validateRegionSize(
         getTestMethodName() + "_RR", 0 ));
     
-    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener2("ln", keyValues ));
+    fail("tried to invoke missing method");    
+//    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener2("ln", keyValues ));
   }
   
   /**
@@ -260,7 +263,8 @@ public void __testGatewaySenderEventListener_GatewayOperations() {
     vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
       initialKeyValues ));
 
-    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", initialKeyValues ));
+    fail("tried to invoke missing method");
+//    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", initialKeyValues ));
     
     vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
     
@@ -272,7 +276,8 @@ public void __testGatewaySenderEventListener_GatewayOperations() {
     vm4.invoke(() -> WANTestBase.putGivenKeyValue( getTestMethodName() + "_RR",
       keyValues ));
     
-    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", initialKeyValues ));
+    fail("tried to invoke missing method");
+//    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", initialKeyValues ));
 
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
@@ -285,7 +290,8 @@ public void __testGatewaySenderEventListener_GatewayOperations() {
       finalKeyValues ));
     
     finalKeyValues.putAll(initialKeyValues);
-    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", finalKeyValues ));
+    fail("tried to invoke missing method");
+//    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", finalKeyValues ));
     
   }
     

From 82de4d23f856c04291ef7f3b51671cadb88079dd Mon Sep 17 00:00:00 2001
From: Dan Smith 
Date: Thu, 11 Feb 2016 11:24:44 -0800
Subject: [PATCH 07/12] Getting rid of some invokeBoolean calls

These couldn't be automatically converted. I've changed them to lambdas.
---
 .../gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java   | 4 +---
 .../gemfire/cache30/DistAckMapMethodsDUnitTest.java       | 8 +++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
index 955b24ffdd70..5f9450b11c15 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
@@ -237,9 +237,7 @@ public void testClearMultiVM() throws Throwable{
         objArr[0] = ""+i;
         vm1.invoke(ClearMultiVmDUnitTest.class, "getMethod", objArr);
         
-        Object ob[] = new Object[1];
-        ob[0] = "secondVM";
-        boolean val = vm1.invokeBoolean(ClearMultiVmDUnitTest.class, "containsValueMethod", ob);
+        boolean val = vm1.invoke(() -> containsValueMethod("secondVM"));
         assertEquals(true, val);
         
     }//end of testClearMultiVM
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
index 1b3cd9757d14..cf6226ded48b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
@@ -191,7 +191,7 @@ public void testRemoveMethod(){
         vm0.invoke(DistAckMapMethodsDUnitTest.class, "putMethod", objArr);
         vm0.invoke(DistAckMapMethodsDUnitTest.class, "removeMethod", objArr);
         //validate if vm0 has that key value entry
-        ret = vm0.invokeBoolean(DistAckMapMethodsDUnitTest.class, "containsKeyMethod", objArr);
+        ret = vm0.invoke(() -> containsKeyMethod("" + i));
         if( ret ){//if returned true means that the key is still there
             fail("region.remove failed with distributed ack scope");
         }
@@ -268,15 +268,13 @@ public void testContainsValueMethod(){
         //Integer in = new Integer(i);
         //objArr[0] = (Object) in;
         vm0.invoke(DistAckMapMethodsDUnitTest.class, "putMethod", objArr);
-        Object ob[] = new Object[1];
-        ob[0] = "first";
-        boolean val = vm1.invokeBoolean(DistAckMapMethodsDUnitTest.class, "containsValueMethod", ob);
+        boolean val = vm1.invoke(() -> containsValueMethod("first"));
         if (val){//val should be false.
             fail("Failed in region.ContainsValue");
         }
         
         vm1.invoke(DistAckMapMethodsDUnitTest.class, "getMethod", objArr);
-        boolean val1 = vm1.invokeBoolean(DistAckMapMethodsDUnitTest.class, "containsValueMethod", ob);
+        boolean val1 = vm1.invoke(() -> containsValueMethod("first"));
         if (!val1){//val1 should be true.
             fail("Failed in region.ContainsValue");
         }

From 51c03a91750dbd547fbb7db311a7bd19ed6f90aa Mon Sep 17 00:00:00 2001
From: Dan Smith 
Date: Wed, 10 Feb 2016 16:52:22 -0800
Subject: [PATCH 08/12] Misc cleanup due to stricter type checking

Fixing various issues being checked by the compiler:
 - Changing generics to match callers
 - Calling invoke on the correct class
 - Fixing some ambiguous casts.
 - Fixing some method visibility issues.
 - Removing extra comma after parameters
---
 .../internal/cache/tier/sockets/Bug37805DUnitTest.java        | 2 +-
 .../cache/tier/sockets/DurableRegistrationDUnitTest.java      | 2 +-
 .../tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java   | 2 +-
 .../UniversalMembershipListenerAdapterDUnitTest.java          | 4 ++--
 .../com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java    | 4 ++--
 .../gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java        | 2 +-
 .../query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java     | 2 +-
 .../gemfire/cache/query/dunit/PdxQueryCQTestBase.java         | 2 +-
 .../com/gemstone/gemfire/internal/cache/wan/WANTestBase.java  | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
index 4c1c8965de87..46e1679b9d6b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
@@ -75,7 +75,7 @@ protected final void preTearDown() throws Exception {
   public void testFunctionality() {
  // Step 1: Starting the servers
 
-    PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true),
+    PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true)
             ))).intValue();
     final int durableClientTimeout = 600; 
     
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
index 683ec0383e8e..5d5e0a8b1d04 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
@@ -115,7 +115,7 @@ public void testSimpleDurableClient() {
     // Step 1: Starting the servers
     PORT1 = ((Integer)this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true)
             ))).intValue();
-    PORT2 = ((Integer)this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true),
+    PORT2 = ((Integer)this.server2VM.invoke(() -> CacheServerTestUtil.createCacheServer( regionName, new Boolean(true)
             ))).intValue();
 
     // Step 2: Bring Up the Client
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
index 4934a9d5e602..5287c9febc3d 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
@@ -118,7 +118,7 @@ public static void createServerCache() throws Exception
       public void afterCreate(EntryEvent event)
       {
         if (!receiver) {
-          vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
+          vm0.invoke(() -> VerifyEventIDGenerationInP2PDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
         }
         else {
           testEventIDResult = ((EntryEventImpl)event).getEventId().equals(
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index fcb1e228ad5e..394a155a5776 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -1861,7 +1861,7 @@ public void run2() throws CacheException {
     
     // gather details for later creation of pool...
     assertEquals(ports[0],
-                 vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port()));
+                 (int) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port()));
     String serverMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId());
     DistributedMember serverMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember());
 
@@ -2029,7 +2029,7 @@ public void run() {
     
     // gather details for later creation of pool...
     assertEquals(ports[0],
-                 vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port()));
+        (int) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port()));
     serverMemberId = (String) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getMemberId());
     serverMember = (DistributedMember) vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember());
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
index 26a67c81862e..ce6cb369dce3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
@@ -52,7 +52,7 @@ public void notestInvokeStaticBoolean() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     assertEquals(BOOLEAN_VALUE,
-                 vm.invoke(() -> VMDUnitTest.remoteBooleanMethod())); 
+                 (boolean) vm.invoke(() -> VMDUnitTest.remoteBooleanMethod())); 
   }
 
   /**
@@ -79,7 +79,7 @@ public void notestInvokeStaticLong() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     assertEquals(LONG_VALUE,
-                 vm.invoke(() -> VMDUnitTest.remoteLongMethod())); 
+                 (long) vm.invoke(() -> VMDUnitTest.remoteLongMethod())); 
   }
 
   /**
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index bc0121b68453..973039533f91 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -187,7 +187,7 @@ public void run() {
   }
   
   /* Returns Cache Server Port */
-  static int getCacheServerPort() {
+  public static int getCacheServerPort() {
     return bridgeServerPort;
   }
   
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index ca506fa160a8..936311744361 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -1691,7 +1691,7 @@ public void run2() throws CacheException {
   } 
   
   /* Returs Cache Server Port */
-  private static int getCacheServerPort() {
+  protected static int getCacheServerPort() {
     return bridgeServerPort;
   }
   
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
index f99a316715a7..7fa50774c944 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -74,7 +74,7 @@ public abstract class PdxQueryCQTestBase extends CacheTestCase {
       "SELECT p FROM " + regName + " p, p.idTickers idTickers WHERE p.ticker = 'vmware'", // 4
     };
 
-  private static int getCacheServerPort() {
+  protected static int getCacheServerPort() {
     return bridgeServerPort;
   }
 
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 272c79cc3cb3..c78de267026c 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -4256,7 +4256,7 @@ public String description() {
   }
   
   public static void checkAllSiteMetaData(     
-      Map> dsVsPorts) {
+      Map> dsVsPorts) {
     waitForSitesToUpdate();
     assertNotNull(system);
 //    Map> allSiteMetaData = ((DistributionConfigImpl)system
@@ -4270,7 +4270,7 @@ public static void checkAllSiteMetaData(
     System.out.println("Server allSiteMetaData : " + ((InternalLocator)locator).getlocatorMembershipListener().getAllServerLocatorsInfo());
     
     //assertEquals(dsVsPorts.size(), allSiteMetaData.size());
-    for (Map.Entry> entry : dsVsPorts.entrySet()) {
+    for (Map.Entry> entry : dsVsPorts.entrySet()) {
       Set locators = allSiteMetaData.get(entry.getKey());
       assertNotNull(locators);
       List value = entry.getValue();

From 0804a1396588116caed281d2ce7303ec39aa8df1 Mon Sep 17 00:00:00 2001
From: Dan Smith 
Date: Tue, 16 Feb 2016 16:36:52 -0800
Subject: [PATCH 09/12] Extracting common lambdas from methods to avoid "Code
 to large" error

After converting these tests to use lambdas, it appears that the large
number of lambdas are overflowing some limit of the compiler. By
extracting methods for common lambdas, the overall number of lambda
classes required is reduced for these tests.
---
 .../AsyncEventListenerDUnitTest.java          | 511 +++++------
 .../wan/misc/WanValidationsDUnitTest.java     | 262 +++---
 ...sistenceEnabledGatewaySenderDUnitTest.java | 824 +++++++++---------
 .../ParallelWANPropagationDUnitTest.java      | 639 +++++++-------
 .../serial/SerialWANPropogationDUnitTest.java | 277 +++---
 5 files changed, 1207 insertions(+), 1306 deletions(-)

diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index f5ed32b9e3ff..fdc9ea9d02d5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -33,6 +33,7 @@
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.wan.AsyncEventQueueTestBase;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
 import com.gemstone.gemfire.test.dunit.Wait;
 
 public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
@@ -73,7 +74,7 @@ public void testCreateAsyncEventQueueWithNullListener() {
   public void testSerialAsyncEventQueueAttributes() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         false, 100, 150, true, true, "testDS", true ));
@@ -84,33 +85,29 @@ public void testSerialAsyncEventQueueAttributes() {
   public void testSerialAsyncEventQueueSize() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
+    vm4.invoke(createAsyncEventQueueRunnable());
+    vm5.invoke(createAsyncEventQueueRunnable());
+    vm6.invoke(createAsyncEventQueueRunnable());
+    vm7.invoke(createAsyncEventQueueRunnable());
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm6
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm7
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     Wait.pause(1000);// pause at least for the batchTimeInterval
 
     vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
@@ -121,6 +118,23 @@ public void testSerialAsyncEventQueueSize() {
     assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm4size);
     assertEquals("Size of AsyncEventQueue is incorrect", 1000, vm5size);
   }
+
+  protected SerializableRunnableIF pauseAsyncEventQueueRunnable() {
+    return () -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" );
+  }
+
+  protected SerializableRunnableIF createReplicatedRegionRunnable() {
+    return () -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() );
+  }
+
+  protected SerializableRunnableIF createAsyncEventQueueRunnable() {
+    return () -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
+        false, 100, 100, false, false, null, false );
+  }
+
+  protected SerializableRunnableIF createCacheRunnable(Integer lnPort) {
+    return () -> AsyncEventQueueTestBase.createCache( lnPort );
+  }
   
   /**
    * Added to reproduce defect #50366: 
@@ -129,25 +143,25 @@ public void testSerialAsyncEventQueueSize() {
   public void testConcurrentSerialAsyncEventQueueSize() {
 	Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-	vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-	vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-	vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-	vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+	vm4.invoke(createCacheRunnable(lnPort));
+	vm5.invoke(createCacheRunnable(lnPort));
+	vm6.invoke(createCacheRunnable(lnPort));
+	vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln",
         false, 100, 150, true, false, null, false, 2, OrderPolicy.KEY ));
     vm5.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln",
         false, 100, 150, true, false, null, false, 2, OrderPolicy.KEY ));
 
-	vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-	vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-	vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-	vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+	vm4.invoke(createReplicatedRegionRunnable());
+	vm5.invoke(createReplicatedRegionRunnable());
+	vm6.invoke(createReplicatedRegionRunnable());
+	vm7.invoke(createReplicatedRegionRunnable());
 
 	vm4
-	  .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+	  .invoke(pauseAsyncEventQueueRunnable());
 	vm5
-	  .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+	  .invoke(pauseAsyncEventQueueRunnable());
 
 	Wait.pause(1000);// pause at least for the batchTimeInterval
 
@@ -170,24 +184,20 @@ public void testConcurrentSerialAsyncEventQueueSize() {
   public void testReplicatedSerialAsyncEventQueue() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
+    vm4.invoke(createAsyncEventQueueRunnable());
+    vm5.invoke(createAsyncEventQueueRunnable());
+    vm6.invoke(createAsyncEventQueueRunnable());
+    vm7.invoke(createAsyncEventQueueRunnable());
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
         1000 ));
@@ -205,10 +215,10 @@ public void testReplicatedSerialAsyncEventQueue() {
   public void testReplicatedSerialAsyncEventQueueWithCacheLoader() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" ));
@@ -248,10 +258,10 @@ public void testReplicatedSerialAsyncEventQueueWithCacheLoader() {
   public void testReplicatedSerialAsyncEventQueue_ExceptionScenario() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithCustomListener( "ln",
         false, 100, 100, false, false, null, false, 1 ));
@@ -262,19 +272,19 @@ public void testReplicatedSerialAsyncEventQueue_ExceptionScenario() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithCustomListener( "ln",
         false, 100, 100, false, false, null, false, 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
     
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm6
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm7
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     Wait.pause(2000);// pause at least for the batchTimeInterval
 
     vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
@@ -300,10 +310,10 @@ public void testReplicatedSerialAsyncEventQueue_ExceptionScenario() {
   public void testReplicatedSerialAsyncEventQueueWithConflationEnabled() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false ));
@@ -314,19 +324,19 @@ public void testReplicatedSerialAsyncEventQueueWithConflationEnabled() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm6
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm7
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     Wait.pause(1000);// pause at least for the batchTimeInterval
 
     final Map keyValues = new HashMap();
@@ -391,19 +401,15 @@ public void DISABLED_testReplicatedSerialAsyncEventQueueWithoutLocator() {
     vm6.invoke(() -> AsyncEventQueueTestBase.createCacheWithoutLocator( mPort ));
     vm7.invoke(() -> AsyncEventQueueTestBase.createCacheWithoutLocator( mPort ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
+    vm4.invoke(createAsyncEventQueueRunnable());
+    vm5.invoke(createAsyncEventQueueRunnable());
+    vm6.invoke(createAsyncEventQueueRunnable());
+    vm7.invoke(createAsyncEventQueueRunnable());
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
         1000 ));
@@ -426,10 +432,10 @@ public void DISABLED_testReplicatedSerialAsyncEventQueueWithoutLocator() {
   public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false ));
@@ -440,10 +446,10 @@ public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
         1000 ));
@@ -466,19 +472,19 @@ public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() {
   public void DISABLED_testReplicatedSerialAsyncEventQueueWithPeristenceEnabled_Restart() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     String firstDStore = (String)vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100,
             100, true, null ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
 
     // pause async channel and then do the puts
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
         1000 ));
 
@@ -486,9 +492,9 @@ public void DISABLED_testReplicatedSerialAsyncEventQueueWithPeristenceEnabled_Re
     // ------------------------------------------
     vm4.invoke(() -> AsyncEventQueueTestBase.killSender());
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, firstDStore ));
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
     // -----------------------------------------------------------------------------------
 
     vm4.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener( "ln", 1000 ));// primary sender
@@ -506,18 +512,18 @@ public void DISABLED_testReplicatedSerialAsyncEventQueueWithPeristenceEnabled_Re
   public void DISABLED_testReplicatedSerialAsyncEventQueueWithPeristenceEnabled_Restart2() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, null ));
     vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, null ));
     vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, null ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
     vm4.invoke(() -> AsyncEventQueueTestBase.addCacheListenerAndCloseCache( getTestMethodName() + "_RR" ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
 
     vm5.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR", 2000 ));
 
@@ -549,10 +555,10 @@ public void DISABLED_testReplicatedSerialAsyncEventQueueWithPeristenceEnabled_Re
   public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY ));
@@ -563,10 +569,10 @@ public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false, 3, OrderPolicy.KEY ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
         1000 ));
@@ -587,10 +593,10 @@ public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion() {
   public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion_2() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD ));
@@ -601,10 +607,10 @@ public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion_2() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false, 3, OrderPolicy.THREAD ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     vm4.invokeAsync(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
         500 ));
@@ -627,10 +633,10 @@ public void testConcurrentSerialAsyncEventQueueWithReplicatedRegion_2() {
   public void testConcurrentSerialAsyncEventQueueWithoutOrderPolicy() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false, 3, null ));
@@ -641,10 +647,10 @@ public void testConcurrentSerialAsyncEventQueueWithoutOrderPolicy() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false, 3, null ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
         1000 ));
@@ -663,19 +669,15 @@ public void testConcurrentSerialAsyncEventQueueWithoutOrderPolicy() {
   public void testPartitionedSerialAsyncEventQueue() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        false, 100, 100, false, false, null, false ));
+    vm4.invoke(createAsyncEventQueueRunnable());
+    vm5.invoke(createAsyncEventQueueRunnable());
+    vm6.invoke(createAsyncEventQueueRunnable());
+    vm7.invoke(createAsyncEventQueueRunnable());
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() ));
     vm5.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() ));
@@ -701,10 +703,10 @@ public void testPartitionedSerialAsyncEventQueue() {
   public void testPartitionedSerialAsyncEventQueueWithConflationEnabled() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, true, false, null, false ));
@@ -721,13 +723,13 @@ public void testPartitionedSerialAsyncEventQueueWithConflationEnabled() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() ));
 
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm6
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm7
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     
     Wait.pause(2000);
 
@@ -785,10 +787,10 @@ public void testPartitionedSerialAsyncEventQueueWithConflationEnabled() {
   public void testPartitionedSerialAsyncEventQueueWithPeristenceEnabled() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, false, true, null, false ));
@@ -825,10 +827,10 @@ public void testPartitionedSerialAsyncEventQueueWithPeristenceEnabled() {
   public void testPartitionedSerialAsyncEventQueueWithPeristenceEnabled_Restart() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     String firstDStore = (String)vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100,
             100, true, null ));
@@ -846,7 +848,7 @@ public void testPartitionedSerialAsyncEventQueueWithPeristenceEnabled_Restart()
     // ------------------------------------------
     vm4.invoke(() -> AsyncEventQueueTestBase.killSender());
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithDiskStore( "ln", false, 100, 100, true, firstDStore ));
     vm4.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() ));
     // -----------------------------------------------------------------------------------
@@ -858,10 +860,10 @@ public void testParallelAsyncEventQueueWithReplicatedRegion() {
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-      vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-      vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-      vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+      vm4.invoke(createCacheRunnable(lnPort));
+      vm5.invoke(createCacheRunnable(lnPort));
+      vm6.invoke(createCacheRunnable(lnPort));
+      vm7.invoke(createCacheRunnable(lnPort));
 
       vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue(
           "ln", true, 100, 100, true, false, null, false ));
@@ -872,8 +874,7 @@ public void testParallelAsyncEventQueueWithReplicatedRegion() {
       vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue(
           "ln", true, 100, 100, true, false, null, false ));
 
-      vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue(
-              getTestMethodName() + "_RR", "ln", isOffHeap() ));
+      vm4.invoke(createReplicatedRegionRunnable());
       fail("Expected GatewaySenderConfigException where parallel async event queue can not be used with replicated region");
     }
     catch (Exception e) {
@@ -887,10 +888,10 @@ public void testParallelAsyncEventQueueWithReplicatedRegion() {
   public void testParallelAsyncEventQueue() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         true, 100, 100, false, false, null, false ));
@@ -929,10 +930,10 @@ public void testParallelAsyncEventQueue() {
   public void testParallelAsyncEventQueueWithCacheLoader() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
     	true, 100, 100, false, false, null, false, "MyAsyncEventListener_CacheLoader" ));
@@ -959,10 +960,10 @@ public void testParallelAsyncEventQueueWithCacheLoader() {
   public void testParallelAsyncEventQueueSize() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         true, 100, 100, false, false, null, false ));
@@ -979,13 +980,13 @@ public void testParallelAsyncEventQueueSize() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() ));
 
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm6
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm7
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     Wait.pause(1000);// pause at least for the batchTimeInterval
 
     vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR",
@@ -1005,10 +1006,10 @@ public void testParallelAsyncEventQueueSize() {
   public void testConcurrentParallelAsyncEventQueueSize() {
 	Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-	vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-	vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-	vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-	vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+	vm4.invoke(createCacheRunnable(lnPort));
+	vm5.invoke(createCacheRunnable(lnPort));
+	vm6.invoke(createCacheRunnable(lnPort));
+	vm7.invoke(createCacheRunnable(lnPort));
 
 	vm4.invoke(() -> AsyncEventQueueTestBase.createConcurrentAsyncEventQueue( "ln",
 	  true, 100, 100, false, false, null, false, 2, OrderPolicy.KEY ));
@@ -1025,13 +1026,13 @@ public void testConcurrentParallelAsyncEventQueueSize() {
 	vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() ));
 
 	vm4
-	  .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+	  .invoke(pauseAsyncEventQueueRunnable());
 	vm5
-	  .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+	  .invoke(pauseAsyncEventQueueRunnable());
 	vm6
-	  .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+	  .invoke(pauseAsyncEventQueueRunnable());
 	vm7
-	  .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+	  .invoke(pauseAsyncEventQueueRunnable());
 	Wait.pause(1000);// pause at least for the batchTimeInterval
 
 	vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_PR",
@@ -1047,10 +1048,10 @@ public void testConcurrentParallelAsyncEventQueueSize() {
   public void testParallelAsyncEventQueueWithConflationEnabled() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         true, 100, 100, true, false, null, false ));
@@ -1067,13 +1068,13 @@ public void testParallelAsyncEventQueueWithConflationEnabled() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() ));
 
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm6
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm7
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
 
     Wait.pause(2000);// pause for the batchTimeInterval to ensure that all the
     // senders are paused
@@ -1131,10 +1132,10 @@ public void testParallelAsyncEventQueueWithConflationEnabled() {
   public void testParallelAsyncEventQueueWithConflationEnabled_bug47213() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         true, 100, 100, true, false, null, false ));
@@ -1151,13 +1152,13 @@ public void testParallelAsyncEventQueueWithConflationEnabled_bug47213() {
     vm7.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue( getTestMethodName() + "_PR", "ln", isOffHeap() ));
 
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm6
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm7
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
 
     Wait.pause(2000);// pause for the batchTimeInterval to ensure that all the
     // senders are paused
@@ -1212,11 +1213,11 @@ public void testParallelAsyncEventQueueWithConflationEnabled_bug47213() {
   public void testParallelAsyncEventQueueWithOneAccessor() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm3.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm3.invoke(createCacheRunnable(lnPort));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm3.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         true, 100, 100, false, false, null, false ));
@@ -1258,10 +1259,10 @@ public void testParallelAsyncEventQueueWithOneAccessor() {
   public void testParallelAsyncEventQueueWithPersistence() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
         true, 100, 100, false, true, null, false ));
@@ -1293,52 +1294,6 @@ public void testParallelAsyncEventQueueWithPersistence() {
     assertEquals(vm4size + vm5size + vm6size + vm7size, 256);
   }
   
-  /**
-   * Below test is disabled intentionally Replicated region with Parallel Async
-   * Event queue is not supported. Test is added for the same
-   * testParallelAsyncEventQueueWithReplicatedRegion
-   * 
-   * We are gone support this configuration in upcoming releases
-   */
-  
-  public void DISABLED_DUETO_BUG51491_testReplicatedParallelAsyncEventQueue() {
-    Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
-
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-
-    vm4.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        true, 100, 100, false, false, null, false ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        true, 100, 100, false, false, null, false ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        true, 100, 100, false, false, null, false ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln",
-        true, 100, 100, false, false, null, false ));
-
-    vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue( getTestMethodName() + "_RR", "ln", isOffHeap() ));
-
-    vm4.invoke(() -> AsyncEventQueueTestBase.doPuts( getTestMethodName() + "_RR",
-        1000 ));
-
-    vm4.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" ));
-    vm6.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" ));
-    vm7.invoke(() -> AsyncEventQueueTestBase.waitForAsyncQueueToGetEmpty( "ln" ));
-
-    int vm4size = (Integer)vm4.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" ));
-    int vm5size = (Integer)vm5.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" ));
-    int vm6size = (Integer)vm6.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" ));
-    int vm7size = (Integer)vm7.invoke(() -> AsyncEventQueueTestBase.getAsyncEventListenerMapSize( "ln" ));
-
-    assertEquals(vm4size + vm5size + vm6size + vm7size, 1000);
-  }
-  
 /**
  * Test case to test possibleDuplicates. vm4 & vm5 are hosting the PR. vm5 is
  * killed so the buckets hosted by it are shifted to vm4.
@@ -1346,8 +1301,8 @@ public void DISABLED_DUETO_BUG51491_testReplicatedParallelAsyncEventQueue() {
   @Ignore("Disabled for 52349")
   public void DISABLED_testParallelAsyncEventQueueHA_Scenario1() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     LogWriterUtils.getLogWriter().info("Created the cache");
 
@@ -1364,9 +1319,9 @@ public void DISABLED_testParallelAsyncEventQueueHA_Scenario1() {
     LogWriterUtils.getLogWriter().info("Created PR with AsyncEventQueue");
 
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     Wait.pause(1000);// pause for the batchTimeInterval to make sure the AsyncQueue
                 // is paused
 
@@ -1399,8 +1354,8 @@ public void DISABLED_testParallelAsyncEventQueueHA_Scenario1() {
   public void testParallelAsyncEventQueueHA_Scenario2() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     LogWriterUtils.getLogWriter().info("Created the cache");
 
@@ -1417,9 +1372,9 @@ public void testParallelAsyncEventQueueHA_Scenario2() {
     LogWriterUtils.getLogWriter().info("Created PR with AsyncEventQueue");
 
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     Wait.pause(1000);// pause for the batchTimeInterval to make sure the AsyncQueue
                 // is paused
 
@@ -1437,7 +1392,7 @@ public void testParallelAsyncEventQueueHA_Scenario2() {
     // ----------------------------------------------------------------
 
     // ---------------------------- start vm6 --------------------------
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm6.invoke(createCacheRunnable(lnPort));
     vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null ));
     vm6.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue(
             getTestMethodName() + "_PR", "ln", isOffHeap() ));
@@ -1465,8 +1420,8 @@ public void testParallelAsyncEventQueueHA_Scenario2() {
   public void testParallelAsyncEventQueueHA_Scenario3() {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
-    vm5.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     LogWriterUtils.getLogWriter().info("Created the cache");
 
@@ -1483,9 +1438,9 @@ public void testParallelAsyncEventQueueHA_Scenario3() {
     LogWriterUtils.getLogWriter().info("Created PR with AsyncEventQueue");
 
     vm4
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     vm5
-        .invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue( "ln" ));
+        .invoke(pauseAsyncEventQueueRunnable());
     Wait.pause(1000);// pause for the batchTimeInterval to make sure the AsyncQueue
                 // is paused
 
@@ -1496,7 +1451,7 @@ public void testParallelAsyncEventQueueHA_Scenario3() {
     LogWriterUtils.getLogWriter().info("Done puts");
 
     // ---------------------------- start vm6 --------------------------
-    vm6.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm6.invoke(createCacheRunnable(lnPort));
     vm6.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueueWithListener2( "ln", true, 100, 5, false, null ));
     vm6.invoke(() -> AsyncEventQueueTestBase.createPRWithRedundantCopyWithAsyncEventQueue(
             getTestMethodName() + "_PR", "ln", isOffHeap() ));
@@ -1524,7 +1479,7 @@ public void testParallelAsyncEventQueueAttachedToChildRegionButNotToParentRegion
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
     // create cache on node
-    vm3.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));
+    vm3.invoke(createCacheRunnable(lnPort));
 
     // create AsyncEventQueue on node
     vm3.invoke(() -> AsyncEventQueueTestBase.createAsyncEventQueue( "ln", true, 100, 10, false, false, null, true ));
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
index 88696fe0a721..3d0c01b88b64 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -33,6 +33,7 @@
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
 
 public class WanValidationsDUnitTest extends WANTestBase {
 
@@ -62,8 +63,8 @@ public void testSameSerialGatewaySenderIdAcrossSameDistributedRegion()
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
       Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
       
-      vm4.invoke(() -> WANTestBase.createCache(lnPort ));
-      vm5.invoke(() -> WANTestBase.createCache(lnPort ));
+      vm4.invoke(createCacheRunnable(lnPort));
+      vm5.invoke(createCacheRunnable(lnPort));
 
       vm4.invoke(() -> WANTestBase.createSender("ln1", 2, false, 10, 100, false, false, null, true));
       vm4.invoke(() -> WANTestBase.createSender("ln2", 2, false, 10, 100, false, false, null, true));
@@ -88,6 +89,10 @@ public void testSameSerialGatewaySenderIdAcrossSameDistributedRegion()
     }
   }
 
+  protected SerializableRunnableIF createCacheRunnable(Integer lnPort) {
+    return () -> WANTestBase.createCache(lnPort );
+  }
+
   /**
    * Validate that ParallelGatewaySender can be added to Distributed region
    * 
@@ -106,8 +111,8 @@ public void DISABLED_DUETO_BUG51491_testParallelGatewaySenderForDistributedRegio
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
       Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm4.invoke(createCacheRunnable(lnPort));
+      vm5.invoke(createCacheRunnable(lnPort));
 
       vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
           true, 10, 100, false, false, null, false ));
@@ -137,8 +142,8 @@ public void testSameSerialGatewaySenderIdAcrossSamePartitionedRegion()
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
 
-      vm4.invoke(() -> WANTestBase.createCache(lnPort ));
-      vm5.invoke(() -> WANTestBase.createCache(lnPort ));
+      vm4.invoke(createCacheRunnable(lnPort));
+      vm5.invoke(createCacheRunnable(lnPort));
       
       vm4.invoke(() -> WANTestBase.createSender("ln1", 2, false, 10, 100, false, false, null, true));
       vm4.invoke(() -> WANTestBase.createSender("ln2", 2, false, 10, 100, false, false, null, true));
@@ -168,8 +173,8 @@ public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() {
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm4.invoke(createCacheRunnable(lnPort));
+      vm5.invoke(createCacheRunnable(lnPort));
 
       vm4.invoke(() -> WANTestBase.createReplicatedRegionWithAsyncEventQueue(
               getTestMethodName() + "_RR", "ln1", isOffHeap()  ));
@@ -197,8 +202,8 @@ public void testSameParallelGatewaySenderIdAcrossSamePartitionedRegion()
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
 
-      vm4.invoke(() -> WANTestBase.createCache(lnPort ));
-      vm5.invoke(() -> WANTestBase.createCache(lnPort ));
+      vm4.invoke(createCacheRunnable(lnPort));
+      vm5.invoke(createCacheRunnable(lnPort));
       
       vm4.invoke(() -> WANTestBase.createSender("ln1", 2, true, 10, 100, false, false, null, true));
       vm4.invoke(() -> WANTestBase.createSender("ln2", 2, true, 10, 100, false, false, null, true));
@@ -234,7 +239,7 @@ public void ___testSameParallelGatewaySenderIdAcrossDifferentPartitionedRegion()
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm1.invoke(createCacheRunnable(lnPort));
       
       vm1.invoke(() -> WANTestBase.createSender("ln1_Parallel", 2, true, 10, 100, false, false, null, true));
       vm1.invoke(() -> WANTestBase.createSender("ln2_Parallel", 2, true, 10, 100, false, false, null, true));
@@ -260,7 +265,7 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion()
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm1.invoke(createCacheRunnable(lnPort));
       
       vm1.invoke(() -> WANTestBase.createSender("ln1_Parallel", 2, true, 10, 100, false, false, null, true));
       vm1.invoke(() -> WANTestBase.createSender("ln2_Parallel", 2, true, 10, 100, false, false, null, true));
@@ -294,7 +299,7 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion2()
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm1.invoke(createCacheRunnable(lnPort));
       
       vm1.invoke(() -> WANTestBase.createSender("ln1_Parallel", 2, true, 10, 100, false, false, null, true));
       vm1.invoke(() -> WANTestBase.createSender("ln2_Parallel", 2, true, 10, 100, false, false, null, true));
@@ -321,7 +326,7 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion3()
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm1.invoke(createCacheRunnable(lnPort));
 
       vm1.invoke(() -> WANTestBase.createSender(
           "ln1_Parallel", 2, true, 10, 100, false, false, null, true ));
@@ -349,7 +354,7 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion4()
     try {
       Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-      vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm1.invoke(createCacheRunnable(lnPort));
 
       vm1.invoke(() -> WANTestBase.createSender("ln1_Parallel", 2, true, 10, 100, false, false, null, true));
       vm1.invoke(() -> WANTestBase.createSender("ln2_Parallel", 2, true, 10, 100, false, false, null, true));
@@ -378,7 +383,7 @@ public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion4()
   public void testSerialGatewaySenderAndParallelGatewaySenderWithSameName() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null, null, true, false ));
@@ -399,8 +404,8 @@ public void testSerialGatewaySenderAndParallelGatewaySenderWithSameName() {
   public void testSameRemoteDSAcrossSameSender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null, null,
@@ -425,8 +430,8 @@ public void testSameRemoteDSAcrossSameSender() {
   public void testSerialSenderOnBothCache() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null, null,
@@ -450,8 +455,8 @@ public void testSerialSenderOnBothCache() {
   public void testParallelSenderOnBothCache(){
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         true, 100,false, false,
@@ -476,8 +481,8 @@ public void testParallelSenderOnBothCache(){
   public void testBatchConflation() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         false, 100, false, false,
@@ -502,8 +507,8 @@ public void testBatchConflation() {
   public void testisPersistentEnabled() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         false, 100, false, false,
@@ -524,8 +529,8 @@ public void testisPersistentEnabled() {
   public void testAlertThreshold() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         false, 100, false, false,
@@ -546,8 +551,8 @@ public void testAlertThreshold() {
   public void testManualStart() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createSenderForValidations( "ln", 2,
         false, 100, false, false,
@@ -568,8 +573,8 @@ public void testManualStart() {
   public void testGatewayEventFilters() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     ArrayList eventFiletrs = new ArrayList();
     eventFiletrs.add(new MyGatewayEventFilter());
@@ -596,8 +601,8 @@ public void testGatewayEventFilters() {
   public void testGatewayEventFilters2() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     ArrayList eventFiletrs = new ArrayList();
     eventFiletrs.add(new MyGatewayEventFilter());
@@ -625,8 +630,8 @@ public void testGatewayEventFilters2() {
   public void testGatewayTransportFilters() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     ArrayList transportFiletrs = new ArrayList();
     transportFiletrs.add(new MyGatewayTransportFilter1());
@@ -655,8 +660,8 @@ public void testGatewayTransportFilters() {
   public void testGatewayTransportFiltersOrder() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     ArrayList transportFiletrs = new ArrayList();
     transportFiletrs.add(new MyGatewayTransportFilter1());
@@ -711,8 +716,8 @@ public void testGatewayTransportFiltersOrder() {
   public void testIsDiskSynchronous() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createSenderForValidations(
         "ln", 2, false, 100, false, false, null,
@@ -761,7 +766,7 @@ public void test_GetCacheServersDoesNotReturnReceivers_Scenario2() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     
     vm4.invoke(() -> WANTestBase.createReceiver( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(createCacheRunnable(lnPort));
     
     vm5.invoke(() -> WANTestBase.createCacheServer( ));
     
@@ -785,8 +790,8 @@ public void test_GetCacheServersDoesNotReturnReceivers_Scenario2() {
   public void DISABLED_testDispatcherThreadsForParallelGatewaySender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
       true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
@@ -815,8 +820,8 @@ public void DISABLED_testDispatcherThreadsForParallelGatewaySender() {
   public void DISABLED_testOrderPolicyForParallelGatewaySender() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm1.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm1.invoke(createCacheRunnable(lnPort));
+    vm2.invoke(createCacheRunnable(lnPort));
 
     vm1.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
       true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY ));
@@ -840,27 +845,22 @@ public void testBug50434_RR_Serial() throws Exception {
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm2.invoke(createReceiverReplicatedRegion());
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
 
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm4.invoke(createReceiverReplicatedRegion());
+    vm5.invoke(createReceiverReplicatedRegion());
+    vm6.invoke(createReceiverReplicatedRegion());
+    vm7.invoke(createReceiverReplicatedRegion());
 
     vm4.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
       getTestMethodName() + "_RR", "ln"));
@@ -885,10 +885,10 @@ public void testBug50434_RR_Serial() throws Exception {
   public void testBug50434_RR_SerialAsyncEventQueue() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, false, false, null, false ));
@@ -899,14 +899,10 @@ public void testBug50434_RR_SerialAsyncEventQueue() throws Exception {
     vm7.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, false, false, null, false ));
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm4.invoke(createReceiverReplicatedRegion());
+    vm5.invoke(createReceiverReplicatedRegion());
+    vm6.invoke(createReceiverReplicatedRegion());
+    vm7.invoke(createReceiverReplicatedRegion());
 
     vm4.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_RR", "ln" ));
 
@@ -925,33 +921,33 @@ public void testBug50434_RR_SerialAsyncEventQueue() throws Exception {
       }
     }
   }
+
+  protected SerializableRunnableIF createReceiverReplicatedRegion() {
+    return () -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() );
+  }
   
   public void testBug50434_RR_Serial_Pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm2.invoke(createReceiverReplicatedRegion());
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
 
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm4.invoke(createReceiverReplicatedRegion());
+    vm5.invoke(createReceiverReplicatedRegion());
+    vm6.invoke(createReceiverReplicatedRegion());
+    vm7.invoke(createReceiverReplicatedRegion());
 
     vm4.invoke(() -> WANTestBase.addSenderThroughAttributesMutator(
       getTestMethodName() + "_RR", "ln"));
@@ -977,10 +973,10 @@ public void testBug50434_RR_Serial_Pass() throws Exception {
   public void testBug50434_RR_SerialAsyncEventQueue_Pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, false, false, null, false ));
@@ -991,14 +987,10 @@ public void testBug50434_RR_SerialAsyncEventQueue_Pass() throws Exception {
     vm7.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, false, false, null, false ));
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm4.invoke(createReceiverReplicatedRegion());
+    vm5.invoke(createReceiverReplicatedRegion());
+    vm6.invoke(createReceiverReplicatedRegion());
+    vm7.invoke(createReceiverReplicatedRegion());
 
     vm4.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_RR", "ln" ));
     vm5.invoke(() -> WANTestBase.addAsyncEventQueueThroughAttributesMutator( getTestMethodName() + "_RR", "ln" ));
@@ -1026,10 +1018,10 @@ public void testBug50434_PR_Serial() throws Exception {
     vm2.invoke(() -> WANTestBase.createPartitionedRegion(
       getTestMethodName() + "_RR", null, 1, 100, isOffHeap() ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
@@ -1079,10 +1071,10 @@ public void testBug50434_PR_Serial() throws Exception {
   public void testBug50434_PR_SerialAsyncEventQueue() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, false, false, null, false ));
@@ -1127,10 +1119,10 @@ public void testBug50434_PR_Serial_Pass() throws Exception {
     vm2.invoke(() -> WANTestBase.createPartitionedRegion(
       getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
@@ -1179,10 +1171,10 @@ public void testBug50434_PR_Serial_Pass() throws Exception {
   public void testBug50434_PR_SerialAsyncEventQueue_Pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
         false, 100, 100, false, false, null, false ));
@@ -1228,10 +1220,10 @@ public void testBug50434_PR_Parallel() throws Exception {
     vm2.invoke(() -> WANTestBase.createPartitionedRegion(
       getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -1273,10 +1265,10 @@ public void testBug50434_PR_Parallel() throws Exception {
   public void testBug50434_PR_ParallelAsyncEventQueue() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
         true, 100, 100, false, false, null, false ));
@@ -1321,10 +1313,10 @@ public void testBug50434_PR_Parallel_pass() throws Exception {
     vm2.invoke(() -> WANTestBase.createPartitionedRegion(
       getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -1368,10 +1360,10 @@ public void testBug50434_PR_Parallel_pass() throws Exception {
   public void testBug50434_PR_ParallelAsyncEventQueue_Pass() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createAsyncEventQueue( "ln",
         true, 100, 100, false, false, null, false ));
@@ -1424,8 +1416,8 @@ public void testBug50247_NonPersistentSenderWithPersistentRegion()
     IgnoredException.addIgnoredException("could not get remote locator information");
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
     
     try {
       vm4.invoke(() -> WANTestBase.createSender( "ln1", 2,
@@ -1471,10 +1463,10 @@ public void testReplicatedSerialAsyncEventQueueWith2WANSites() {
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     // ------------ START - CREATE CACHE, REGION ON LOCAL SITE ------------//
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index e52486f89995..a29a21042487 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -29,6 +29,8 @@
 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.SerializableCallableIF;
+import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
 
 public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
     WANTestBase {
@@ -84,13 +86,13 @@ public void testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled()
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, true, null, true ));
@@ -110,10 +112,10 @@ public void testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled()
     vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
         getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
     vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
         getTestMethodName(), null, 1, 100, isOffHeap() ));
@@ -129,6 +131,15 @@ public void testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled()
 
   }
 
+  protected SerializableCallableIF createReceiverRunnable(
+      Integer nyPort) {
+    return () -> WANTestBase.createReceiver( nyPort );
+  }
+
+  protected SerializableRunnableIF createCacheRunnable(Integer lnPort) {
+    return () -> WANTestBase.createCache( lnPort );
+  }
+
   /**
    * Enable persistence for the GatewaySender but not the region
    */
@@ -136,15 +147,15 @@ public void testPartitionedRegionWithPersistentGatewaySender() {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
     
     LogWriterUtils.getLogWriter().info("Created remote receivers");
     
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created local site cache");
 
@@ -159,22 +170,18 @@ public void testPartitionedRegionWithPersistentGatewaySender() {
   
     LogWriterUtils.getLogWriter().info("Created local site senders");
 
-    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm4.invoke(createPartitionedRegionRunnable());
+    vm5.invoke(createPartitionedRegionRunnable());
+    vm6.invoke(createPartitionedRegionRunnable());
+    vm7.invoke(createPartitionedRegionRunnable());
 
     LogWriterUtils.getLogWriter().info("Created local site persistent PR");
     
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
     LogWriterUtils.getLogWriter().info("Started sender on vm4");
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Started the senders");
 
@@ -190,6 +197,15 @@ public void testPartitionedRegionWithPersistentGatewaySender() {
     vm3.invoke(() -> WANTestBase.validateRegionSize(
       getTestMethodName(), 1000 ));
   }
+
+  protected SerializableRunnableIF createPartitionedRegionRunnable() {
+    return () -> WANTestBase.createPartitionedRegion(
+        getTestMethodName(), "ln", 1, 100, isOffHeap() );
+  }
+
+  protected SerializableRunnableIF startSenderRunnable() {
+    return () -> WANTestBase.startSender( "ln" );
+  }
   
   
   
@@ -207,14 +223,14 @@ public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //create senders with disk store
     String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true ));
@@ -231,32 +247,28 @@ public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
       getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create PR on local site
-    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm4.invoke(createPartitionedRegionRunnable());
+    vm5.invoke(createPartitionedRegionRunnable());
+    vm6.invoke(createPartitionedRegionRunnable());
+    vm7.invoke(createPartitionedRegionRunnable());
 
     //start the senders on local site
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //wait for senders to become running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     //pause the senders
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 3000 ));
@@ -264,18 +276,18 @@ public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
     
     //--------------------close and rebuild local site -------------------------------------------------
     //kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Killed all the senders.");
     
     //restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created back the cache");
     
@@ -287,14 +299,10 @@ public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
     
     LogWriterUtils.getLogWriter().info("Created the senders back from the disk store.");
     //create PR on local site
-    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    AsyncInvocation inv1 = vm4.invokeAsync(createPartitionedRegionRunnable());
+    AsyncInvocation inv2 = vm5.invokeAsync(createPartitionedRegionRunnable());
+    AsyncInvocation inv3 = vm6.invokeAsync(createPartitionedRegionRunnable());
+    AsyncInvocation inv4 = vm7.invokeAsync(createPartitionedRegionRunnable());
     
     try {
       inv1.join();
@@ -310,17 +318,17 @@ public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
     
     //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.startSender( "ln" ));
-    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm4.invokeAsync(startSenderRunnable());
+    vm5.invokeAsync(startSenderRunnable());
+    vm6.invokeAsync(startSenderRunnable());
+    vm7.invokeAsync(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
     //wait for senders running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("All the senders are now running...");
     
@@ -331,6 +339,18 @@ public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
     vm3.invoke(() -> WANTestBase.validateRegionSize(
       getTestMethodName(), 3000 ));
   }
+
+  protected SerializableRunnableIF killSenderRunnable() {
+    return () -> WANTestBase.killSender();
+  }
+
+  protected SerializableRunnableIF pauseSenderRunnable() {
+    return () -> WANTestBase.pauseSender( "ln" );
+  }
+
+  protected SerializableRunnableIF waitForSenderRunnable() {
+    return () -> WANTestBase.waitForSenderRunningState( "ln" );
+  }
   
   /**
    * Enable persistence for PR and GatewaySender.
@@ -346,14 +366,14 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart() {
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //create senders with disk store
     String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true ));
@@ -380,22 +400,22 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart() {
       getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
     //start the senders on local site
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //wait for senders to become running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     //pause the senders
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 3000 ));
@@ -403,18 +423,18 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart() {
     
     //--------------------close and rebuild local site -------------------------------------------------
     //kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Killed all the senders.");
     
     //restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created back the cache");
     
@@ -449,17 +469,17 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart() {
     
     //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.startSender( "ln" ));
-    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm4.invokeAsync(startSenderRunnable());
+    vm5.invokeAsync(startSenderRunnable());
+    vm6.invokeAsync(startSenderRunnable());
+    vm7.invokeAsync(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
     //wait for senders running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("All the senders are now running...");
     
@@ -485,10 +505,10 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart2() {
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //create senders with disk store
     String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, false ));
@@ -509,22 +529,22 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart2() {
       getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
     //start the senders on local site
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //wait for senders to become running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     //pause the senders
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 300 ));
@@ -532,18 +552,18 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart2() {
     
     //--------------------close and rebuild local site -------------------------------------------------
     //kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Killed all the senders.");
     
     //restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created back the cache");
     
@@ -584,23 +604,23 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart2() {
 
     //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.startSender( "ln" ));
-    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm4.invokeAsync(startSenderRunnable());
+    vm5.invokeAsync(startSenderRunnable());
+    vm6.invokeAsync(startSenderRunnable());
+    vm7.invokeAsync(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
     //wait for senders running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
 
 
     LogWriterUtils.getLogWriter().info("Creating the receiver.");
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
     //create PR on remote site
     
     LogWriterUtils.getLogWriter().info("Creating the partitioned region at receiver. ");
@@ -608,10 +628,10 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart2() {
       getTestMethodName(), null, 1, 100, isOffHeap() ));
     vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
       getTestMethodName(), null, 1, 100, isOffHeap() ));
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Doing some extra puts. ");
     //start puts in region on local site
@@ -645,14 +665,14 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart_Scenario
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //create senders with disk store
     String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true ));
@@ -679,22 +699,22 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart_Scenario
       getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
     //start the senders on local site
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //wait for senders to become running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     //pause the senders
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 3000 ));
@@ -702,18 +722,18 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart_Scenario
     
     //--------------------close and rebuild local site -------------------------------------------------
     //kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Killed all the senders.");
     
     //restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created back the cache");
     
@@ -749,17 +769,17 @@ public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart_Scenario
     
     //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.startSender( "ln" ));
-    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm4.invokeAsync(startSenderRunnable());
+    vm5.invokeAsync(startSenderRunnable());
+    vm6.invokeAsync(startSenderRunnable());
+    vm7.invokeAsync(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
     //wait for senders running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("All the senders are now running...");
     
@@ -793,14 +813,14 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_Bug44275() {
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //create senders with disk store
     String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true ));
@@ -827,22 +847,22 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_Bug44275() {
       getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
     //start the senders on local site
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //wait for senders to become running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     //pause the senders
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPutsWithKeyAsString( getTestMethodName(), 1000 ));
@@ -850,18 +870,18 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_Bug44275() {
     
     //--------------------close and rebuild local site -------------------------------------------------
     //kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Killed all the senders.");
     
     //restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created back the cache");
     
@@ -897,17 +917,17 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_Bug44275() {
     
     //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.startSender( "ln" ));
-    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm4.invokeAsync(startSenderRunnable());
+    vm5.invokeAsync(startSenderRunnable());
+    vm6.invokeAsync(startSenderRunnable());
+    vm7.invokeAsync(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
     //wait for senders running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("All the senders are now running...");
     
@@ -933,14 +953,14 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_DoOps() {
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //create senders with disk store
     String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true ));
@@ -967,22 +987,22 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_DoOps() {
       getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
     //start the senders on local site
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //wait for senders to become running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     //pause the senders
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPutsWithKeyAsString( getTestMethodName(), 1000 ));
@@ -990,18 +1010,18 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_DoOps() {
     
     //--------------------close and rebuild local site -------------------------------------------------
     //kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Killed all the senders.");
     
     //restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created back the cache");
     
@@ -1023,17 +1043,17 @@ public void testPersistentPRWithPersistentGatewaySender_Restart_DoOps() {
     
     //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.startSender( "ln" ));
-    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm4.invokeAsync(startSenderRunnable());
+    vm5.invokeAsync(startSenderRunnable());
+    vm6.invokeAsync(startSenderRunnable());
+    vm7.invokeAsync(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
     //wait for senders running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("All the senders are now running...");
     
@@ -1069,10 +1089,10 @@ public void testPersistentPR_Restart() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
     // create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     // create PR on local site
     vm4.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName(), "ln", 1, 100, isOffHeap() ));
@@ -1088,18 +1108,18 @@ public void testPersistentPR_Restart() {
     // --------------------close and rebuild local site
     // -------------------------------------------------
     // kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
 
     LogWriterUtils.getLogWriter().info("Killed all the senders.");
 
     // restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     LogWriterUtils.getLogWriter().info("Created back the cache");
 
@@ -1162,14 +1182,14 @@ public void NotSupported_testPersistentPartitionedRegionWithGatewaySenderPersist
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //create senders with disk store
     String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true ));
@@ -1196,22 +1216,22 @@ public void NotSupported_testPersistentPartitionedRegionWithGatewaySenderPersist
       getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
     //start the senders on local site
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //wait for senders to become running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     //pause the senders
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
@@ -1219,18 +1239,18 @@ public void NotSupported_testPersistentPartitionedRegionWithGatewaySenderPersist
     
     //--------------------close and rebuild local site -------------------------------------------------
     //kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Killed all the senders.");
     
     //restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created back the cache");
     
@@ -1245,19 +1265,19 @@ public void NotSupported_testPersistentPartitionedRegionWithGatewaySenderPersist
     
     
     //start the senders. NOTE that the senders are not associated with partitioned region
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Started the senders.");
     
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
     //wait for senders running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("All the senders are now running...");
     
@@ -1282,14 +1302,14 @@ public void NotSupported_testNonPersistentPartitionedRegionWithGatewaySenderPers
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //create senders with disk store
     String diskStore1 = (String) vm4.invoke(() -> WANTestBase.createSenderWithDiskStore( "ln", 2, true, 100, 10, false, true, null, null, true ));
@@ -1306,50 +1326,46 @@ public void NotSupported_testNonPersistentPartitionedRegionWithGatewaySenderPers
       getTestMethodName(), null, 1, 100, isOffHeap() ));
     
     //create non persistent PR on local site
-    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm4.invoke(createPartitionedRegionRunnable());
+    vm5.invoke(createPartitionedRegionRunnable());
+    vm6.invoke(createPartitionedRegionRunnable());
+    vm7.invoke(createPartitionedRegionRunnable());
 
     //start the senders on local site
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //wait for senders to become running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     //pause the senders
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
     LogWriterUtils.getLogWriter().info("Completed puts in the region");
     
     //kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Killed all the senders. The local site has been brought down.");
     
     //restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created back the cache");
     
@@ -1362,31 +1378,27 @@ public void NotSupported_testNonPersistentPartitionedRegionWithGatewaySenderPers
     LogWriterUtils.getLogWriter().info("Created the senders back from the disk store.");
     
     //create PR on local site
-    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName(), "ln", 1, 100, isOffHeap() ));
+    vm4.invoke(createPartitionedRegionRunnable());
+    vm5.invoke(createPartitionedRegionRunnable());
+    vm6.invoke(createPartitionedRegionRunnable());
+    vm7.invoke(createPartitionedRegionRunnable());
     
     LogWriterUtils.getLogWriter().info("Created back the partitioned regions");
     
     //start the senders
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Started the senders.");
     
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
     //wait for senders running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("All the senders are now running...");
     
@@ -1414,14 +1426,14 @@ public void Bug50247_testPersistentPartitionedRegionWithGatewaySender_Restart()
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
       true, 100, 10, false, false, null, true ));
@@ -1449,22 +1461,22 @@ public void Bug50247_testPersistentPartitionedRegionWithGatewaySender_Restart()
       getTestMethodName(), "ln", 1, 100, isOffHeap() ));
     
     //start the senders on local site
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //wait for senders to become running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     //pause the senders
-    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.pauseSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm4.invoke(pauseSenderRunnable());
+    vm5.invoke(pauseSenderRunnable());
+    vm6.invoke(pauseSenderRunnable());
+    vm7.invoke(pauseSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 3000 ));
@@ -1472,18 +1484,18 @@ public void Bug50247_testPersistentPartitionedRegionWithGatewaySender_Restart()
     
     //----------------- Close and rebuild local site -------------------------------------
     //kill the senders
-    vm4.invoke(() -> WANTestBase.killSender());
-    vm5.invoke(() -> WANTestBase.killSender());
-    vm6.invoke(() -> WANTestBase.killSender());
-    vm7.invoke(() -> WANTestBase.killSender());
+    vm4.invoke(killSenderRunnable());
+    vm5.invoke(killSenderRunnable());
+    vm6.invoke(killSenderRunnable());
+    vm7.invoke(killSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Killed all the senders.");
     
     //restart the vm
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     LogWriterUtils.getLogWriter().info("Created back the cache");
     
@@ -1505,20 +1517,20 @@ public void Bug50247_testPersistentPartitionedRegionWithGatewaySender_Restart()
     vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
     
     //start the senders
-    vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    vm4.invokeAsync(startSenderRunnable());
+    vm5.invokeAsync(startSenderRunnable());
+    vm6.invokeAsync(startSenderRunnable());
+    vm7.invokeAsync(startSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("Started the senders.");
     
     LogWriterUtils.getLogWriter().info("Waiting for senders running.");
 
     //wait for senders running
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     LogWriterUtils.getLogWriter().info("All the senders are now running...");
     
@@ -1569,14 +1581,14 @@ public void testParallelPropagationWithSenderPerisistenceEnabledForAccessor() {
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
     //create receiver on remote site
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
     //create cache in local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
       true, 100, 10, false, true, null, true ));
@@ -1601,10 +1613,10 @@ public void testParallelPropagationWithSenderPerisistenceEnabledForAccessor() {
     vm3.invoke(() -> WANTestBase.createPartitionedRegion(
       getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
     
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
     //start puts in region on local site
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
@@ -1628,13 +1640,13 @@ public void testRemoveGatewayFromPersistentRegionOnRestart() throws Throwable {
       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 ));
+      vm2.invoke(createReceiverRunnable(nyPort));
+      vm3.invoke(createReceiverRunnable(nyPort));
 
-      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-      vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-      vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm4.invoke(createCacheRunnable(lnPort));
+      vm5.invoke(createCacheRunnable(lnPort));
+      vm6.invoke(createCacheRunnable(lnPort));
+      vm7.invoke(createCacheRunnable(lnPort));
 
       vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, true, null, true ));
@@ -1654,10 +1666,10 @@ public void testRemoveGatewayFromPersistentRegionOnRestart() throws Throwable {
       vm7.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
         getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
-      vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-      vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-      vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-      vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+      vm4.invoke(startSenderRunnable());
+      vm5.invoke(startSenderRunnable());
+      vm6.invoke(startSenderRunnable());
+      vm7.invoke(startSenderRunnable());
 
       vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
         getTestMethodName(), null, 1, 100, isOffHeap() ));
@@ -1682,10 +1694,10 @@ public void testRemoveGatewayFromPersistentRegionOnRestart() throws Throwable {
       vm6.invoke(ParallelWANPersistenceEnabledGatewaySenderDUnitTest.class, "setIgnoreQueue" , new Object[] { true});
       vm7.invoke(ParallelWANPersistenceEnabledGatewaySenderDUnitTest.class, "setIgnoreQueue" , new Object[] { true});
 
-      vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-      vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-      vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-      vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+      vm4.invoke(createCacheRunnable(lnPort));
+      vm5.invoke(createCacheRunnable(lnPort));
+      vm6.invoke(createCacheRunnable(lnPort));
+      vm7.invoke(createCacheRunnable(lnPort));
 
       AsyncInvocation async4 = vm4.invokeAsync(() -> WANTestBase.createPersistentPartitionedRegion(
         getTestMethodName(), null, 1, 100, isOffHeap() ));
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index bfc95c94960f..474231c477df 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -33,6 +33,8 @@
 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.SerializableCallableIF;
+import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
 import com.gemstone.gemfire.test.dunit.Wait;
 
 public class ParallelWANPropagationDUnitTest extends WANTestBase {
@@ -85,10 +87,10 @@ public void testParallelPropagation_withoutRemoteSite() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
     
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //keep a larger batch to minimize number of exception occurrences in the log
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -100,19 +102,15 @@ public void testParallelPropagation_withoutRemoteSite() throws Exception {
     vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 300, 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(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm6.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm7.invoke(createPartitionedRegionRedundancy1Runnable());
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
     vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false ));
     vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false));
@@ -120,22 +118,20 @@ public void testParallelPropagation_withoutRemoteSite() throws Exception {
     vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", false ));
     
     //make sure all the senders are running before doing any puts
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
 
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
       1000 ));
 
     
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
     
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-      getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
     
     //verify all buckets drained on all sender nodes.
     vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
@@ -150,6 +146,10 @@ public void testParallelPropagation_withoutRemoteSite() throws Exception {
     vm2.invoke(() -> WANTestBase.validateRegionSize(
         getTestMethodName() + "_PR", 1000 ));
   }
+
+  protected SerializableRunnableIF createCacheRunnable(Integer lnPort) {
+    return () -> WANTestBase.createCache( lnPort );
+  }
   
   /**
    * Normal happy scenario test case.
@@ -159,13 +159,13 @@ public void testParallelPropagation() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -176,31 +176,25 @@ public void testParallelPropagation() throws Exception {
     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(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm6.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm7.invoke(createPartitionedRegionRedundancy1Runnable());
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     //before doing any puts, let the senders be running in order to ensure that
     //not a single event will be lost
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
         1000 ));
@@ -215,17 +209,35 @@ public void testParallelPropagation() throws Exception {
         getTestMethodName() + "_PR", 1000 ));
   }
 
+  protected SerializableRunnableIF createReceiverPartitionedRegionRedundancy1() {
+    return () -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  );
+  }
+
+  protected SerializableRunnableIF createPartitionedRegionRedundancy1Runnable() {
+    return () -> WANTestBase.createPartitionedRegion(
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap()  );
+  }
+
+  protected SerializableRunnableIF startSenderRunnable() {
+    return () -> WANTestBase.startSender( "ln" );
+  }
+
+  protected SerializableRunnableIF waitForSenderRunnable() {
+    return () -> WANTestBase.waitForSenderRunningState( "ln" );
+  }
+
   public void testParallelPropagation_ManualStart() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, false ));
@@ -236,26 +248,20 @@ public void testParallelPropagation_ManualStart() throws Exception {
     vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, false ));
 
-    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(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm6.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm7.invoke(createPartitionedRegionRedundancy1Runnable());
 
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     //before doing any puts, let the senders be running in order to ensure that
     //not a single event will be lost
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
         1000 ));
@@ -278,13 +284,13 @@ public void testParallelPropagationPutBeforeSenderStart() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -295,22 +301,18 @@ public void testParallelPropagationPutBeforeSenderStart() throws Exception {
     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(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm6.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm7.invoke(createPartitionedRegionRedundancy1Runnable());
 
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
       1000 ));
     
-    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    AsyncInvocation inv2 = vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    AsyncInvocation inv3 = vm6.invokeAsync(() -> WANTestBase.startSender( "ln" ));
-    AsyncInvocation inv4 = vm7.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation inv1 = vm4.invokeAsync(startSenderRunnable());
+    AsyncInvocation inv2 = vm5.invokeAsync(startSenderRunnable());
+    AsyncInvocation inv3 = vm6.invokeAsync(startSenderRunnable());
+    AsyncInvocation inv4 = vm7.invokeAsync(startSenderRunnable());
 
     try{
       inv1.join();
@@ -321,17 +323,15 @@ public void testParallelPropagationPutBeforeSenderStart() throws Exception {
     catch(InterruptedException ie) {
       fail("Caught interrupted exception");
     }
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     //before doing any puts, let the senders be running in order to ensure that
     //not a single event will be lost
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
         1000 ));
@@ -353,13 +353,13 @@ public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws Excep
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -370,31 +370,25 @@ public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws Excep
     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(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm6.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm7.invoke(createPartitionedRegionRedundancy1Runnable());
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     //before doing any puts, let the senders be running in order to ensure that
     //not a single event will be lost
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR",
       1000 ));
@@ -411,10 +405,10 @@ public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws Excep
       (Integer) vm2.invoke(() -> WANTestBase.getRegionSize(getTestMethodName() + "_PR" ));
     LogWriterUtils.getLogWriter().info("Region size on remote is: " + regionSize);
     
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -430,24 +424,20 @@ public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws Excep
     vm6.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
     vm7.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", 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(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm6.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm7.invoke(createPartitionedRegionRedundancy1Runnable());
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     //------------------------------------------------------------------------------------
     
     IgnoredException.addIgnoredException(EntryExistsException.class.getName());
@@ -472,13 +462,13 @@ public void testParallelColocatedPropagation() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -494,10 +484,10 @@ public void testParallelColocatedPropagation() throws Exception {
     vm6.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
     vm7.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
     vm2.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), null, 1, 100, isOffHeap()  ));
     vm3.invoke(() -> WANTestBase.createColocatedPartitionedRegions( getTestMethodName(), null, 1, 100, isOffHeap()  ));
@@ -526,13 +516,13 @@ public void testParallelColocatedPropagation2() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -548,10 +538,10 @@ public void testParallelColocatedPropagation2() throws Exception {
     vm6.invoke(() -> WANTestBase.createColocatedPartitionedRegions2( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
     vm7.invoke(() -> WANTestBase.createColocatedPartitionedRegions2( getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
     vm2.invoke(() -> WANTestBase.createColocatedPartitionedRegions2( getTestMethodName(), null, 1, 100, isOffHeap()  ));
     vm3.invoke(() -> WANTestBase.createColocatedPartitionedRegions2( getTestMethodName(), null, 1, 100, isOffHeap()  ));
@@ -579,13 +569,13 @@ public void testParallelPropagationWihtOverflow() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -605,10 +595,10 @@ public void testParallelPropagationWihtOverflow() throws Exception {
     vm7.invoke(() -> WANTestBase.createPartitionedRegion(
         getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
     vm2.invoke(() -> WANTestBase.createPartitionedRegion(
         getTestMethodName(), null, 1, 100, isOffHeap()  ));
@@ -616,10 +606,10 @@ public void testParallelPropagationWihtOverflow() throws Exception {
         getTestMethodName(), null, 1, 100, isOffHeap()  ));
 
     //let all the senders start before doing any puts to ensure that none of the events is lost
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.doHeavyPuts( getTestMethodName(), 150 ));
 
@@ -639,13 +629,13 @@ public void testSerialReplicatedAndParallePartitionedPropagation()
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "lnSerial",
         2, false, 100, 10, false, false, null, true ));
@@ -666,10 +656,8 @@ public void testSerialReplicatedAndParallePartitionedPropagation()
     vm3.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", null, isOffHeap()  ));
 
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     vm4.invoke(() -> WANTestBase.createReplicatedRegion(
         getTestMethodName() + "_RR", "lnSerial", isOffHeap()  ));
@@ -720,13 +708,13 @@ public void testPartitionedParallelPropagationToTwoWanSites()
     Integer nyPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
     Integer tkPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
 
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createReceiver( tkPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(tkPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "lnParallel1",
         2, true, 100, 10, false, false, null, true ));
@@ -765,10 +753,8 @@ public void testPartitionedParallelPropagationToTwoWanSites()
     vm6.invoke(() -> WANTestBase.startSender( "lnParallel2" ));
     vm7.invoke(() -> WANTestBase.startSender( "lnParallel2" ));
 
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     //before doing puts, make sure that the senders are started.
     //this will ensure that not a single events is lost
@@ -811,13 +797,13 @@ public void testPartitionedParallelPropagationHA() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -842,15 +828,13 @@ public void testPartitionedParallelPropagationHA() throws Exception {
     vm7.invoke(() -> WANTestBase.createPartitionedRegion(
         getTestMethodName() + "_PR", "ln", 2, 100, isOffHeap()  ));
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
     
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     AsyncInvocation inv1 = vm7.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 5000 ));
     Wait.pause(500);
@@ -882,13 +866,13 @@ public void testParallelPropagationWithFilter() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false,
@@ -912,10 +896,10 @@ public void testParallelPropagationWithFilter() throws Exception {
     vm7.invoke(() -> WANTestBase.createPartitionedRegion(
         getTestMethodName(), "ln", 1, 100, isOffHeap()  ));
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
     vm2.invoke(() -> WANTestBase.createPartitionedRegion(
         getTestMethodName(), null, 1, 100, isOffHeap()  ));
@@ -924,10 +908,10 @@ public void testParallelPropagationWithFilter() throws Exception {
 
     //wait for senders to be running before doing any puts. This will ensure that
     //not a single events is lost
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
 
@@ -941,13 +925,13 @@ public void testParallelPropagationWithPutAll() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 10, false, false, null, true ));
@@ -958,31 +942,25 @@ public void testParallelPropagationWithPutAll() throws Exception {
     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(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm6.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm7.invoke(createPartitionedRegionRedundancy1Runnable());
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     //before doing any puts, let the senders be running in order to ensure that
     //not a single event will be lost
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.doPutAll( getTestMethodName() + "_PR",
         100 , 50 ));
@@ -1009,13 +987,13 @@ public void testParallelPropagationWithDestroy() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 100, false, false, null, true ));
@@ -1026,31 +1004,25 @@ public void testParallelPropagationWithDestroy() throws Exception {
     vm7.invoke(() -> WANTestBase.createSender( "ln", 2,
         true, 100, 100, 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(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm6.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm7.invoke(createPartitionedRegionRedundancy1Runnable());
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm6.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm7.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
+    vm6.invoke(startSenderRunnable());
+    vm7.invoke(startSenderRunnable());
 
-    vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
-    vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", null, 1, 100, isOffHeap()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     //before doing any puts, let the senders be running in order to ensure that
     //not a single event will be lost
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
+    vm6.invoke(waitForSenderRunnable());
+    vm7.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
     vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
@@ -1096,11 +1068,11 @@ public void testParallelPropagationTxOperations() throws Exception {
     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 ));
+    vm2.invoke(createReceiverRunnable(nyPort));
+    vm3.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
     //vm6.invoke(() -> WANTestBase.createCache( lnPort ));
     //vm7.invoke(() -> WANTestBase.createCache( lnPort ));
 
@@ -1113,29 +1085,25 @@ public void testParallelPropagationTxOperations() throws Exception {
     //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()  ));
+    vm4.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
 //    vm6.invoke(() -> WANTestBase.createPartitionedRegion(
 //        testName + "_PR", "ln", true, 1, 100, isOffHeap()  ));
 //    vm7.invoke(() -> WANTestBase.createPartitionedRegion(
 //        testName + "_PR", "ln", true, 1, 100, isOffHeap()  ));
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
 //    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()  ));
+    vm2.invoke(createReceiverPartitionedRegionRedundancy1());
+    vm3.invoke(createReceiverPartitionedRegionRedundancy1());
 
     //before doing any puts, let the senders be running in order to ensure that
     //not a single event will be lost
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
 //    vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
 //    vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     vm4.invoke(() -> WANTestBase.doTxPuts( getTestMethodName() + "_PR",
@@ -1155,26 +1123,24 @@ public void disable_testParallelGatewaySenderQueueLocalSize() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
     
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(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 ));
 
-    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap()  ));
+    vm4.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
 
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
     vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
@@ -1210,26 +1176,24 @@ public void tParallelGatewaySenderQueueLocalSizeWithHA() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
     
-    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(createReceiverRunnable(nyPort));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(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 ));
 
-    vm4.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createPartitionedRegion(
-        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap()  ));
+    vm4.invoke(createPartitionedRegionRedundancy1Runnable());
+    vm5.invoke(createPartitionedRegionRedundancy1Runnable());
 
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
 
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
     
     vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
     vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
@@ -1269,17 +1233,17 @@ public void testParallelSenderAttachedToChildRegionButNotToParentRegion() {
 	Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 	    
 	//create cache and receiver on site2
-	vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+	vm2.invoke(createReceiverRunnable(nyPort));
 
 	//create cache on site1
-	vm3.invoke(() -> WANTestBase.createCache( lnPort ));   
+	vm3.invoke(createCacheRunnable(lnPort));   
 	
 	//create sender on site1
     vm3.invoke(() -> WANTestBase.createSender( "ln", 2,
       true, 100, 10, false, false, null, true ));
     
     //start sender on site1
-    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm3.invoke(startSenderRunnable());
     
     //create leader (parent) PR on site1
     vm3.invoke(() -> WANTestBase.createPartitionedRegion(
@@ -1309,13 +1273,13 @@ public void testParallelPropagationWithFilter_AfterAck() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm6.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm7.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm6.invoke(createReceiverRunnable(nyPort));
+    vm7.invoke(createReceiverRunnable(nyPort));
 
-    vm2.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm3.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm2.invoke(createCacheRunnable(lnPort));
+    vm3.invoke(createCacheRunnable(lnPort));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     vm2.invoke(() -> WANTestBase.createSender( "ln", 2, true,
         100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true ));
@@ -1335,10 +1299,10 @@ public void testParallelPropagationWithFilter_AfterAck() throws Exception {
     vm5.invoke(() -> WANTestBase.createPartitionedRegion(
         getTestMethodName(), "ln", 1, 100, isOffHeap() ));
 
-    vm2.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm3.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm2.invoke(startSenderRunnable());
+    vm3.invoke(startSenderRunnable());
+    vm4.invoke(startSenderRunnable());
+    vm5.invoke(startSenderRunnable());
 
     vm6.invoke(() -> WANTestBase.createPartitionedRegion(
         getTestMethodName(), null, 1, 100, isOffHeap() ));
@@ -1348,10 +1312,10 @@ public void testParallelPropagationWithFilter_AfterAck() throws Exception {
     // wait for senders to be running before doing any puts. This will ensure
     // that
     // not a single events is lost
-    vm2.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm3.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
-    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm2.invoke(waitForSenderRunnable());
+    vm3.invoke(waitForSenderRunnable());
+    vm4.invoke(waitForSenderRunnable());
+    vm5.invoke(waitForSenderRunnable());
 
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName(), 1000 ));
 
@@ -1385,5 +1349,10 @@ public void testParallelPropagationWithFilter_AfterAck() throws Exception {
 
     assertEquals(2000, (vm2Acks + vm3Acks + vm4Acks + vm5Acks));
         
+  }
+
+  protected SerializableCallableIF createReceiverRunnable(
+      Integer nyPort) {
+    return () -> WANTestBase.createReceiver( nyPort );
   } 
 }
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
index 91234c9fc53b..d89c8645260b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
@@ -28,6 +28,7 @@
 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.SerializableRunnableIF;
 import com.gemstone.gemfire.test.dunit.Wait;
 
 public class SerialWANPropogationDUnitTest extends WANTestBase {
@@ -52,10 +53,10 @@ public void setUp() throws Exception {
   public void disabledtestReplicatedSerialPropagation_withoutRemoteLocator() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
 
-    vm4.invoke(() -> WANTestBase.createCache(lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache(lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache(lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //keep the batch size high enough to reduce the number of exceptions in the log
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -66,22 +67,18 @@ public void disabledtestReplicatedSerialPropagation_withoutRemoteLocator() throw
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()    ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
     
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
       1000 ));
 
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm2.invoke(() -> WANTestBase.createCache( nyPort ));
-    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm2.invoke(createCacheRunnable(nyPort));
+    vm3.invoke(createCacheRunnable(nyPort));
   
     vm2.invoke(() -> WANTestBase.createReceiver2(nyPort ));
     vm3.invoke(() -> WANTestBase.createReceiver2(nyPort ));
@@ -98,6 +95,15 @@ public void disabledtestReplicatedSerialPropagation_withoutRemoteLocator() throw
         getTestMethodName() + "_RR", 1000 ));
     vm3.invoke(() -> WANTestBase.validateRegionSize(
         getTestMethodName() + "_RR", 1000 ));
+  }
+
+  protected SerializableRunnableIF createReplicatedRegionRunnable() {
+    return () -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap()   );
+  }
+
+  protected SerializableRunnableIF createCacheRunnable(Integer lnPort) {
+    return () -> WANTestBase.createCache(lnPort );
   } 
 
   
@@ -106,10 +112,10 @@ public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception
 
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
     
-    vm4.invoke(() -> WANTestBase.createCache(lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache(lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache(lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //keep the batch size high enough to reduce the number of exceptions in the log
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -120,14 +126,10 @@ public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
     
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());
@@ -140,8 +142,8 @@ public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
       1000 ));
     
-    vm2.invoke(() -> WANTestBase.createCache( nyPort ));
-    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm2.invoke(createCacheRunnable(nyPort));
+    vm3.invoke(createCacheRunnable(nyPort));
   
     vm2.invoke(() -> WANTestBase.createReceiver2(nyPort ));
     vm3.invoke(() -> WANTestBase.createReceiver2(nyPort ));
@@ -171,10 +173,10 @@ public void testReplicatedSerialPropagationWithoutRemoteSite_defect46595()
 
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     // reduce the batch-size so maximum number of batches will be sent
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -185,14 +187,10 @@ public void testReplicatedSerialPropagationWithoutRemoteSite_defect46595()
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());
@@ -208,8 +206,8 @@ public void testReplicatedSerialPropagationWithoutRemoteSite_defect46595()
     // pause for some time before starting up the remote site
     Wait.pause(10000);
 
-    vm2.invoke(() -> WANTestBase.createCache( nyPort ));
-    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm2.invoke(createCacheRunnable(nyPort));
+    vm3.invoke(createCacheRunnable(nyPort));
     
     vm2.invoke(() -> WANTestBase.createReplicatedRegion(
       getTestMethodName() + "_RR", null, isOffHeap()  ));
@@ -238,10 +236,10 @@ public void testReplicatedSerialPropagation() throws Exception {
     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(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
@@ -256,14 +254,10 @@ public void testReplicatedSerialPropagation() throws Exception {
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         1000 ));
@@ -281,10 +275,10 @@ public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throw
     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(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
@@ -299,14 +293,10 @@ public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throw
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()   ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
     
     vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         1000 ));
@@ -321,10 +311,10 @@ public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throw
       (Integer) vm2.invoke(() -> WANTestBase.getRegionSize(getTestMethodName() + "_RR" ));
     LogWriterUtils.getLogWriter().info("Region size on remote is: " + regionSize);
     
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
       false, 100, 10, false, false, null, true ));
@@ -334,14 +324,10 @@ public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throw
     vm4.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
     vm5.invoke(() -> WANTestBase.setRemoveFromQueueOnException( "ln", true ));
     
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-      getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
     
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
@@ -380,10 +366,10 @@ public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Excep
     vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     //these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //senders are created on local site
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -465,10 +451,10 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exce
     vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     //these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //senders are created on local site
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -537,10 +523,10 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() throws Exc
     vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     //these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //senders are created on local site
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -623,10 +609,10 @@ public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
 
 
     // these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     // senders are created on local site
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -734,10 +720,10 @@ public void testReplicatedSerialPropagationWithRemoteReceiverStopped() throws Ex
     //vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     //these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     //senders are created on local site. Batch size is kept to a high (170) so 
     //there will be less number of exceptions (occur during dispatchBatch) in the log 
@@ -794,8 +780,8 @@ public void testReplicatedSerialPropagationWithRemoteReceiverRestarted()
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     // these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
@@ -861,8 +847,8 @@ public void testReplicatedSerialPropagationWithRemoteReceiverRestarted_SenderRec
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     // these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
@@ -929,8 +915,8 @@ public void testReplicatedSerialPropagationWithRemoteSiteBouncedBack_ReceiverPer
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
     // these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
@@ -1002,8 +988,8 @@ public void testReplicatedSerialPropagationWithRemoteSiteBouncedBackWithMultiple
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort1 ));
 
     // these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
@@ -1064,11 +1050,11 @@ public void testReplicatedSerialPropagationWithRemoteReceiverRestartedOnOtherNod
 
     // these are part of remote site
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
-    vm3.invoke(() -> WANTestBase.createCache( nyPort ));
+    vm3.invoke(createCacheRunnable(nyPort));
 
     // these are part of local site
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     // senders are created on local site. Batch size is kept to a high (170) so
     // there will be less number of exceptions (occur during dispatchBatch) in
@@ -1133,10 +1119,10 @@ public void testReplicatedSerialPropagationToTwoWanSites() throws Exception {
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
     vm3.invoke(() -> WANTestBase.createReceiver( tkPort ));
 
-    vm4.invoke(() -> WANTestBase.createCache(lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache(lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache(lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache(lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "lnSerial1",
         2, false, 100, 10, false, false, null, true ));
@@ -1185,10 +1171,10 @@ public void testReplicatedSerialPropagationHA() throws Exception {
     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(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
@@ -1203,14 +1189,10 @@ public void testReplicatedSerialPropagationHA() throws Exception {
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
 
     AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 10000 ));
     Wait.pause(2000);
@@ -1249,8 +1231,8 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinity()
 
     LogWriterUtils.getLogWriter().info("Started receivers on remote site");
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
@@ -1271,10 +1253,8 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinity()
 
     LogWriterUtils.getLogWriter().info("Started senders on local site");
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
 
     AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 10000 ));
     LogWriterUtils.getLogWriter().info("Started async puts on local site");
@@ -1334,8 +1314,8 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
 
     LogWriterUtils.getLogWriter().info("Started receivers on remote site");
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
@@ -1356,10 +1336,8 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
 
     LogWriterUtils.getLogWriter().info("Started senders on local site");
 
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
 
     AsyncInvocation inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 10000 ));
     LogWriterUtils.getLogWriter().info("Started async puts on local site");
@@ -1385,12 +1363,11 @@ public void SURtestReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
     // ---------------------------REBUILD vm4
     // --------------------------------------
     LogWriterUtils.getLogWriter().info("Rebuilding vm4....");
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap()  ));
+    vm4.invoke(createReplicatedRegionRunnable());
     LogWriterUtils.getLogWriter().info("Rebuilt vm4");
     // -----------------------------------------------------------------------------
 
@@ -1427,8 +1404,8 @@ public void testNormalRegionSerialPropagation() throws Exception {
 
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
 
-    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm4.invoke(createCacheRunnable(lnPort));
+    vm5.invoke(createCacheRunnable(lnPort));
 
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
@@ -1484,8 +1461,8 @@ public void testReplicatedSerialPropagationWithRemoteSenderConfiguredButNotStart
 	
 	vm4.invoke(() -> WANTestBase.createReceiver( lnPort ));
 	vm5.invoke(() -> WANTestBase.createReceiver( lnPort ));
-    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
-    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(createCacheRunnable(lnPort));
+    vm7.invoke(createCacheRunnable(lnPort));
     
     vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
         false, 100, 10, false, false, null, true ));
@@ -1495,14 +1472,10 @@ public void testReplicatedSerialPropagationWithRemoteSenderConfiguredButNotStart
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(createReplicatedRegionRunnable());
+    vm5.invoke(createReplicatedRegionRunnable());
+    vm6.invoke(createReplicatedRegionRunnable());
+    vm7.invoke(createReplicatedRegionRunnable());
     
     vm2.invoke(() -> WANTestBase.createSender( "ny", 1,
         false, 100, 10, false, false, null, true ));

From 9beed82ef44129452312cdf8021beb4b05804d86 Mon Sep 17 00:00:00 2001
From: Dan Smith 
Date: Wed, 17 Feb 2016 12:05:55 -0800
Subject: [PATCH 10/12] Removing a test which tests nothing.

---
 .../internal/cache/HABug36773DUnitTest.java   | 364 ------------------
 1 file changed, 364 deletions(-)
 delete mode 100755 gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java

diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
deleted file mode 100755
index 3268b68ade0f..000000000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.internal.cache;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheException;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-import com.gemstone.gemfire.cache.client.internal.Connection;
-import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.ClientServerTestCase;
-import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.dunit.NetworkUtils;
-import com.gemstone.gemfire.test.dunit.VM;
-
-/**
- * This is the Bug test for the bug 36773. Skipped sequence id causes missing
- * entry in client. The test perform following operations in sequence. 
- * 1. Create Server1 & Server2 
- * 2. Create Client1 & Client2 
- * 3. Perform put operation from the client1 on key1 & key2 such a way that 
- * put with lower sequence id reaches primary after the put with greater sequence id.
- * 4. Check for the keys on Client2
- * 
- * @author Girish Thombare
- * 
- */
-
-public class HABug36773DUnitTest extends DistributedTestCase
-{
-
-  VM server1 = null;
-
-  VM server2 = null;
-
-  VM client1 = null;
-
-  VM client2 = null;
-
-  private static int PORT1;
-
-  private static int PORT2;
-
-  private static final String REGION_NAME = "HABug36773DUnitTest_region";
-  
-  static final String KEY1 = "key1";
-  
-  static final String KEY2 = "key2";
-  
-  static final String VALUE1 = "newVal1";
-  
-  static final String VALUE2 = "newVal2";
-  
-  static volatile boolean waitFlag = true;
- 
-  protected static Cache cache = null;
-
-  /** constructor */
-  public HABug36773DUnitTest(String name) {
-    super(name);
-  }
-
-  public void setUp() throws Exception {
-    super.setUp();
-    disconnectAllFromDS();
-    final Host host = Host.getHost(0);
-    // Server1 VM
-    server1 = host.getVM(0);
-
-    // Server2 VM
-    server2 = host.getVM(1);
-
-    // Client 1 VM
-    client1 = host.getVM(2);
-
-    // client 2 VM
-    client2 = host.getVM(3);
-
-    PORT1 = ((Integer)server1.invoke(() -> HABug36773DUnitTest.createServerCache())).intValue();
-    PORT2 = ((Integer)server2.invoke(() -> HABug36773DUnitTest.createServerCache())).intValue();
-    client1.invoke(() -> HABug36773DUnitTest.disableShufflingOfEndpoints());
-    client2.invoke(() -> HABug36773DUnitTest.disableShufflingOfEndpoints());
-    client1.invoke(() -> HABug36773DUnitTest.createClientCache( new Integer(PORT1), new Integer(PORT2) ));
-    client2.invoke(() -> HABug36773DUnitTest.createClientCache( new Integer(PORT1), new Integer(PORT2) ));
-
-  }
-
-  private void createCache(Properties props) throws Exception
-  {
-    DistributedSystem ds = getSystem(props);
-    cache = CacheFactory.create(ds);
-    assertNotNull(cache);
-  }
-
-  public static void disableShufflingOfEndpoints()
-  {
-    System.setProperty("gemfire.bridge.disableShufflingOfEndpoints", "true");
-  }
-
-  public void _testBug36773() throws Exception
-  {
-    //First create entries on both servers via the two client
-    client1.invoke(() -> HABug36773DUnitTest.createEntriesK1andK2());
-    client2.invoke(() -> HABug36773DUnitTest.createEntriesK1andK2());
-    client1.invoke(() -> HABug36773DUnitTest.registerKeysK1andK2());
-    client2.invoke(() -> HABug36773DUnitTest.registerKeysK1andK2());
-
-    server1.invoke(checkSizeRegion(2));
-    server2.invoke(checkSizeRegion(2));
-    client1.invoke(checkSizeRegion(2));
-    client2.invoke(checkSizeRegion(2));
-
-    server1.invoke(() -> HABug36773DUnitTest.waitOnTheKeyEntry());
-    client1.invoke(() -> HABug36773DUnitTest.acquireConnectionsAndPut(new Integer(PORT2)));
-    client1.invoke(() -> HABug36773DUnitTest.acquireConnectionsAndPut(new Integer(PORT1)));
-      client2.invoke(() -> HABug36773DUnitTest.verifyEntries(new String(KEY2), new String (VALUE2)));
-    server1.invoke(() -> HABug36773DUnitTest.notfiyThread());
-    client2.invoke(() -> HABug36773DUnitTest.verifyEntries(new String(KEY1), new String (VALUE1)));
-  
-  }
-
-  public void testDummyForBug36773()
-  {
-    LogWriterUtils.getLogWriter().info(" This is the dummy test for the Bug 36773");
-    
-  }
-  
-
-  private CacheSerializableRunnable checkSizeRegion(final int size)
-  {
-
-    CacheSerializableRunnable checkRegion = new CacheSerializableRunnable(
-        "checkSize") {
-
-      public void run2() throws CacheException
-      {
-        Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME);
-        assertNotNull(region);
-        LogWriterUtils.getLogWriter().info("Size of the region " + region.size());
-        assertEquals(size, region.size());
-      }
-    };
-    return checkRegion;
-  }
-
-  public static void acquireConnectionsAndPut(Integer portNumber)
-  {
-    try {
-      int port = portNumber.intValue();
-      Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
-      assertNotNull(r1);
-      PoolImpl pool = (PoolImpl)PoolManager.find(r1.getAttributes().getPoolName());
-      assertNotNull(pool);
-      Connection conn = pool.acquireConnection();
-      final Connection conn1;
-      ServerRegionProxy srp = new ServerRegionProxy(Region.SEPARATOR + REGION_NAME, pool);
-
-      if (conn.getServer().getPort() != port) {
-        conn1 = pool.acquireConnection(); // Ensure we have a server
-        // with the
-        // proper port
-      }
-      else {
-        conn1 = conn;
-      }
-      assertNotNull(conn1);
-      if (port == PORT2) {
-        assertEquals(PORT2, conn1.getServer().getPort());
-        srp.putOnForTestsOnly(conn1, KEY1, VALUE1, new EventID(new byte[] { 1 }, 2, 1), null);
-      }
-      else if (port == PORT1) {
-        assertEquals(PORT1, conn1.getServer().getPort());
-        srp.putOnForTestsOnly(conn1, KEY2, VALUE2, new EventID(new byte[] { 1 }, 2, 2), null);
-      }
-      else {
-        fail("Invalid ports ");
-      }
-    }
-    catch (Exception ex) {
-      ex.printStackTrace();
-      fail("while setting acquireConnections  " + ex);
-    }
-  }
-  
-  
-
-  public static void verifyEntries(String KEY, String VALUE)
-  {
-    Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
-    assertNotNull(r1);
-    long maxWaitTime = 120000;
-    try {
-      long start = System.currentTimeMillis();
-      while (!r1.getEntry(KEY).getValue().equals(VALUE)) {
-        assertTrue("Waited over " + maxWaitTime + "entry to get updated",
-            (System.currentTimeMillis() - start) < maxWaitTime);
-        try {
-          Thread.yield();
-          Thread.sleep(700);
-        }
-        catch (InterruptedException ie) {
-          Assert.fail("Interrupted while waiting ", ie);
-        }
-      }
-    }
-    catch (Exception e) {
-      fail("Exception in trying to get due to " + e);
-    }
-  }
-  
-
-
-  public static void createEntriesK1andK2()
-  {
-    try {
-      Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
-      assertNotNull(r1);
-      if (!r1.containsKey(KEY1)) {
-        r1.create(KEY1, "key-1");
-      }
-      if (!r1.containsKey(KEY2)) {
-        r1.create(KEY2, "key-2");
-      }
-      assertEquals(r1.getEntry(KEY1).getValue(), "key-1");
-      assertEquals(r1.getEntry(KEY2).getValue(), "key-2");
-    }
-    catch (Exception ex) {
-      Assert.fail("failed while createEntriesK1andK2()", ex);
-    }
-  }
-  
-  public static void notfiyThread()
-  {
-    waitFlag=false; 
-  }
-
-  public static void createClientCache(Integer port1, Integer port2)
-      throws Exception
-  {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
-    Properties props = new Properties();
-    props.setProperty("mcast-port", "0");
-    props.setProperty("locators", "");
-    new HABug36773DUnitTest("temp").createCache(props);
-    AttributesFactory factory = new AttributesFactory();
-    factory.setScope(Scope.DISTRIBUTED_ACK);
-    ClientServerTestCase.configureConnectionPool(factory, NetworkUtils.getIPLiteral(), new int[] {PORT1,PORT2}, true, -1, 2, null);
-    RegionAttributes attrs = factory.create();
-    cache.createRegion(REGION_NAME, attrs);
-  }
-
-  public static Integer createServerCache()
-      throws Exception
-  {
-    new HABug36773DUnitTest("temp").createCache(new Properties());
-    AttributesFactory factory = new AttributesFactory();
-    factory.setScope(Scope.DISTRIBUTED_ACK);
-    factory.setDataPolicy(DataPolicy.REPLICATE);
-    factory.setEarlyAck(true);
-    RegionAttributes attrs = factory.create();
-    cache.createRegion(REGION_NAME, attrs);
-    CacheServer server = cache.addCacheServer();
-    assertNotNull(server);
-    int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    server.setPort(port);
-    server.setNotifyBySubscription(true);
-    server.start();
-    return new Integer(server.getPort());
-  }
-
-  public static void registerKeysK1andK2()
-  {
-    try {
-      Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
-      assertNotNull(r);
-      List list = new ArrayList();
-      list.add(KEY1);
-      list.add(KEY2);
-      r.registerInterest(list);
-
-    }
-    catch (Exception ex) {
-      Assert.fail("failed while registering interest", ex);
-    }
-  }
-
-
-  public static void closeCache()
-  {
-    if (cache != null && !cache.isClosed()) {
-      cache.close();
-      cache.getDistributedSystem().disconnect();
-    }
-  }
-
-  public static void waitOnTheKeyEntry()
-  {
-    Thread thrd = new Thread() {
-      public void run()
-      {
-        LocalRegion region = (LocalRegion)cache.getRegion(Region.SEPARATOR
-            + REGION_NAME);
-        RegionEntry regionEntry = region.basicGetEntry(KEY1);
-        synchronized (regionEntry) {
-          while (waitFlag) {
-            try {
-              Thread.sleep(500);
-            }
-            catch (InterruptedException e) {
-              fail("interrupted");
-            }
-          }
-        }
-      }
-    };
-
-    thrd.start();
-
-  }
-  
-  @Override
-  protected final void preTearDown() throws Exception {
-    //close client
-    client1.invoke(() -> HABug36773DUnitTest.closeCache());
-    client2.invoke(() -> HABug36773DUnitTest.closeCache());
-    //close server
-    server1.invoke(() -> HABug36773DUnitTest.closeCache());
-    server2.invoke(() -> HABug36773DUnitTest.closeCache());
-  }
-}
-

From 923e219f2ea8e3cd6d5baed3d585489b30c86a75 Mon Sep 17 00:00:00 2001
From: Dan Smith 
Date: Wed, 17 Feb 2016 15:26:14 -0800
Subject: [PATCH 11/12] Removing statics from the lambda expressions

A bunch of tests were failing because the location in which static
fields are evaluated has changed. Before, a static in the parameter list
was evaluated on the controller. Now it is evaluated on the remote VM.

Converting the statics to fields or local variables so they are captured
and serialized.
---
 .../cache/CacheRegionClearStatsDUnitTest.java |  2 +-
 .../QueryUsingFunctionContextDUnitTest.java   |  2 +-
 .../cache30/RegionReliabilityTestCase.java    | 11 +++-
 .../ConsoleDistributionManagerDUnitTest.java  |  4 +-
 .../internal/cache/Bug39079DUnitTest.java     |  2 +-
 .../internal/cache/ClearDAckDUnitTest.java    |  2 +-
 .../cache/DeltaPropagationDUnitTest.java      |  4 +-
 .../HAOverflowMemObjectSizerDUnitTest.java    |  6 +-
 .../cache/execute/Bug51193DUnitTest.java      |  2 +-
 ...lientServerFunctionExecutionDUnitTest.java |  6 +-
 .../cache/execute/PRClientServerTestBase.java |  2 +-
 .../internal/cache/ha/Bug48571DUnitTest.java  |  2 +-
 .../cache/ha/HABugInPutDUnitTest.java         | 12 ++--
 .../internal/cache/ha/HAClearDUnitTest.java   | 19 +++---
 .../cache/ha/HAConflationDUnitTest.java       |  6 +-
 .../cache/ha/HADuplicateDUnitTest.java        | 15 ++---
 .../internal/cache/ha/HAGIIDUnitTest.java     | 10 ++--
 .../cache/ha/HARQueueNewImplDUnitTest.java    |  4 +-
 .../cache/ha/HASlowReceiverDUnitTest.java     |  4 +-
 .../ha/OperationsPropagationDUnitTest.java    |  6 +-
 .../internal/cache/ha/PutAllDUnitTest.java    |  8 +--
 .../cache/partitioned/Bug43684DUnitTest.java  |  2 +-
 ...atibilityHigherVersionClientDUnitTest.java |  2 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java |  2 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java |  2 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java |  5 +-
 .../CacheServerTransactionsDUnitTest.java     |  2 +-
 .../sockets/ClientConflationDUnitTest.java    |  2 +-
 .../ClientInterestNotifyDUnitTest.java        |  7 ++-
 .../tier/sockets/ConflationDUnitTest.java     | 29 ++++------
 .../DataSerializerPropogationDUnitTest.java   | 10 ++--
 .../DestroyEntryPropagationDUnitTest.java     | 16 ++---
 .../sockets/EventIDVerificationDUnitTest.java | 27 +++++----
 .../EventIDVerificationInP2PDUnitTest.java    | 21 ++++---
 .../InstantiatorPropagationDUnitTest.java     |  8 +--
 .../tier/sockets/InterestListDUnitTest.java   |  7 ++-
 .../InterestListEndpointDUnitTest.java        | 42 +++++++-------
 .../InterestListFailoverDUnitTest.java        |  4 +-
 .../InterestResultPolicyDUnitTest.java        | 16 +++--
 .../tier/sockets/RegionCloseDUnitTest.java    |  4 +-
 .../RegisterInterestKeysDUnitTest.java        |  8 +--
 .../sockets/UpdatePropagationDUnitTest.java   | 58 ++++++++-----------
 .../sockets/UpdatePropagationPRDUnitTest.java |  3 -
 ...datesFromNonInterestEndPointDUnitTest.java |  4 +-
 .../ClientHealthStatsDUnitTest.java           |  2 +-
 .../ClientAuthorizationDUnitTest.java         |  6 +-
 .../security/ClientAuthorizationTestBase.java |  6 +-
 ...DeltaClientPostAuthorizationDUnitTest.java |  6 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java | 19 +++++-
 .../cache/ha/HADispatcherDUnitTest.java       | 12 ++--
 ...RegionRelationCQRegistrationDUnitTest.java |  4 +-
 ...alGatewaySenderEventListenerDUnitTest.java |  5 +-
 52 files changed, 237 insertions(+), 233 deletions(-)

diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
index 743887a4f110..88a32a3f52b5 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -39,7 +39,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
   /** the cache */
   private static GemFireCacheImpl cache = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM client1 = null;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 2d7212e64ff0..1e3e97327689 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -78,7 +78,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
 
   private static final int cntDest = 100;
 
-  static VM server1 = null;
+  VM server1 = null;
 
   static VM server2 = null;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index 07f00cd0c4b0..de0451ed4e57 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -67,6 +67,7 @@
 import com.gemstone.gemfire.internal.cache.TXStateProxyImpl;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
 import com.gemstone.gemfire.test.dunit.ThreadUtils;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -1118,7 +1119,7 @@ public void run2() throws CacheException {
     });
     
     // define the afterReleaseLocalLocks callback
-    Runnable removeRequiredRole = new Runnable() {
+    SerializableRunnableIF removeRequiredRole = new SerializableRunnableIF() {
       public void run() {
         Host.getHost(0).getVM(1).invoke(new SerializableRunnable("Close Region") {
           public void run() {
@@ -1161,7 +1162,13 @@ public void run2() throws CacheException {
     TXStateInterface txStateProxy = ((TXManagerImpl)ctm).getTXState();
     ((TXStateProxyImpl)txStateProxy).forceLocalBootstrap();
     TXState txState = (TXState)((TXStateProxyImpl)txStateProxy).getRealDeal(null,null);
-    txState.setBeforeSend(removeRequiredRole);
+    txState.setBeforeSend(() -> {
+      try { 
+        removeRequiredRole.run(); 
+      } catch(Exception e) {
+        throw new RuntimeException(e);
+      }
+    });
     
     // now start a transaction and commit it
     region.put("KEY", "VAL");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
index e9f853962aad..847edb5b6099 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
@@ -384,7 +384,7 @@ protected static long remoteGetConId() {
   }
 
   private boolean acquireDistLock(VM vm, String lockName) {
-    return vm.invoke(() -> this.remoteAcquireDistLock(lockName));
+    return vm.invoke(() -> remoteAcquireDistLock(lockName));
   }
 
   /**
@@ -424,7 +424,7 @@ private VM findVMForAdminObject(GemFireVM adminObj) {
   }
 
   private InternalDistributedMember getJavaGroupsIdForVM(VM vm) {
-    return (InternalDistributedMember)vm.invoke(() -> this.remoteGetJavaGroupsIdForVM());
+    return (InternalDistributedMember)vm.invoke(() -> remoteGetJavaGroupsIdForVM());
   }
   
   /**
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
index 61015205f54a..81e603c091ae 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
@@ -62,7 +62,7 @@ public class Bug39079DUnitTest extends CacheTestCase {
   static Properties props = new Properties();
   
 
-  private static VM vm0 = null;
+  private VM vm0 = null;
 
   private static VM vm1 = null;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
index 4c79202aa262..7c8327e56d6c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
@@ -63,7 +63,7 @@ public ClearDAckDUnitTest(String name) {
     static CacheTransactionManager cacheTxnMgr;
     static boolean IsAfterClear=false;
     static boolean flag = false;
-    static DistributedMember vm0ID, vm1ID;
+    DistributedMember vm0ID, vm1ID;
     
     @Override
     public void setUp() throws Exception {
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
index 7ef1a0deb8c3..b502992785a5 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
@@ -84,9 +84,9 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
 
   protected static VM VM3 = null;
 
-  private static int PORT1;
+  private int PORT1;
 
-  private static int PORT2;
+  private int PORT2;
 
   private static final String regionName = "DeltaPropagationDUnitTest";
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index e98df038168d..69f73ec9dff1 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -66,13 +66,13 @@ public class HAOverflowMemObjectSizerDUnitTest extends DistributedTestCase {
   /* handler for LRU capacity controller */
   private static EnableLRU cc = null;
 
-  static VM client = null;
+  VM client = null;
 
   static VM serverVM = null;
 
-  static Integer serverPort1 = null;
+  Integer serverPort1 = null;
 
-  static Integer serverPort2 = null;
+  Integer serverPort2 = null;
 
   static String ePolicy = "mem";
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
index 8a83417b00a0..de58569394b6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
@@ -59,7 +59,7 @@ public Bug51193DUnitTest(String name) {
   
   private static VM server0;
   
-  private static VM client0;
+  private VM client0;
   
   @Override
   public void setUp() throws Exception {
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
index 800b33bf83d5..821407fe1bb2 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
@@ -52,9 +52,9 @@
 public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBase {
   private static final String TEST_FUNCTION1 = TestFunction.TEST_FUNCTION1;
 
-  static Boolean isByName = null;
-  static Function function = null;
-  static Boolean toRegister = null;
+  Boolean isByName = null;
+  Function function = null;
+  Boolean toRegister = null;
   static final String retryRegionName = "RetryDataRegion";
   static Region metaDataRegion;
   
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
index d59049662183..560d3056f73b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
@@ -62,7 +62,7 @@
 
 public class PRClientServerTestBase extends CacheTestCase {
 
-  protected static VM server1 = null;
+  protected VM server1 = null;
 
   protected static VM server2 = null;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
index 9e03a70ca24e..e5acf279557c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
@@ -49,7 +49,7 @@
 public class Bug48571DUnitTest extends DistributedTestCase {
 
   private static VM server = null;
-  private static VM client = null;
+  private VM client = null;
   private static GemFireCacheImpl cache = null;
   
   private static final String region = "Bug48571DUnitTest_region";
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
index 41f56cc7e734..4adb2a82739e 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
@@ -58,10 +58,6 @@ public class HABugInPutDUnitTest extends DistributedTestCase
 
   VM client2 = null;
 
-  public static int PORT1;
-
-  public static int PORT2;
-
   private static final String REGION_NAME = "HABugInPutDUnitTest_region";
 
   final static String KEY1 = "KEY1";
@@ -91,9 +87,9 @@ public void setUp() throws Exception
     client2 = host.getVM(3);
 
     //System.setProperty())
-    PORT1 = ((Integer)server1.invoke(() -> HABugInPutDUnitTest.createServerCache()))
+    int PORT1 = ((Integer)server1.invoke(() -> HABugInPutDUnitTest.createServerCache()))
         .intValue();
-    PORT2 = ((Integer)server2.invoke(() -> HABugInPutDUnitTest.createServerCache()))
+    int PORT2 = ((Integer)server2.invoke(() -> HABugInPutDUnitTest.createServerCache()))
         .intValue();
 
     client1.invoke(() -> HABugInPutDUnitTest.createClientCache(
@@ -151,8 +147,8 @@ public static Integer createServerCache() throws Exception
   public static void createClientCache(String hostName, Integer port1, Integer port2)
       throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
index 6a34318255f5..bb2ca69819de 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
@@ -63,10 +63,6 @@ public class HAClearDUnitTest extends DistributedTestCase
 
   static VM client2 = null;
 
-  public static int PORT1;
-
-  public static int PORT2;
-
   private static final String REGION_NAME = "HAClearDUnitTest_Region";
 
   protected static Cache cache = null;
@@ -554,17 +550,18 @@ public void run2() throws CacheException
   // function to create 2servers and 3 clients
   private void createClientServerConfigurationForClearTest() throws Exception
   {
-    PORT1 = ((Integer)server1.invoke(() -> HAClearDUnitTest.createServerCache())).intValue();
-    PORT2 = ((Integer)server2.invoke(() -> HAClearDUnitTest.createServerCache())).intValue();
+    int PORT1 = ((Integer)server1.invoke(() -> HAClearDUnitTest.createServerCache())).intValue();
+    int PORT2 = ((Integer)server2.invoke(() -> HAClearDUnitTest.createServerCache())).intValue();
+    String hostname = NetworkUtils.getServerHostName(Host.getHost(0));
     client1.invoke(() -> HAClearDUnitTest.createClientCache(
-        NetworkUtils.getServerHostName(Host.getHost(0)),
+        hostname,
         new Integer(PORT1), new Integer(PORT2), new Boolean(true),
         new Boolean(true) ));
     client2.invoke(() -> HAClearDUnitTest.createClientCache(
-        NetworkUtils.getServerHostName(Host.getHost(0)),
+        hostname,
         new Integer(PORT1), new Integer(PORT2), new Boolean(true),
         new Boolean(true) ));
-    createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)),
+    createClientCache(hostname,
         new Integer(PORT1), new Integer(PORT2),
         new Boolean(true), new Boolean(true));
   }
@@ -599,8 +596,8 @@ private void createCache(Properties props) throws Exception
   public static void createClientCache(String hostName, Integer port1, Integer port2,
       Boolean listenerAttached, Boolean registerInterest) throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     boolean isListenerAttached = listenerAttached.booleanValue();
     boolean isRegisterInterest = registerInterest.booleanValue();
     Properties props = new Properties();
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
index 629f1a407803..212a79873613 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
@@ -67,8 +67,6 @@ public class HAConflationDUnitTest extends CacheTestCase
 
   VM client1 = null;
 
-  public static int PORT1;
-
   private static final String regionName = "HAConflationDUnitTest_region";
 
   final static String KEY1 = "KEY1";
@@ -109,7 +107,7 @@ public void setUp() throws Exception
     // Client 1 VM
     client1 = host.getVM(2);
 
-    PORT1 = ((Integer)server1.invoke(() -> HAConflationDUnitTest.createServerCache( new Boolean(false) ))).intValue();
+    int PORT1 = ((Integer)server1.invoke(() -> HAConflationDUnitTest.createServerCache( new Boolean(false) ))).intValue();
     server1.invoke(() -> ConflationDUnitTest.setIsSlowStart());
     server1.invoke(() -> HAConflationDUnitTest.makeDispatcherSlow());
     client1.invoke(() -> HAConflationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1), new Boolean(true) ));
@@ -311,7 +309,7 @@ private void createCache(Properties props) throws Exception
   public static void createClientCache(String host, Integer port1, Boolean isListenerPresent)
       throws Exception
   {
-    PORT1 = port1.intValue();
+    int PORT1 = port1.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
index 4a7d5dbb4af3..1d18390d99ad 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
@@ -67,10 +67,6 @@ public class HADuplicateDUnitTest extends DistributedTestCase
 
   VM client2 = null;
 
-  public static int PORT1;
-
-  public static int PORT2;
-
   private static final String REGION_NAME = "HADuplicateDUnitTest_Region";
 
   protected static Cache cache = null;
@@ -219,10 +215,11 @@ public void run2() throws CacheException
   // function to create 2servers and 1 clients
   private void createClientServerConfiguration()
   {
-    PORT1 = ((Integer)server1.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue();
+    int PORT1 = ((Integer)server1.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue();
     server1.invoke(() -> HADuplicateDUnitTest.setQRMslow());
-    PORT2 = ((Integer)server2.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue();
-    client1.invoke(() -> HADuplicateDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2) ));
+    int PORT2 = ((Integer)server2.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue();
+    String hostname = NetworkUtils.getServerHostName(Host.getHost(0));
+    client1.invoke(() -> HADuplicateDUnitTest.createClientCache( hostname, new Integer(PORT1), new Integer(PORT2) ));
 
   }
 
@@ -267,8 +264,8 @@ private void createCache(Properties props) throws Exception
   public static void createClientCache(String hostName, Integer port1, Integer port2)
       throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
index 3d62b99f8bd1..4439e65dfa31 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
@@ -118,12 +118,10 @@ public class HAGIIDUnitTest extends DistributedTestCase
   private static VM server1 = null;
   private static VM client0 = null;
 
-  private static int PORT1;
-  private static int PORT2;
-
   private static final String REGION_NAME = "HAGIIDUnitTest_region";
   
   protected static GIIChecker checker = new GIIChecker();
+  private int PORT2;
 
   /** constructor */
   public HAGIIDUnitTest(String name) {
@@ -143,7 +141,7 @@ public void setUp() throws Exception
     client0 = host.getVM(2);
 
     //start server1
-    PORT1 = ((Integer)server0.invoke(() -> HAGIIDUnitTest.createServer1Cache())).intValue();
+    int PORT1 = ((Integer)server0.invoke(() -> HAGIIDUnitTest.createServer1Cache())).intValue();
     server0.invoke(() -> ConflationDUnitTest.setIsSlowStart());
     server0.invoke(() -> HAGIIDUnitTest.setSystemProperty());
 
@@ -181,8 +179,8 @@ public void createCache(Properties props) throws Exception
 
   public static void createClientCache(String host, Integer port1 , Integer port2) throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index 75c087a8aea5..91aeb980893a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -81,9 +81,9 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
 
   protected static VM clientVM2 = null;
 
-  private static int PORT1;
+  private int PORT1;
 
-  private static int PORT2;
+  private int PORT2;
 
   private static final String regionName = "HARQueueNewImplDUnitTest";
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
index 8df35132f5da..6d21778e4973 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -57,9 +57,9 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
 
   private static int PORT0;
 
-  private static int PORT1;
+  private int PORT1;
 
-  private static int PORT2;
+  private int PORT2;
 
   private static final String regionName = "HASlowReceiverDUnitTest";
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
index 60e154caf003..ae85399c8a98 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -70,12 +70,12 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
   /**
    * Port of server1
    */
-  public static int PORT1;
+  public int PORT1;
 
   /**
    * Port of server2
    */
-  public static int PORT2;
+  public int PORT2;
 
   /**
    * Name of the region
@@ -195,7 +195,7 @@ public static Integer createServerCache() throws Exception
    */
   public static void createClientCache(String host, Integer port2) throws Exception
   {
-    PORT2 = port2.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
index f23a30f4a0ff..7f9e79f79a10 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
@@ -73,10 +73,10 @@ public class PutAllDUnitTest extends DistributedTestCase
   VM client2 = null;
 
   /** port of server1**/
-  public static int PORT1;
+  public int PORT1;
 
   /** port of server2**/
-  public static int PORT2;
+  public int PORT2;
 
   /** region name**/
   private static final String REGION_NAME = "PutAllDUnitTest_Region";
@@ -178,7 +178,7 @@ private void createCache(Properties props) throws Exception
   /** function to create client cache with HAEventIdPropagationListenerForClient2 as the listener  **/
   public static void createClientCache2(String host, Integer port1) throws Exception
   {
-    PORT1 = port1.intValue();
+    int PORT1 = port1.intValue();
     Properties props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
@@ -209,7 +209,7 @@ public static void createClientCache2(String host, Integer port1) throws Excepti
   /** function to create client cache **/
   public static void createClientCache1(String host, Integer port1) throws Exception
   {
-    PORT1 = port1.intValue();
+    int PORT1 = port1.intValue();
     Properties props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
index 272a3ea96e30..d2a5cc3d995e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
@@ -55,7 +55,7 @@ public class Bug43684DUnitTest extends DistributedTestCase {
 
   private static GemFireCacheImpl cache;
 
-  private static Host host;
+  private Host host;
 
   private static VM server1;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index ae91f21752f6..8839f9797cfd 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
@@ -50,7 +50,7 @@ public class BackwardCompatibilityHigherVersionClientDUnitTest extends
   /** the cache */
   private static Cache cache = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM client1 = null;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
index 81693d963cb2..566792858ec1 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
@@ -56,7 +56,7 @@ public class Bug36457DUnitTest extends DistributedTestCase
 {
   private static Cache cache = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM server2 = null;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
index 0aafb77761f7..16fab70d3e05 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
@@ -58,7 +58,7 @@ public class Bug36805DUnitTest extends DistributedTestCase
 {
   private static Cache cache = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM server2 = null;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
index 994da5878845..bd6d870b9467 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -61,7 +61,7 @@ public class Bug37210DUnitTest extends DistributedTestCase
   private static Cache cache = null;
 
   /** port for the cache server */
-  private static int PORT;
+  private int PORT;
 
   /** name of the test region */
   private static final String REGION_NAME = "Bug37210DUnitTest_Region";
@@ -146,10 +146,11 @@ protected final void preTearDown() throws Exception {
    */
   public void testHAStatsCleanup() throws Exception
   {
+    Host host = Host.getHost(0);
     LogWriterUtils.getLogWriter().info("testHAStatsCleanup : BEGIN");
     IgnoredException.addIgnoredException("java.net.SocketException");
     IgnoredException.addIgnoredException("Unexpected IOException");
-    client.invoke(() -> Bug37210DUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) ));
+    client.invoke(() -> Bug37210DUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT) ));
     server.invoke(() -> Bug37210DUnitTest.doEntryOperations());
     
     server.invoke(() -> Bug37210DUnitTest.closeCacheClientProxyAndVerifyStats());
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index d4daa390b392..beb1a9d804d9 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -81,7 +81,7 @@ public CacheServerTransactionsDUnitTest(String name) {
   
   private static Host host = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM server2 = null;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 21a920fa3441..8a7a7690d230 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -63,7 +63,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
   private static Cache cacheClient = null;
   private static Cache cacheFeeder = null;
   private static Cache cacheServer = null;
-  private static int PORT ;
+  private int PORT ;
   private static int poolNameCounter = 0;
   private static final String REGION_NAME1 = "ClientConflationDUnitTest_region1" ;
   private static final String REGION_NAME2 = "ClientConflationDUnitTest_region2" ;
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index 3d0364ce3a38..1559506d068f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -125,7 +125,7 @@ public void validate(int creates, int updates, int invalidates, int destroys)
   VM vm3 = null; // client3
   */
   private static Cache cacheServer = null;
-  private static int PORT ;
+  private int PORT ;
   private static int poolNameCounter = 0;
   // Region 1 only does interest registrations with receiveValues flag set to true
   private static final String REGION_NAME1 = "ClientInterestNotifyDUnitTest_region1" ;
@@ -184,14 +184,15 @@ private void performSteps() throws Exception {
     // Server is created with notify-by-subscription (NBS) set to false.
     PORT =  createServerCache();
     
+    Host host = Host.getHost(0);
     // Create a feeder.
-    vm0.invoke(() -> ClientInterestNotifyDUnitTest.createClientCacheFeeder(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+    vm0.invoke(() -> ClientInterestNotifyDUnitTest.createClientCacheFeeder(NetworkUtils.getServerHostName(host), new Integer(PORT)));
     
     // Client 1 overrides NBS to true.
     // Client 2 "overrides" NSB to false.
     // Client 3 uses the default NBS which is false on the server.
     
-    vm1.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn"));
+    vm1.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT), "ClientOn"));
     /*
     vm2.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( getServerHostName(Host.getHost(0)), new Integer(PORT), 
       DistributionConfig.NOTIFY_BY_SUBSCRIPTION_OVERRIDE_PROP_VALUE_OFF, "ClientOff"));
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
index 4844ec85511a..6839e3236995 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -71,7 +71,7 @@ public class ConflationDUnitTest extends DistributedTestCase
   VM vm0 = null;
   VM vm2 = null;
   private static Cache cache = null;
-  private static int PORT ;
+  private int PORT ;
   private static final String REGION_NAME1 = "ConflationDUnitTest_region1" ;
   private static final String REGION_NAME2 = "ConflationDUnitTest_region2" ;
   final static String MARKER = "markerKey";
@@ -142,7 +142,8 @@ public void testTwoRegionsTwoWriters()
     try {
       vm0.invoke(() -> ConflationDUnitTest.setIsSlowStart());
       createClientCache1UniqueWriter ( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
-      vm2.invoke(() -> ConflationDUnitTest.createClientCache2UniqueWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      Host host = Host.getHost(0);
+      vm2.invoke(() -> ConflationDUnitTest.createClientCache2UniqueWriter( NetworkUtils.getServerHostName(host), new Integer(PORT)));
       vm2.invoke(() -> ConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery());
       vm2.invoke(() -> ConflationDUnitTest.setAllCountersZero());
       vm2.invoke(() -> ConflationDUnitTest.assertAllCountersZero());
@@ -167,12 +168,12 @@ public void testTwoRegionsTwoWriters()
    * two regions with a common bridgewriter
    *
    */
-  public void testTwoRegionsOneWriter()
+  public void testTwoRegionsOneWriter() throws Exception
   {
-    try {
       vm0.invoke(() -> ConflationDUnitTest.setIsSlowStart());
-      createClientCache1CommonWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
-      vm2.invoke(() -> ConflationDUnitTest.createClientCache2CommonWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      Host host = Host.getHost(0);
+      createClientCache1CommonWriter( NetworkUtils.getServerHostName(host), new Integer(PORT));
+      vm2.invoke(() -> ConflationDUnitTest.createClientCache2CommonWriter( NetworkUtils.getServerHostName(host), new Integer(PORT)));
       vm2.invoke(() -> ConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery());
       vm2.invoke(() -> ConflationDUnitTest.setAllCountersZero());
       vm2.invoke(() -> ConflationDUnitTest.assertAllCountersZero());
@@ -187,10 +188,6 @@ public void testTwoRegionsOneWriter()
       createMarker();
       vm2.invoke(() -> ConflationDUnitTest.waitForMarker());
       vm2.invoke(() -> ConflationDUnitTest.assertCounterSizes());
-    }
-    catch( Exception e ) {
-      Assert.fail("Test failed due to exception", e);
-    }
   }
 
 
@@ -198,13 +195,13 @@ public void testTwoRegionsOneWriter()
    * test more messages are not sent to client from server
    *
    */
-  public void testNotMoreMessagesSent()
+  public void testNotMoreMessagesSent() throws Exception
   {
-    try {
       vm0.invoke(() -> ConflationDUnitTest.setIsSlowStart());
-      createClientCache1CommonWriterTest3(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
+      Host host = Host.getHost(0);
+      createClientCache1CommonWriterTest3(NetworkUtils.getServerHostName(host), new Integer(PORT));
       vm2.invoke(() -> ConflationDUnitTest.createClientCache2CommonWriterTest3(
-        NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) ));
+        NetworkUtils.getServerHostName(host), new Integer(PORT) ));
       vm2.invoke(() -> ConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery());
       vm2.invoke(() -> ConflationDUnitTest.setAllCountersZero());
       vm2.invoke(() -> ConflationDUnitTest.assertAllCountersZero());
@@ -221,10 +218,6 @@ public void testNotMoreMessagesSent()
       vm2.invoke(() -> ConflationDUnitTest.assertCounterSizesLessThan200());
       vm0.invoke(() -> ConflationDUnitTest.getStatsOnServer());
       vm0.invoke(() -> ConflationDUnitTest.assertConflationStatus());
-    }
-    catch (Exception e) {
-      Assert.fail("Test failed due to exception", e);
-    }
   }
   /**
    * create properties for a loner VM
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
index b0a2e14f8755..4c0c29655f99 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
@@ -68,13 +68,13 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
 
   private static VM client2 = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
-  private static VM server2 = null;
+  private VM server2 = null;
 
-  private static int PORT1 = -1;
+  private int PORT1 = -1;
 
-  private static int PORT2 = -1;
+  private int PORT2 = -1;
 
   private static int instanceCountWithAllPuts = 3;
 
@@ -857,7 +857,7 @@ public static void setClientServerObserver1() {
       @Override
       public void beforeSendingToServer(EventID eventID) {
         eventId = eventID;
-        client2.invoke(() -> DataSerializerPropogationDUnitTest.setEventId( eventId ));
+        client2.invoke(() -> DataSerializerPropogationDUnitTest.setEventId( eventID ));
 
       }
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index a70284e8ace1..6ca370fa6dd9 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -72,8 +72,8 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
 
   VM vm3 = null;
 
-  private static  int PORT1 ;
-  private static  int PORT2;
+  private int PORT1 ;
+  private int PORT2;
   protected static Cache cache = null;
 
   private static final String REGION_NAME = "DestroyEntryPropagationDUnitTest_region";
@@ -104,8 +104,8 @@ public void setUp() throws Exception {
     PORT1 =  ((Integer)vm0.invoke(() -> DestroyEntryPropagationDUnitTest.createServerCache())).intValue();
     PORT2 =  ((Integer)vm1.invoke(() -> DestroyEntryPropagationDUnitTest.createServerCache())).intValue();
 
-    vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)));
-    vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)));
+    vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)));
+    vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)));
 
   }
 
@@ -246,7 +246,7 @@ public String description() {
 
     //Do a destroy on Server1 via Connection object from client1.
     // Client1 should not receive updated value while client2 should receive
-    vm2.invoke(() -> DestroyEntryPropagationDUnitTest.acquireConnectionsAndDestroyEntriesK1andK2());
+    vm2.invoke(() -> acquireConnectionsAndDestroyEntriesK1andK2());
    // pause(10000);
     //  Check if both the puts ( on key1 & key2 ) have reached the servers
     vm0.invoke(() -> DestroyEntryPropagationDUnitTest.verifyEntriesAreDestroyed());
@@ -256,7 +256,7 @@ public String description() {
 
   }
 
-  public static void acquireConnectionsAndDestroyEntriesK1andK2()
+  public void acquireConnectionsAndDestroyEntriesK1andK2()
   {
     try {
       Region r1 = cache.getRegion(Region.SEPARATOR+REGION_NAME);
@@ -411,8 +411,8 @@ public String description() {
 
   public static void createClientCache(String host, Integer port1, Integer port2) throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index a0926f2b5615..0217361965ec 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -180,8 +180,9 @@ public static void createClientCache(String host, Integer port1, Integer port2)
     CacheWriter writer = new CacheWriterAdapter() {
       public void beforeCreate(EntryEvent event)
       {
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
+        EventID eventId = ((EntryEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( eventId));
         try {
           super.beforeCreate(event);
         }
@@ -195,8 +196,9 @@ public void beforeCreate(EntryEvent event)
       public void beforeUpdate(EntryEvent event)
       {
 
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
+        EventID eventId = ((EntryEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
         try {
           super.beforeUpdate(event);
         }
@@ -209,9 +211,9 @@ public void beforeUpdate(EntryEvent event)
 
       public void beforeDestroy(EntryEvent event)
       {
-
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
+        EventID eventId = ((EntryEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
         try {
           super.beforeDestroy(event);
         }
@@ -224,9 +226,9 @@ public void beforeDestroy(EntryEvent event)
 
       public void beforeRegionDestroy(RegionEvent event)
       {
-
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() ));
+        EventID eventId = ((RegionEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
         try {
           super.beforeRegionDestroy(event);
         }
@@ -239,8 +241,9 @@ public void beforeRegionDestroy(RegionEvent event)
 
       public void beforeRegionClear(RegionEvent event)
       {
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() ));
+        EventID eventId = ((RegionEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
         try {
           super.beforeRegionClear(event);
         }
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
index 2df2cf6c21e1..f33e6e111d3b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
@@ -290,20 +290,23 @@ public static Boolean verifyResult(EventID correctId)
   public static void verifyOperations()
   {
     createEntry();
-    Boolean pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());
+    Boolean pass;
+    verifyEventID();
     put();
-    pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());
+    verifyEventID();
     invalidateRegion();
-    pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());
+    verifyEventID();
     destroy();
-    pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());
+    verifyEventID();
     destroyRegion();
+    verifyEventID();   
+  }
+
+  protected static void verifyEventID() {
+    Boolean pass;
+    EventID eventId = EventIDVerificationInP2PDUnitTest.eventId;
     pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());   
+    assertTrue(pass.booleanValue());
   }
 
   @Override
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
index 65e78d3f0fc5..9438af7a197f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
@@ -63,13 +63,13 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
 
   private static VM client2 = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM server2 = null;
 
-  private static int PORT1 = -1;
+  private int PORT1 = -1;
 
-  private static int PORT2 = -1;
+  private int PORT2 = -1;
 
   private static int instanceCountWithAllPuts = 3;
 
@@ -803,7 +803,7 @@ public void testLazyRegistrationOfInstantiators()
           new Integer(PORT1));
   
       client2
-          .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache(NetworkUtils.getServerHostName(server2.getHost()),
+          .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache(NetworkUtils.getServerHostName(server1.getHost()),
                   new Integer(PORT2)));
   
       Wait.pause(3000);
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index 3fa3f25a517b..50ceda7320bc 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -112,7 +112,7 @@ public class InterestListDUnitTest extends DistributedTestCase
   VM vm2 = null;
 
   /** the server cache's port number */
-  static  int PORT1;
+  int PORT1;
 
   // using a Integer instead of String to make sure ALL_KEYS works
   // on non-String keys
@@ -223,8 +223,9 @@ public void testValueRefresh()
   {
 
     // Initialization
-    vm1.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1)));
-    vm2.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1)));
+    Host host = Host.getHost(0);
+    vm1.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1)));
+    vm2.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1)));
 
     vm1.invoke(() -> InterestListDUnitTest.createEntriesK1andK2());
     vm2.invoke(() -> InterestListDUnitTest.createEntriesK1andK2());
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index 5f166887562c..392bdd36ceac 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
@@ -62,15 +62,15 @@
 public class InterestListEndpointDUnitTest extends DistributedTestCase
 {
 
-  static VM server1 = null;
+  VM server1 = null;
 
   static VM server2 = null;
 
   static VM client1 = null;
 
   protected static Cache cache = null;
-  private static int PORT1;
-  private static int PORT2;
+  private int PORT1;
+  private int PORT2;
 
   private static Connection conn1 ;
   private static PoolImpl pool;
@@ -148,30 +148,30 @@ public void testDirectPutOnServer()
   */
   public void testInterestListEndpoint()
   {
-    client1.invoke(() -> impl.createEntriesK1andK2());
-    server2.invoke(() -> impl.createEntriesK1andK2()); // server
-    server1.invoke(() -> impl.createEntriesK1andK2()); // server
+    client1.invoke(() -> createEntriesK1andK2());
+    server2.invoke(() -> createEntriesK1andK2()); // server
+    server1.invoke(() -> createEntriesK1andK2()); // server
 
-    client1.invoke(() -> impl.registerKey1());
+    client1.invoke(() -> registerKey1());
 
-    server1.invoke(() -> impl.verifyIfNotInterestListEndpointAndThenPut());
-    server2.invoke(() -> impl.verifyIfNotInterestListEndpointAndThenPut());
-    client1.invoke(() -> impl.verifyPut());
+    server1.invoke(() -> verifyIfNotInterestListEndpointAndThenPut());
+    server2.invoke(() -> verifyIfNotInterestListEndpointAndThenPut());
+    client1.invoke(() -> verifyPut());
   }
 
   public void testInterestListEndpointAfterFailover() throws Exception
   {
     final long maxWaitTime = 20000;
-    client1.invoke(() -> impl.createEntriesK1andK2());
-    server2.invoke(() -> impl.createEntriesK1andK2());
-    server1.invoke(() -> impl.createEntriesK1andK2());
+    client1.invoke(() -> createEntriesK1andK2());
+    server2.invoke(() -> createEntriesK1andK2());
+    server1.invoke(() -> createEntriesK1andK2());
 
-    client1.invoke(() -> impl.registerKey1());
+    client1.invoke(() -> registerKey1());
 
     boolean firstIsPrimary = isVm0Primary();
     VM primary = firstIsPrimary? server1 : server2;
 
-    primary.invoke(() -> impl.stopILEndpointServer());
+    primary.invoke(() -> stopILEndpointServer());
     Wait.pause(5000);
 
     //Since the loadbalancing policy is roundrobin & there are two servers so
@@ -210,12 +210,12 @@ public String description() {
     });
 
     //put on stopped server
-    primary.invoke(() -> impl.put());
-    client1.invoke(() -> impl.verifyPut());
+    primary.invoke(() -> put());
+    client1.invoke(() -> verifyPut());
   }
 
 
-  public static boolean isVm0Primary() throws Exception {
+  public boolean isVm0Primary() throws Exception {
     int port = ((Integer)client1.invoke(() -> impl.getPrimaryPort())).intValue();
     return port == PORT1;
   }
@@ -232,9 +232,9 @@ public static int getPrimaryPort() throws Exception {
 
 
  public void testUpdaterThreadIsAliveForFailedEndPoint(){
-      client1.invoke(() -> impl.acquirePoolConnection());
-      client1.invoke(() -> impl.processException());
-      client1.invoke(() -> impl.verifyUpdaterThreadIsAlive());
+      client1.invoke(() -> acquirePoolConnection());
+      client1.invoke(() -> processException());
+      client1.invoke(() -> verifyUpdaterThreadIsAlive());
  }
 
  public static void acquirePoolConnection()
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
index 34073c244f47..1e98cc58ce75 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
@@ -62,8 +62,8 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
 
   VM vm3 = null;
 
-  private static int PORT1;
-  private static int PORT2;
+  private int PORT1;
+  private int PORT2;
 
   private static final String REGION_NAME = "InterestListFailoverDUnitTest_region";
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index c45648363242..d163e299e364 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -59,7 +59,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
   /** the cache instance for the test */
   private static Cache cache = null;
   
-  private static int PORT   ; 
+  private int PORT   ; 
 
   private static final String REGION_NAME = "InterestResultPolicyDUnitTest_region" ;
 
@@ -126,8 +126,9 @@ public void testPolicyNone()
     Object[] objArr = new Object[2];
     objArr[0] = InterestResultPolicy.NONE;
     objArr[1] = new Integer(PREPOPULATED_ENTRIES);
+    Host host = Host.getHost(0);
     vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache(
-      NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      NetworkUtils.getServerHostName(host), new Integer(PORT)));
     vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr);
     vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr);
     logger.fine("testPolicyNone END");
@@ -148,8 +149,9 @@ public void testPolicyKeys()
     Object[] objArr = new Object[2];
     objArr[0] = InterestResultPolicy.KEYS;
     objArr[1] = new Integer(PREPOPULATED_ENTRIES);
+    Host host = Host.getHost(0);
     vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache(
-      NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));;
+      NetworkUtils.getServerHostName(host), new Integer(PORT)));;
     vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr);
     vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr);
     logger.fine("testPolicyKeys END");
@@ -170,8 +172,9 @@ public void testPolicyKeysValues()
     Object[] objArr = new Object[2];
     objArr[0] = InterestResultPolicy.KEYS_VALUES;
     objArr[1] = new Integer(PREPOPULATED_ENTRIES);
+    Host host = Host.getHost(0);
     vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache(
-      NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      NetworkUtils.getServerHostName(host), new Integer(PORT)));
     vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr);
     vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr);
     logger.fine("testPolicyKeyValues END");
@@ -189,6 +192,7 @@ public void testPolicyKeysValues()
    */
   public void testBug35358()
   {
+    Host host = Host.getHost(0);
     LogWriter logger = getSystem().getLogWriter();
     logger.fine("testBug35358 BEGIN");
     Object[] objArr = new Object[2];
@@ -196,7 +200,7 @@ public void testBug35358()
     /* registering for 5 extra keys */
     objArr[1] = new Integer(PREPOPULATED_ENTRIES + 5);
     vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache(
-      NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      NetworkUtils.getServerHostName(host), new Integer(PORT)));
     vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr);
     vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr);
     Integer cnt = (Integer)vm0.invoke(() -> InterestResultPolicyDUnitTest.getEntryCount());
@@ -285,7 +289,7 @@ public static void populateServerCache() throws Exception
    */
   public static void createClientCache(String host, Integer port) throws Exception
   {
-    PORT = port.intValue() ;
+    int PORT = port.intValue() ;
     InterestResultPolicyDUnitTest test = new InterestResultPolicyDUnitTest(
         "temp");
     Properties props = new Properties();
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index 7d729a3e7262..b925bf792008 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -55,7 +55,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
 
   VM client1 = null;
 
-  private static  int PORT1 ;
+  private int PORT1 ;
 
   private static final String REGION_NAME = "RegionCloseDUnitTest_region";
 
@@ -104,7 +104,7 @@ public void testCloseRegionOnClient()
 
   public static void createClientCache(String host, Integer port1) throws Exception
   {
-    PORT1 = port1.intValue() ;
+    int PORT1 = port1.intValue() ;
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index fde871a6a0a6..df131a924458 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -51,9 +51,9 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
 
   VM client2 = null;
 
-  private static  int PORT1 ;
+  private int PORT1 ;
 
-  private static  int PORT2 ;
+  private int PORT2 ;
 
   private static final String REGION_NAME = "RegisterInterestKeysDUnitTest_region";
 
@@ -146,8 +146,8 @@ public static void createEntriesK1()
 
   public static void createClientCache(String host, Integer port1 , Integer port2 ) throws Exception
   {
-    PORT1 = port1.intValue() ;
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue() ;
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index bdbb83877df0..f544e74ce8a0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -87,16 +87,14 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
 
   VM client2 = null;
 
-  private static  int PORT1 ;
+  private int PORT1 ;
 
-  private static  int PORT2 ;
+  private int PORT2 ;
 
   private static final String REGION_NAME = "UpdatePropagationDUnitTest_region";
 
   protected static Cache cache = null;
   
-  static UpdatePropagationDUnitTest impl;
-
   /** constructor */
   public UpdatePropagationDUnitTest(String name) {
     super(name);
@@ -119,11 +117,6 @@ public void setUp() throws Exception {
     //client 2 VM
     client2 = host.getVM(3);
     
-    createImpl();
-    for (int i=0; i<4; i++) {
-      host.getVM(i).invoke(getClass(), "createImpl", null);
-    }
-
     PORT1 =  ((Integer)server1.invoke(() -> createServerCache())).intValue();
     PORT2 =  ((Integer)server2.invoke(() -> createServerCache())).intValue();
 
@@ -136,11 +129,6 @@ public void setUp() throws Exception {
     IgnoredException.addIgnoredException("Unexpected IOException");
 
   }
-  
-  /** subclass support */
-  public static void createImpl() {
-    impl = new UpdatePropagationDUnitTest("temp");
-  }
 
   private void createCache(Properties props) throws Exception
   {
@@ -165,10 +153,10 @@ public void DISABLED_testVerifyUpdatesNotReceivedBySender()
     final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
 
     //First create entries on both servers via the two client
-    client1.invoke(() -> impl.createEntriesK1andK2());
-    client2.invoke(() -> impl.createEntriesK1andK2());
-    client1.invoke(() -> impl.registerKeysK1andK2());
-    client2.invoke(() -> impl.registerKeysK1andK2());
+    client1.invoke(() -> createEntriesK1andK2());
+    client2.invoke(() -> createEntriesK1andK2());
+    client1.invoke(() -> registerKeysK1andK2());
+    client2.invoke(() -> registerKeysK1andK2());
     //Induce fail over of InteretsList Endpoint to Server 2 by killing server1
     
     server1.invoke(() -> UpdatePropagationDUnitTest.killServer(new Integer(PORT1)));
@@ -254,13 +242,13 @@ public String description() {
 
     //Do a put on Server1 via Connection object from client1.
     // Client1 should not receive updated value while client2 should receive
-    client1.invoke(() -> impl.acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost())));
+    client1.invoke(() -> acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost())));
     //pause(5000);
     //Check if both the puts ( on key1 & key2 ) have reached the servers
-    server1.invoke(() -> impl.verifyUpdates());
-    server2.invoke(() -> impl.verifyUpdates());
+    server1.invoke(() -> verifyUpdates());
+    server2.invoke(() -> verifyUpdates());
     // verify no updates for update originator
-    client1.invoke(() -> impl.verifyNoUpdates());
+    client1.invoke(() -> verifyNoUpdates());
 
   }
 
@@ -274,10 +262,10 @@ public void testVerifyUpdatesReceivedByOtherClients()
   {
     final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
     //  First create entries on both servers via the two client
-    client1.invoke(() -> impl.createEntriesK1andK2());
-    client2.invoke(() -> impl.createEntriesK1andK2());
-    client1.invoke(() -> impl.registerKeysK1andK2());
-    client2.invoke(() -> impl.registerKeysK1andK2());
+    client1.invoke(() -> createEntriesK1andK2());
+    client2.invoke(() -> createEntriesK1andK2());
+    client1.invoke(() -> registerKeysK1andK2());
+    client2.invoke(() -> registerKeysK1andK2());
     //Induce fail over of InteretsList Endpoint to Server 2 by killing server1
     server1.invoke(() -> UpdatePropagationDUnitTest.killServer(new Integer(PORT1)));
     //Wait for 10 seconds to allow fail over. This would mean that Interstist has failed
@@ -378,16 +366,16 @@ public String description() {
 
     //Do a put on Server1 via Connection object from client1.
     // Client1 should not receive updated value while client2 should receive
-    client1.invoke(() -> impl.acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost())));
+    client1.invoke(() -> acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost())));
     Wait.pause(5000);
     //Check if both the puts ( on key1 & key2 ) have reached the servers
-    server1.invoke(() -> impl.verifyUpdates());
-    server2.invoke(() -> impl.verifyUpdates());
+    server1.invoke(() -> verifyUpdates());
+    server2.invoke(() -> verifyUpdates());
     // verify updates to other client
-    client2.invoke(() -> impl.verifyUpdates());
+    client2.invoke(() -> verifyUpdates());
   }
 
-  public static void acquireConnectionsAndPutonK1andK2(String host)
+  public void acquireConnectionsAndPutonK1andK2(String host)
   {
     try {
       Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -471,8 +459,8 @@ public static void createEntriesK1andK2()
 
   public static void createClientCache(String host, Integer port1 , Integer port2 ) throws Exception
   {
-    PORT1 = port1.intValue() ;
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue() ;
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -503,10 +491,10 @@ public static void createClientCache(String host, Integer port1 , Integer port2
 
   }
 
-  public static Integer createServerCache() throws Exception
+  public Integer createServerCache() throws Exception
   {
     new UpdatePropagationDUnitTest("temp").createCache(new Properties());
-    RegionAttributes attrs = impl.createCacheServerAttributes(); 
+    RegionAttributes attrs = createCacheServerAttributes(); 
     cache.createRegion(REGION_NAME, attrs);
     CacheServer server = cache.addCacheServer();
     assertNotNull(server);
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
index b65b9a03665c..2c12c691f056 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
@@ -28,9 +28,6 @@ public class UpdatePropagationPRDUnitTest extends UpdatePropagationDUnitTest {
   public UpdatePropagationPRDUnitTest(String name) {
     super(name);
   }
-  public static void createImpl() {
-    impl = new UpdatePropagationPRDUnitTest("temp");
-  }
   protected RegionAttributes createCacheServerAttributes()
   {
     AttributesFactory factory = new AttributesFactory();
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index eb5637c3eb3b..238a09432a66 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -62,8 +62,8 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
 
   VM vm2 = null;
 
-  private static int PORT1;
-  private static int PORT2;
+  private int PORT1;
+  private int PORT2;
   private static final String REGION_NAME = "VerifyUpdatesFromNonInterestEndPointDUnitTest_region";
 
   private static Cache cache = null;
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
index 868073eea231..de5c07f853c3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
@@ -75,7 +75,7 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
   /** name of the test region */
   private static final String REGION_NAME = "ClientHealthStatsDUnitTest_Region";
 
-  private static VM server = null;
+  private VM server = null;
 
   private static VM client = null;
   
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
index 0cbc1aabcd85..0e46da506ca8 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
@@ -190,8 +190,10 @@ else if ((opFlags & OpFlags.CHECK_EXCEPTION) > 0) {
             opFlags), new Integer(expectedResult));
       }
       else {
-        clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(opCode.toOrdinal()),
-                currentOp.getIndices(), new Integer(opFlags),
+        byte ordinal = opCode.toOrdinal();
+        int[] indices = currentOp.getIndices();
+        clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(ordinal),
+                indices, new Integer(opFlags),
                 new Integer(expectedResult) ));
       }
     }
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
index 09dd49bebee7..55edaa1c8173 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
@@ -798,8 +798,10 @@ else if ((opFlags & OpFlags.CHECK_EXCEPTION) > 0) {
             opFlags), new Integer(expectedResult));
       }
       else {
-        clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(opCode.toOrdinal()),
-                currentOp.getIndices(), new Integer(opFlags),
+        byte ordinal = opCode.toOrdinal();
+        int[] indices = currentOp.getIndices();
+        clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(ordinal),
+                indices, new Integer(opFlags),
                 new Integer(expectedResult) ));
       }
     }
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
index 0e33a62f1fba..ec1c692d9354 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
@@ -284,8 +284,10 @@ else if ((opFlags & OpFlags.CHECK_EXCEPTION) > 0) {
             opFlags), new Integer(expectedResult));
       }
       else {
-        clientVM.invoke(() -> DeltaClientPostAuthorizationDUnitTest.doOp( new Byte(opCode.toOrdinal()),
-                currentOp.getIndices(), new Integer(opFlags),
+        byte ordinal = opCode.toOrdinal();
+        int[] indices = currentOp.getIndices();
+        clientVM.invoke(() -> DeltaClientPostAuthorizationDUnitTest.doOp( new Byte(ordinal),
+                indices, new Integer(opFlags),
                 new Integer(expectedResult) ));
       }
     }
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 0ddb70d5a6c2..5f3ab7d41e50 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -63,6 +63,9 @@
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.VM;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 /**
  *
  *
@@ -95,9 +98,9 @@ public class CQListGIIDUnitTest extends DistributedTestCase {
 
   protected static VM clientVM2 = null;
 
-  private static int PORT1;
+  private int PORT1;
 
-  private static int PORT2;
+  private int PORT2;
 
   private static final String regionName = "CQListGIIDUnitTest";
 
@@ -183,6 +186,18 @@ protected final void preTearDown() throws Exception {
     serverVM1.invoke(() -> CQListGIIDUnitTest.closeCache());
     disconnectAllFromDS();
   }
+  
+  public static Test suite() {
+    Class[] classes = new Class[] {com.gemstone.gemfire.internal.cache.ha.CQListGIIDUnitTest.class,
+ com.gemstone.gemfire.internal.cache.tier.sockets.DataSerializerPropogationDUnitTest.class,
+ com.gemstone.gemfire.internal.cache.tier.sockets.EventIDVerificationDUnitTest.class,
+ com.gemstone.gemfire.internal.cache.tier.sockets.EventIDVerificationInP2PDUnitTest.class,
+ com.gemstone.gemfire.internal.cache.tier.sockets.UpdatePropagationDUnitTest.class,
+ com.gemstone.gemfire.internal.cache.tier.sockets.UpdatePropagationPRDUnitTest.class,
+ com.gemstone.gemfire.security.DeltaClientPostAuthorizationDUnitTest.class};
+    return new TestSuite(classes);
+  }
+
 
   private void createCache(Properties props) throws Exception {
     DistributedSystem ds = getSystem(props);
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index 5b10d3dfac92..d74f3ff93804 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -91,9 +91,9 @@ public class HADispatcherDUnitTest extends DistributedTestCase
 
   VM client2 = null;
 
-  public static int PORT1;
+  public int PORT1;
 
-  public static int PORT2;
+  public int PORT2;
 
   private static final String REGION_NAME = "HADispatcherDUnitTest_region";
 
@@ -144,11 +144,11 @@ public void setUp() throws Exception
     client1.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
     client2.invoke(() -> CacheServerTestUtil.disableShufflingOfEndpoints());
     client1.invoke(() -> HADispatcherDUnitTest.createClientCache(
-            NetworkUtils.getServerHostName(Host.getHost(0)),
+            NetworkUtils.getServerHostName(host),
             new Integer(PORT1), new Integer(PORT2),
             new Boolean(false) ));
     client2.invoke(() -> HADispatcherDUnitTest.createClientCache(
-            NetworkUtils.getServerHostName(Host.getHost(0)),
+            NetworkUtils.getServerHostName(host),
             new Integer(PORT1), new Integer(PORT2),
             new Boolean(true) ));
     //createClientCache(new Integer(PORT1), new Integer(PORT2), new Boolean(true) );
@@ -380,8 +380,8 @@ public static Integer createServerCache(Boolean isListenerPresent)
   public static void createClientCache(String hostName, Integer port1, Integer port2,
       Boolean isListenerPresent) throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 8f0db7035410..824f2e7d392f 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -66,9 +66,9 @@ public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTes
   
   VM client2 = null;
  
-  private static  int PORT1 ;
+  private int PORT1 ;
   
-  private static  int PORT2 ;
+  private int PORT2 ;
   
   private static PoolImpl p = null; 
   /*
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index a0a57ba00bdd..bd24d9a854fc 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -152,8 +152,7 @@ public void testGatewaySenderEventListenerInvocation() {
     vm3.invoke(() -> WANTestBase.validateRegionSize(
         getTestMethodName() + "_RR", 0 ));
 
-    fail("tried to invoke missing method");
-//    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", keyValues ));
+    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener1("ln", keyValues ));
   }
 
   /**
@@ -305,7 +304,7 @@ public static void validateNoPoolCreation(final String siteId) {
     }
   }
   
-  public static void validateReceivedEventsMapSizeListener1(final String senderId, final HashMap map) {
+  public static void validateReceivedEventsMapSizeListener1(final String senderId, final Map map) {
 
     Set senders = cache.getGatewaySenders();
     GatewaySender sender = null;

From f593119d2cea74ef8d75809c0c2e71b85bf0822e Mon Sep 17 00:00:00 2001
From: Dan Smith 
Date: Thu, 18 Feb 2016 10:37:25 -0800
Subject: [PATCH 12/12] Removing a few more statics

These are a few places I missed in my last checkin.
---
 .../cache30/RegionReliabilityTestCase.java        | 10 ++++++++--
 ...ientServerFunctionExecutionNoAckDUnitTest.java |  8 ++++----
 ...entServerRegionFunctionExecutionDUnitTest.java |  5 +++--
 ...gionFunctionExecutionNoSingleHopDUnitTest.java |  2 +-
 ...tionExecutionSelectorNoSingleHopDUnitTest.java |  2 +-
 ...RegionFunctionExecutionSingleHopDUnitTest.java |  2 +-
 .../cache/ha/HASlowReceiverDUnitTest.java         |  5 +++--
 .../internal/cache/ha/CQListGIIDUnitTest.java     | 15 +++++++++------
 ...NewWANConcurrencyCheckForDestroyDUnitTest.java |  6 +-----
 ...SerialGatewaySenderEventListenerDUnitTest.java |  5 ++---
 10 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index de0451ed4e57..8cc65d36b654 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -1247,7 +1247,7 @@ public void run2() throws CacheException {
     region.put("INVALIDATE_ME", "VAL");
       
     // define the afterReleaseLocalLocks callback
-    Runnable removeRequiredRole = new Runnable() {
+    SerializableRunnable removeRequiredRole = new SerializableRunnable() {
       public void run() {
         Host.getHost(0).getVM(1).invoke(new SerializableRunnable("Close Region") {
           public void run() {
@@ -1264,7 +1264,13 @@ public void run() {
 //        catch (InterruptedException e) {}
       }
     };
-    DistributedCacheOperation.setBeforePutOutgoing(removeRequiredRole);
+    DistributedCacheOperation.setBeforePutOutgoing(() -> {
+     try {
+       removeRequiredRole.run();
+     } catch(Exception e) {
+       throw new RuntimeException(e);
+     }
+    });
 
     Runnable reset = new Runnable() {
       public void run() {
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index c5eab0aa625d..80d59ed7a0fb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -39,11 +39,11 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe
    */
   private static final String TEST_FUNCTION1 = TestFunction.TEST_FUNCTION1;
 
-  static Boolean isByName = null;
+  Boolean isByName = null;
 
-  static Function functionNoAck = null;
-  static Function functionAck = null;
-  static Boolean toRegister = null;
+  Function functionNoAck = null;
+  Function functionAck = null;
+  Boolean toRegister = null;
   
   private static final int NUM_ITERATION=1;
   
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 56abb8ccab2f..0104e7a43500 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -68,10 +68,10 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
   private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
 
   private static final String TEST_FUNCTION2 = TestFunction.TEST_FUNCTION2;
-  static Boolean isByName = null;
+  Boolean isByName = null;
   
   private static int retryCount = 0;
-  static Boolean toRegister = null;
+  Boolean toRegister = null;
 
   private static Region metaDataRegion;
 
@@ -270,6 +270,7 @@ public void testServerSingleKeyExecution_byInstance() {
     Function function = new TestFunction(true,TEST_FUNCTION2);
     registerFunctionAtServer(function);
     isByName = new Boolean(false);
+    toRegister = true;
     client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest.serverSingleKeyExecution( isByName , toRegister));
   } 
   
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 005b1b5cd695..ffcac6531ffa 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -61,7 +61,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
 
   private static final String TEST_FUNCTION2 = TestFunction.TEST_FUNCTION2;
 
-  static Boolean isByName = null;
+  Boolean isByName = null;
 
   private static int retryCount = 0;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index 890841ef493a..5a17f4d003ea 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -61,7 +61,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
 
   private static final String TEST_FUNCTION2 = TestFunction.TEST_FUNCTION2;
 
-  static Boolean isByName = null;
+  Boolean isByName = null;
 
   private static int retryCount = 0;
 
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index a1c31d86b201..84da5247ffe9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -58,7 +58,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest extends PRC
     private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
 
     private static final String TEST_FUNCTION2 = TestFunction.TEST_FUNCTION2;
-    static Boolean isByName = null;
+    Boolean isByName = null;
     
     private static int retryCount = 0;
     
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
index 6d21778e4973..aa7964ce3ece 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -55,7 +55,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
 
   protected static VM clientVM = null;
 
-  private static int PORT0;
+  private int PORT0;
 
   private int PORT1;
 
@@ -247,7 +247,8 @@ public String description() {
   // Test slow client
   public void testSlowClient() throws Exception {
     setBridgeObeserverForAfterQueueDestroyMessage();
-    clientVM.invoke(() -> HASlowReceiverDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT0),
+    Host host = Host.getHost(0);
+    clientVM.invoke(() -> HASlowReceiverDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT0),
             new Integer(PORT1), new Integer(PORT2), new Integer(2) ));
     clientVM.invoke(() -> HASlowReceiverDUnitTest.registerInterest());
     // add expected socket exception string
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 5f3ab7d41e50..6a3de04633bc 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -189,12 +189,15 @@ protected final void preTearDown() throws Exception {
   
   public static Test suite() {
     Class[] classes = new Class[] {com.gemstone.gemfire.internal.cache.ha.CQListGIIDUnitTest.class,
- com.gemstone.gemfire.internal.cache.tier.sockets.DataSerializerPropogationDUnitTest.class,
- com.gemstone.gemfire.internal.cache.tier.sockets.EventIDVerificationDUnitTest.class,
- com.gemstone.gemfire.internal.cache.tier.sockets.EventIDVerificationInP2PDUnitTest.class,
- com.gemstone.gemfire.internal.cache.tier.sockets.UpdatePropagationDUnitTest.class,
- com.gemstone.gemfire.internal.cache.tier.sockets.UpdatePropagationPRDUnitTest.class,
- com.gemstone.gemfire.security.DeltaClientPostAuthorizationDUnitTest.class};
+        com.gemstone.gemfire.cache30.RegionReliabilityDistAckDUnitTest.class,
+        com.gemstone.gemfire.cache30.RegionReliabilityGlobalDUnitTest.class,
+        com.gemstone.gemfire.internal.cache.execute.PRClientServerFunctionExecutionNoAckDUnitTest.class,
+        com.gemstone.gemfire.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest.class,
+        com.gemstone.gemfire.internal.cache.execute.PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class,
+        com.gemstone.gemfire.internal.cache.execute.PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class,
+        com.gemstone.gemfire.internal.cache.execute.PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class,
+        com.gemstone.gemfire.internal.cache.ha.HASlowReceiverDUnitTest.class};
+    
     return new TestSuite(classes);
   }
 
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 598becef68d5..e0e7836dbe51 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
@@ -46,10 +46,6 @@
  */
 public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase {
 
-  //These fields are used as BlackBoard for test data verification.
-  static long destroyTimeStamp;
-  static int destroyingMember;
-  
   public NewWANConcurrencyCheckForDestroyDUnitTest(String name) {
     super(name);
   }
@@ -128,7 +124,7 @@ public void run2() throws CacheException {
     //wait for vm1 to propagate put to vm3 and vm5
     Wait.pause(2000); 
 
-    destroyTimeStamp = (Long) vm3.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.getVersionTimestampAfterOp());
+    long destroyTimeStamp = (Long) vm3.invoke(() -> NewWANConcurrencyCheckForDestroyDUnitTest.getVersionTimestampAfterOp());
     
     //wait for vm1 to propagate destroyed entry's new version tag to vm5
     Wait.pause(2000); 
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index bd24d9a854fc..90dde8c28354 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -207,8 +207,7 @@ public void testGatewaySender2EventListenerInvocation() {
     vm3.invoke(() -> WANTestBase.validateRegionSize(
         getTestMethodName() + "_RR", 0 ));
     
-    fail("tried to invoke missing method");    
-//    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener2("ln", keyValues ));
+    vm4.invoke(() -> SerialGatewaySenderEventListenerDUnitTest.validateReceivedEventsMapSizeListener2("ln", keyValues ));
   }
   
   /**
@@ -338,7 +337,7 @@ public String description() {
     }
   }
   
-  public static void validateReceivedEventsMapSizeListener2(final String senderId, final HashMap map) {
+  public static void validateReceivedEventsMapSizeListener2(final String senderId, final Map map) {
 
     Set senders = cache.getGatewaySenders();
     GatewaySender sender = null;