http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java ---------------------------------------------------------------------- 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 44f7f06..1b3cd97 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 class DistAckMapMethodsDUnitTest extends DistributedTestCase{ 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 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{ 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 class DistAckMapMethodsDUnitTest extends DistributedTestCase{ 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 class DistAckMapMethodsDUnitTest extends DistributedTestCase{ //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 class DistAckMapMethodsDUnitTest extends DistributedTestCase{ //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 class DistAckMapMethodsDUnitTest extends DistributedTestCase{ //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 class DistAckMapMethodsDUnitTest extends DistributedTestCase{ //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 class DistAckMapMethodsDUnitTest extends DistributedTestCase{ public void testallMethodsArgs(){ Host host = Host.getHost(0); VM vm0 = host.getVM(0); - vm0.invoke(DistAckMapMethodsDUnitTest.class, "allMethodsArgs"); + vm0.invoke(() -> DistAckMapMethodsDUnitTest.allMethodsArgs()); }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java ---------------------------------------------------------------------- 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 a1cc2cd..f6836ae 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 class DistributedNoAckRegionCCEDUnitTest extends 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 class DistributedNoAckRegionCCEDUnitTest extends // } 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; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java ---------------------------------------------------------------------- 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 d3b065c..7a4d09e 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 abstract class MultiVMRegionTestCase extends RegionTestCase { } // 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 abstract class MultiVMRegionTestCase extends RegionTestCase { // 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 abstract class MultiVMRegionTestCase extends RegionTestCase { } // 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 abstract class MultiVMRegionTestCase extends RegionTestCase { // 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 abstract class MultiVMRegionTestCase extends RegionTestCase { 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<String, VersionTag> vm0Versions = (Map<String, VersionTag>)vm0.invoke(this.getClass(), "getCCRegionVersions"); - Map<String, VersionTag> vm1Versions = (Map<String, VersionTag>)vm1.invoke(this.getClass(), "getCCRegionVersions"); - Map<String, VersionTag> vm2Versions = (Map<String, VersionTag>)vm2.invoke(this.getClass(), "getCCRegionVersions"); + Map<String, VersionTag> vm0Versions = (Map<String, VersionTag>)vm0.invoke(() -> this.getCCRegionVersions()); + Map<String, VersionTag> vm1Versions = (Map<String, VersionTag>)vm1.invoke(() -> this.getCCRegionVersions()); + Map<String, VersionTag> vm2Versions = (Map<String, VersionTag>)vm2.invoke(() -> this.getCCRegionVersions()); for (Map.Entry<String, VersionTag> entry: vm0Versions.entrySet()) { VersionTag tag = entry.getValue(); @@ -8213,7 +8213,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase { 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 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase { // } // 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 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase { } } - 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 abstract class MultiVMRegionTestCase extends RegionTestCase { 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 abstract class MultiVMRegionTestCase extends RegionTestCase { // 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 abstract class MultiVMRegionTestCase extends RegionTestCase { } // 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 abstract class MultiVMRegionTestCase extends RegionTestCase { } // 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; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java ---------------------------------------------------------------------- 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 0408eb7..bc631bd 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 class PartitionedRegionDUnitTest extends MultiVMRegionTestCase { } }); - boolean success = vm0.invokeBoolean(PoisonedKey.class, "poisonFound"); + boolean success = vm0.invoke(() -> PoisonedKey.poisonFound()); assertTrue("Hash mismatch not found", success); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java ---------------------------------------------------------------------- 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 54554ab..8d6c14c 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 class ProxyDUnitTest extends CacheTestCase { getCache(); } }); - this.otherId = (DistributedMember)vm.invoke(ProxyDUnitTest.class, "getVMDistributedMember"); + this.otherId = (DistributedMember)vm.invoke(() -> ProxyDUnitTest.getVMDistributedMember()); } private void doCreateOtherVm() { VM vm = getOtherVm(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java ---------------------------------------------------------------------- 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 caa8333..01a1f42 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 class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase { 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 @@ public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase { 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(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java ---------------------------------------------------------------------- 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 8c85ebd..12337cd 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 class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{ 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 @@ public class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{ 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 class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{ } - vm0.invoke(PutAllCallBkSingleVMDUnitTest.class, "putAllMethod"); + vm0.invoke(() -> PutAllCallBkSingleVMDUnitTest.putAllMethod()); vm0.invoke(new CacheSerializableRunnable("temp1"){ public void run2() throws CacheException{ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java ---------------------------------------------------------------------- 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 5a37ebf..4ec8054 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 class PutAllMultiVmDUnitTest extends DistributedTestCase{ 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 @@ public class PutAllMultiVmDUnitTest extends DistributedTestCase{ 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; } }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java ---------------------------------------------------------------------- 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 0d80574..70c7171 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 class ReconnectDUnitTest extends CacheTestCase 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 class ReconnectDUnitTest extends CacheTestCase 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 class ReconnectDUnitTest extends CacheTestCase 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){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java ---------------------------------------------------------------------- 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 d539b82..0572c76 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 class RegionMembershipListenerDUnitTest extends CacheTestCase { 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(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java ---------------------------------------------------------------------- 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 f45c403..cfd1ce8 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 class RemoveAllMultiVmDUnitTest extends DistributedTestCase { 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 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase { 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; } }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java ---------------------------------------------------------------------- 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 e7c0ba7..babbf12 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 class RolePerformanceDUnitTest extends CacheTestCase { 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; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java ---------------------------------------------------------------------- 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 01aa205..f26f94a 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 class SearchAndLoadDUnitTest extends CacheTestCase { } 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(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java ---------------------------------------------------------------------- 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 7a306f0..720da56 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 class TXDistributedDUnitTest extends CacheTestCase { // 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 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java ---------------------------------------------------------------------- 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 a253f09..b1d7bab 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 class TXOrderDUnitTest extends CacheTestCase { getCache(); } }); - this.otherId = (DistributedMember)vm.invoke(TXOrderDUnitTest.class, "getVMDistributedMember"); + this.otherId = (DistributedMember)vm.invoke(() -> TXOrderDUnitTest.getVMDistributedMember()); } private void doCommitOtherVm() { VM vm = getOtherVm(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java ---------------------------------------------------------------------- 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 545a0ea..e88f6dd 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 class LocatorDUnitTest extends DistributedTestCase { 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 class LocatorDUnitTest extends DistributedTestCase { 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 class LocatorDUnitTest extends DistributedTestCase { 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 class LocatorDUnitTest extends DistributedTestCase { 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 class LocatorDUnitTest extends DistributedTestCase { 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 class LocatorDUnitTest extends DistributedTestCase { 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 class LocatorDUnitTest extends DistributedTestCase { 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)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalJUnitTest.java ---------------------------------------------------------------------- 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 bf848ff..ee8e220 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 class LocatorLauncherLocalJUnitTest extends AbstractLocatorLauncherJUnitT // 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 class LocatorLauncherLocalJUnitTest extends AbstractLocatorLauncherJUnitT 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()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java ---------------------------------------------------------------------- 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 ac091f6..2b57ca4 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 class LocatorLauncherRemoteJUnitTest extends AbstractLocatorLauncherJUnit // 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); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java ---------------------------------------------------------------------- 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 a7208fa..a472d6a 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 class ServerLauncherLocalJUnitTest extends AbstractServerLauncherJUnitTes // 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 class ServerLauncherLocalJUnitTest extends AbstractServerLauncherJUnitTes 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()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java ---------------------------------------------------------------------- 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 cbcfb77..21dd654 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 class ServerLauncherRemoteJUnitTest extends AbstractServerLauncherJUnitTe // 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); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java ---------------------------------------------------------------------- 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 166d5ac..e9f8539 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 @@ public class ConsoleDistributionManagerDUnitTest } // 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 @@ public class ConsoleDistributionManagerDUnitTest } 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 @@ public class ConsoleDistributionManagerDUnitTest } private InternalDistributedMember getJavaGroupsIdForVM(VM vm) { - return (InternalDistributedMember)vm.invoke(this.getClass(), "remoteGetJavaGroupsIdForVM"); + return (InternalDistributedMember)vm.invoke(() -> this.remoteGetJavaGroupsIdForVM()); } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java ---------------------------------------------------------------------- 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 374136d..c0e8268 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 class CacheMapDistTXDUnitTest extends CacheMapTxnDUnitTest { 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() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java ---------------------------------------------------------------------- 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 db36aac..dcb9ae7 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 class DistTXDebugDUnitTest extends CacheTestCase { } 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 class DistTXDebugDUnitTest extends CacheTestCase { 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 class DistTXDebugDUnitTest extends CacheTestCase { 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 class DistTXDebugDUnitTest extends CacheTestCase { 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 class DistTXDebugDUnitTest extends CacheTestCase { accessor.invoke(TxRollbackOps); - accessor.invoke(DistTXDebugDUnitTest.class, "destroyPR", - new Object[] { "pregion1" }); + accessor.invoke(() -> DistTXDebugDUnitTest.destroyPR( "pregion1" )); } public void testTXPRRR2_create() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java ---------------------------------------------------------------------- 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 2eaef9c..873baa7 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 class DistributedTransactionDUnitTest extends CacheTestCase { 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}); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java ---------------------------------------------------------------------- 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 d6ff35c..df09027 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 class Bug33359DUnitTest extends DistributedTestCase { 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 @@ public class Bug33359DUnitTest extends DistributedTestCase { 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(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java ---------------------------------------------------------------------- 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 5e7903e..e41d072 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 @@ public class Bug33726DUnitTest extends DistributedTestCase { 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 class Bug33726DUnitTest extends DistributedTestCase { 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); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java ---------------------------------------------------------------------- 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 3726ae8..788be04 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 class Bug37241DUnitTest extends DistributedTestCase */ 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 class Bug37241DUnitTest extends DistributedTestCase @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()); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java ---------------------------------------------------------------------- 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 532b806..6101520 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 class Bug39079DUnitTest extends CacheTestCase { 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 class Bug39079DUnitTest extends CacheTestCase { 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 class Bug39079DUnitTest extends CacheTestCase { 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 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java ---------------------------------------------------------------------- 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 58179f2..cbd503f 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 class Bug41733DUnitTest extends CacheTestCase { public void beforeProcessMessage(DistributionManager dm, DistributionMessage message) { if(message instanceof ManageBucketMessage) { - vm0.invoke(DistributedTestCase.class, "disconnectFromDS"); + vm0.invoke(() -> DistributedTestCase.disconnectFromDS()); } } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java ---------------------------------------------------------------------- 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 dabc277..4c79202 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 class ClearDAckDUnitTest extends DistributedTestCase { 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 @@ public class ClearDAckDUnitTest extends DistributedTestCase { 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 class ClearDAckDUnitTest extends DistributedTestCase { } 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); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java ---------------------------------------------------------------------- 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 54df822..0c94795 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 class ClearGlobalDUnitTest extends DistributedTestCase 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 class ClearGlobalDUnitTest extends DistributedTestCase objArr[0] = "" + i; server1.invoke(ClearGlobalDUnitTest.class, "putMethod", objArr); } - server1.invoke(ClearGlobalDUnitTest.class,"clearMethod"); + server1.invoke(() -> ClearGlobalDUnitTest.clearMethod()); checkTestResults(); }// end of test case
