Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-866 [created] 58038ec1f
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java ---------------------------------------------------------------------- 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 bc2c28f..d01c4c7 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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 class WanCommandStatusDUnitTest extends WANCommandTestBase{ 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"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java ---------------------------------------------------------------------- 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 0fe7b18..f009618 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 class WANManagementDUnitTest extends ManagementTestBase { 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 class WANManagementDUnitTest extends ManagementTestBase { 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 class WANManagementDUnitTest extends ManagementTestBase { 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 class WANManagementDUnitTest extends ManagementTestBase { 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); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69024aa9/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java ---------------------------------------------------------------------- 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 44a4db2..b355c89 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 class TestRemoteClusterDUnitTest extends ManagementTestBase { 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 class TestRemoteClusterDUnitTest extends ManagementTestBase { stopGatewaySender(puneSender); startGatewaySender(puneSender); - DistributedMember puneMember = (DistributedMember) puneSender.invoke( - TestRemoteClusterDUnitTest.class, "getMember"); + DistributedMember puneMember = (DistributedMember) puneSender.invoke(() -> TestRemoteClusterDUnitTest.getMember()); checkRemoteClusterStatus(managing, puneMember);
