You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/04/19 20:19:33 UTC
[07/13] incubator-geode git commit: GEODE-1032 : Additional wait time
to check for empty queue,
refactored WANTestBase.java to remove unused functions,
replaced wait criterions with awaitility.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index 4669ac9..91f3c1f 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -54,7 +54,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -134,7 +134,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -197,7 +197,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
vm3.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -289,7 +289,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
vm3.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//verify all buckets drained on all sender nodes.
vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
@@ -313,7 +313,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -327,22 +327,16 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION ));
- vm4.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
- "ln", 1, 100, isOffHeap() ));
- vm5.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
- "ln", 1, 100, isOffHeap() ));
- vm6.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
- "ln", 1, 100, isOffHeap() ));
- vm7.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
- "ln", 1, 100, isOffHeap() ));
+ vm4.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion("ln", 1, 100, isOffHeap() ));
+ vm5.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion("ln", 1, 100, isOffHeap() ));
+ vm6.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion("ln", 1, 100, isOffHeap() ));
+ vm7.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion("ln", 1, 100, isOffHeap() ));
startSenderInVMs("ln", vm4, vm5, vm6, vm7);
- vm2.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
- "ln", 1, 100, isOffHeap() ));
- vm3.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
- "ln", 1, 100, isOffHeap() ));
+ vm2.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion("ln", 1, 100, isOffHeap() ));
+ vm3.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion("ln", 1, 100, isOffHeap() ));
//before doing any puts, let the senders be running in order to ensure that
//not a single event will be lost
@@ -381,7 +375,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -491,7 +485,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -537,7 +531,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -578,7 +572,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -638,7 +632,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3, vm4);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index ddcb3d6..400a289 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -45,7 +45,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -91,7 +91,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -143,7 +143,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -203,7 +203,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -280,7 +280,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(nyPort, vm4, vm5);
vm4.invoke(() -> WANTestBase.createCache( lnPort ));
@@ -342,7 +342,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
vm3.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -400,7 +400,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
vm3.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -496,7 +496,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
vm3.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -582,7 +582,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -672,7 +672,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index c922314..a0b00e9 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -312,11 +312,11 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
Integer pnPort = (Integer)vm3.invoke(() -> createFirstRemoteLocator(4, lnPort));
createCacheInVMs(nyPort, vm4);
- vm4.invoke(() -> createReceiver(nyPort));
+ vm4.invoke(() -> createReceiver());
createCacheInVMs(tkPort, vm5);
- vm5.invoke(() -> createReceiver(tkPort));
+ vm5.invoke(() -> createReceiver());
createCacheInVMs(pnPort, vm6);
- vm6.invoke(() -> createReceiver(pnPort));
+ vm6.invoke(() -> createReceiver());
try {
vm7.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(lnPort));
@@ -366,7 +366,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
Integer nyPort = locatorPorts[1];
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> createReceiver(nyPort));
+ vm2.invoke(() -> createReceiver());
try {
createAndStartSender(vm4, lnPort, 5, true, false);
@@ -407,9 +407,9 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
Integer tkPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator(3, lnPort));
createCacheInVMs(nyPort, vm6);
- vm6.invoke(() -> createReceiver(nyPort));
+ vm6.invoke(() -> createReceiver());
createCacheInVMs(tkPort, vm7);
- vm7.invoke(() -> createReceiver(tkPort));
+ vm7.invoke(() -> createReceiver());
try {
createAndStartTwoSenders(vm4, lnPort, 4);
@@ -454,7 +454,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
Integer nyPort = locatorPorts[1];
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> createReceiver(nyPort));
+ vm2.invoke(() -> createReceiver());
try {
createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 5, true);
@@ -462,7 +462,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
LogWriterUtils.getLogWriter().info("Created PRs on local site");
- vm2.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, null, 1, 100, isOffHeap()));
+ vm2.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, 1, 100, isOffHeap()));
AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.putcolocatedPartitionedRegion( 10 ));
Wait.pause(1000);
@@ -492,7 +492,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
Integer nyPort = locatorPorts[1];
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
try {
createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 6, true);
@@ -500,8 +500,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
LogWriterUtils.getLogWriter().info("Created PRs on local site");
- vm2.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion( null,
- null, 1, 100, isOffHeap() ));
+ vm2.invoke(() -> WANTestBase.createCustomerOrderShipmentPartitionedRegion(null, 1, 100, isOffHeap() ));
AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.putcolocatedPartitionedRegion( 2000 ));
Wait.pause(1000);
@@ -570,7 +569,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
// Note: This is a test-specific method used by several tests to do puts from vm4 to vm2.
String regionName = getTestMethodName() + "_PR";
createCacheInVMs(port, vm2);
- vm2.invoke(() -> createReceiver(port));
+ vm2.invoke(() -> createReceiver());
vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
vm4.invoke(() -> doPuts(regionName, 10));
vm4.invoke(() -> validateRegionSize(regionName, 10));
@@ -589,7 +588,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
protected void createAndStartSenderWithCustomerOrderShipmentRegion(VM vm, int port, int concurrencyLevel, boolean manualStart) {
vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
- vm.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, "ln", 1, 100, isOffHeap()));
+ vm.invoke(() -> createCustomerOrderShipmentPartitionedRegion("ln", 1, 100, isOffHeap()));
createSender(vm, concurrencyLevel, manualStart);
vm.invoke(() -> startSender("ln"));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
index d29a995..315e9ca 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
@@ -84,8 +84,8 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
vm3.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
- vm2.invoke(() -> WANTestBase.createReceiver(nyPort ));
- vm3.invoke(() -> WANTestBase.createReceiver(nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
+ vm3.invoke(() -> WANTestBase.createReceiver());
vm4.invoke(() -> WANTestBase.validateRegionSize(
getTestMethodName() + "_RR", 1000 ));
@@ -100,7 +100,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -143,7 +143,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -230,7 +230,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
//these are part of remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//these are part of local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -310,7 +310,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
//these are part of remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//these are part of local site
@@ -379,7 +379,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
//these are part of remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//these are part of local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -457,7 +457,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
// these are part of remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
// these are part of local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
index a9b4b9d..6026b3a 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
@@ -16,13 +16,8 @@
*/
package com.gemstone.gemfire.internal.cache.wan.concurrent;
-import com.gemstone.gemfire.cache.CacheException;
-import com.gemstone.gemfire.cache.EntryExistsException;
-import com.gemstone.gemfire.cache.client.ServerOperationException;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
-import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -49,7 +44,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -79,9 +74,9 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
getTestMethodName() + "_RR", 150 ));
vm2.invoke(() -> WANTestBase.validateRegionSize(
- getTestMethodName() + "_RR", 150 ));
+ getTestMethodName() + "_RR", 150, 240000));
vm3.invoke(() -> WANTestBase.validateRegionSize(
- getTestMethodName() + "_RR", 150 ));
+ getTestMethodName() + "_RR", 150, 240000 ));
}
public void Bug46921_testSerialReplicatedWanWithPersistence() {
@@ -90,7 +85,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -133,8 +128,8 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
createCacheInVMs(nyPort, vm2);
createCacheInVMs(tkPort, vm3);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
- vm3.invoke(() -> WANTestBase.createReceiver( tkPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
+ vm3.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -184,7 +179,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -228,7 +223,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -269,7 +264,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2,lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -309,7 +304,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2,lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -352,7 +347,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
getTestMethodName(), null, isOffHeap() ));
vm3.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName(), null, isOffHeap() ));
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -389,7 +384,7 @@ public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
vm2.invoke(() -> WANTestBase.createCache(nyPort));
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
WANTestBase.createCacheInVMs(lnPort, vm4, vm5);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 3de19e2..63e7266 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -16,11 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.wan.disttx;
-import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
@@ -56,7 +52,7 @@ public class DistTXWANDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -95,7 +91,7 @@ public class DistTXWANDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -133,7 +129,7 @@ public class DistTXWANDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
index cba42df..5731b45 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
@@ -22,9 +22,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.RegionQueue;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue;
-import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.IgnoredException;
@@ -81,7 +79,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -161,7 +159,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -249,7 +247,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//create cache in local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
index 680f6bc..2c62a7c 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
@@ -61,17 +61,17 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase {
// Site 1
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
createCacheInVMs(lnPort, vm1);
- Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver( lnPort ));
+ Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver());
//Site 2
Integer nyPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm3);
- Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver());
//Site 3
Integer tkPort = (Integer)vm4.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
createCacheInVMs(tkPort, vm5);
- Integer tkRecPort = (Integer) vm5.invoke(() -> WANTestBase.createReceiver( tkPort ));
+ Integer tkRecPort = (Integer) vm5.invoke(() -> WANTestBase.createReceiver());
LogWriterUtils.getLogWriter().info("Created locators and receivers in 3 distributed systems");
@@ -145,12 +145,12 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase {
// Site 1
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
vm1.invoke(() -> WANTestBase.createCache(lnPort));
- Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver( lnPort ));
+ Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver());
//Site 2
Integer nyPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
vm3.invoke(() -> WANTestBase.createCache(nyPort));
- Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver());
LogWriterUtils.getLogWriter().info("Created locators and receivers in 2 distributed systems");
@@ -250,12 +250,12 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() {
// Site 1
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
createCacheInVMs(lnPort, vm1);
- Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver( lnPort ));
+ Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver());
//Site 2
Integer nyPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm3);
- Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver());
LogWriterUtils.getLogWriter().info("Created locators and receivers in 2 distributed systems");
@@ -357,12 +357,12 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() {
// Site 1
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
createCacheInVMs(lnPort, vm1);
- Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver( lnPort ));
+ Integer lnRecPort = (Integer) vm1.invoke(() -> WANTestBase.createReceiver());
//Site 2
Integer nyPort = (Integer)vm2.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm3);
- Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ Integer nyRecPort = (Integer) vm3.invoke(() -> WANTestBase.createReceiver());
LogWriterUtils.getLogWriter().info("Created locators and receivers in 2 distributed systems");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index 1782309..d665f60 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -16,10 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.wan.misc;
-import com.gemstone.gemfire.cache.CacheWriterException;
-import com.gemstone.gemfire.cache.client.ServerOperationException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -45,7 +42,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3);
@@ -224,9 +221,9 @@ public class PDXNewWanDUnitTest extends WANTestBase{
createCacheInVMs(lnPort, vm3);
createCacheInVMs(nyPort, vm4);
createCacheInVMs(tkPort, vm5);
- vm3.invoke(() -> WANTestBase.createReceiver( lnPort ));
- vm4.invoke(() -> WANTestBase.createReceiver( nyPort ));
- vm5.invoke(() -> WANTestBase.createReceiver( tkPort ));
+ vm3.invoke(() -> WANTestBase.createReceiver());
+ vm4.invoke(() -> WANTestBase.createReceiver());
+ vm5.invoke(() -> WANTestBase.createReceiver());
//Create all of our gateway senders
@@ -294,7 +291,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3);
@@ -337,7 +334,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
createCacheInVMs(nyPort, vm2);
vm2.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 0, 2, isOffHeap() ));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3);
@@ -404,7 +401,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
createCacheInVMs(nyPort, vm2);
vm2.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null,1, 5, isOffHeap() ));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3, vm4);
@@ -473,7 +470,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm3.invoke(() -> WANTestBase.createCache( lnPort ));
@@ -502,7 +499,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
createCacheInVMs(nyPort, vm2);
vm2.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 0, 1, isOffHeap() ));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3);
@@ -556,7 +553,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3, vm4);
@@ -622,7 +619,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3);
@@ -652,7 +649,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3, vm4);
@@ -691,7 +688,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm3);
@@ -714,7 +711,7 @@ public class PDXNewWanDUnitTest extends WANTestBase{
vm2.invoke(() -> WANTestBase.killSender());
- createReceiverInVMs(nyPort, vm2, vm4);
+ createReceiverInVMs(vm2, vm4);
vm2.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 1, 2, isOffHeap() ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
index b0a14af..4469570 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
@@ -16,7 +16,6 @@
*/
package com.gemstone.gemfire.internal.cache.wan.misc;
-import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
@@ -52,7 +51,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
@@ -194,7 +193,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas
getTestMethodName() + "_RR", null, isOffHeap() ));
vm3.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//create cache in local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -342,8 +341,8 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas
//create receiver on remote site
vm2.invoke(() -> WANTestBase.createCache( nyPort ));
vm3.invoke(() -> WANTestBase.createCache( nyPort ));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
- vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
+ vm3.invoke(() -> WANTestBase.createReceiver());
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
@@ -554,7 +553,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas
Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -597,14 +596,14 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas
vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
- pauseWaitCriteria(60000);
+ Thread.sleep(60000);
{
AsyncInvocation inv1 = vm7.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts0( getTestMethodName() + "_RR", 10000 ));
- pauseWaitCriteria(1000);
+ Thread.sleep(1000);
AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
- pauseWaitCriteria(2000);
+ Thread.sleep(2000);
AsyncInvocation inv3 = vm6.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts1( getTestMethodName() + "_RR", 10000 ));
- pauseWaitCriteria(1500);
+ Thread.sleep(1500);
AsyncInvocation inv4 = vm5.invokeAsync(() -> WANTestBase.killSender());
try {
inv1.join();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
index 3387249..543d622 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
@@ -16,33 +16,14 @@
*/
package com.gemstone.gemfire.internal.cache.wan.misc;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.EntryExistsException;
import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.client.ServerConnectivityException;
-import com.gemstone.gemfire.cache.client.ServerOperationException;
-import com.gemstone.gemfire.cache.wan.GatewaySender;
-import com.gemstone.gemfire.distributed.internal.ReplyException;
-import com.gemstone.gemfire.internal.cache.BucketRegion;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
-import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.internal.cache.PrimaryBucketException;
-import com.gemstone.gemfire.internal.cache.PutAllPartialResultException;
-import com.gemstone.gemfire.internal.cache.RegionQueue;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -68,7 +49,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
@@ -343,7 +324,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
@@ -389,7 +370,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
createCacheInVMs(nyPort, vm2);
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm4, vm5);
@@ -441,7 +422,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
vm2.invoke(() -> WANTestBase.createCache( nyPort ));
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm4.invoke(() -> WANTestBase.createCache( lnPort ));
vm5.invoke(() -> WANTestBase.createCache( lnPort ));
@@ -492,8 +473,8 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
- vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
+ vm3.invoke(() -> WANTestBase.createReceiver());
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
@@ -590,7 +571,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
@@ -665,7 +646,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -788,7 +769,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
createCacheInVMs(nyPort, vm2);
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
getTestMethodName() + "_RR", null, isOffHeap() ));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm4, vm5);
@@ -838,7 +819,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5);
@@ -862,7 +843,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
- pauseWaitCriteria(60000);
+ Thread.sleep(60000);;
/* ExpectedException exp1 = addExpectedException(CacheClosedException.class
.getName());
@@ -909,7 +890,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -943,18 +924,18 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas
vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
- pauseWaitCriteria(60000);
+ Thread.sleep(60000);
/* ExpectedException exp1 = addExpectedException(CacheClosedException.class
.getName());
try */{
AsyncInvocation inv1 = vm7.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts0(
getTestMethodName() + "_RR", 10000 ));
- pauseWaitCriteria(1000);
+ Thread.sleep(1000);
AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.killSender());
- pauseWaitCriteria(2000);
+ Thread.sleep(2000);
AsyncInvocation inv3 = vm6.invokeAsync(() -> ReplicatedRegion_ParallelWANPropogationDUnitTest.doPuts1(
getTestMethodName() + "_RR", 10000 ));
- pauseWaitCriteria(1500);
+ Thread.sleep(1500);
AsyncInvocation inv4 = vm5.invokeAsync(() -> WANTestBase.killSender());
try {
inv1.join();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
index 92e318c..4ee378f 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
@@ -61,7 +61,7 @@ public class ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase {
vm2.invoke(() -> WANTestBase.createCache( nyPort ));
vm3.invoke(() -> WANTestBase.createCache( nyPort ));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm2.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion( getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
@@ -124,7 +124,7 @@ public class ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase {
"vm1's region size before restart gatewayhub is " + region.size());
}
});
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
// wait for vm0 to finish its work
vm4_future.join(MAX_WAIT);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
index 5f81d1f..f322394 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -98,7 +98,7 @@ public class WANSSLDUnitTest extends WANTestBase{
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm4.invoke(() -> WANTestBase.createCacheWithSSL( lnPort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
index cb013ef..612a178 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.cache.wan.misc;
import java.util.ArrayList;
import java.util.Map;
-import com.gemstone.gemfire.cache.client.ServerOperationException;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
@@ -724,7 +723,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
createCacheInVMs(lnPort, vm4);
- vm4.invoke(() -> WANTestBase.createReceiver( lnPort ));
+ vm4.invoke(() -> WANTestBase.createReceiver());
vm4.invoke(() -> WANTestBase.createCacheServer( ));
@@ -743,7 +742,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
public void test_GetCacheServersDoesNotReturnReceivers_Scenario2() {
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
createCacheInVMs(lnPort, vm4);
- vm4.invoke(() -> WANTestBase.createReceiver( lnPort ));
+ vm4.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm5);
vm5.invoke(() -> WANTestBase.createCacheServer( ));
@@ -822,7 +821,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
createCacheInVMs(nyPort, vm2);
vm2.invoke(createReceiverReplicatedRegion());
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -904,7 +903,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
createCacheInVMs(nyPort, vm2);
vm2.invoke(createReceiverReplicatedRegion());
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -981,7 +980,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm2.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_RR", null, 1, 100, isOffHeap() ));
@@ -1074,7 +1073,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm2.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
@@ -1169,7 +1168,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
createCacheInVMs(nyPort, vm2);
vm2.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -1256,7 +1255,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
createCacheInVMs(nyPort, vm2);
vm2.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 1, 10, isOffHeap()));
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -1428,7 +1427,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
// ------------- START - CREATE CACHE ON REMOTE SITE ---------------//
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
vm2.invoke(() -> WANTestBase.createSender( "ny", 1,
false, 100, 10, false, false, null, true ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 3f0329a..0d34f44 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -16,19 +16,13 @@
*/
package com.gemstone.gemfire.internal.cache.wan.parallel;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import com.gemstone.gemfire.GemFireIOException;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
import com.gemstone.gemfire.internal.cache.tier.sockets.MessageTooLargeException;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.RMIException;
@@ -176,7 +170,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
Integer nyPort = locatorPorts[1];
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5);
@@ -575,7 +569,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
IgnoredException ignoredGIOE = IgnoredException.addIgnoredException(GemFireIOException.class.getName(), vm4);
vm2.invoke(() -> createCache( nyPort ));
vm2.invoke(() -> createPartitionedRegion( regionName, null, 0, 100, isOffHeap() ));
- vm2.invoke(() -> createReceiver( nyPort ));
+ vm2.invoke(() -> createReceiver());
validateRegionSizes( regionName, numPuts, vm2 );
vm4.invoke(() -> {
@@ -608,7 +602,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
// Note: This is a test-specific method used by several test to create
// receivers and senders.
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index 07c2610..7169b2e 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -61,18 +61,14 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
- vm4.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2,
- true, 10, 10, false, false, null, true ));
- vm5.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2,
- true, 10, 10, false, false, null, true ));
- vm6.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2,
- true, 10, 10, false, false, null, true ));
- vm7.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2,
- true, 10, 10, false, false, null, true ));
+ vm4.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2, 10, 10, false, true ));
+ vm5.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2, 10, 10, false, true ));
+ vm6.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2, 10, 10, false, true ));
+ vm7.invoke(() -> WANTestBase.createSenderWithoutDiskStore( "ln", 2, 10, 10, false, true ));
vm4.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName(), "ln", 1, 100, isOffHeap() ));
@@ -127,8 +123,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
vm6.invoke(() -> WANTestBase.resumeSender( "ln" ));
vm7.invoke(() -> WANTestBase.resumeSender( "ln" ));
- vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50 ));
- vm3.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50 ));
+ vm2.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50, 240000 ));
+ vm3.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50, 240000 ));
}
/**
@@ -141,7 +137,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -222,7 +218,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -303,7 +299,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index ab261fd..cab59a4 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -359,21 +359,15 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
}
protected void createOrderShipmentOnReceivers() {
- vm2.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
- getTestMethodName(), null, 1, 8, isOffHeap() ));
- vm3.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
- getTestMethodName(), null, 1, 8, isOffHeap() ));
+ vm2.invoke(() ->createCustomerOrderShipmentPartitionedRegion(null, 1, 8, isOffHeap() ));
+ vm3.invoke(() ->createCustomerOrderShipmentPartitionedRegion(null, 1, 8, isOffHeap() ));
}
protected void createOrderShipmentOnSenders() {
- vm4.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
- getTestMethodName(), "ln", 0, 8, isOffHeap() ));
- vm5.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
- getTestMethodName(), "ln", 0, 8, isOffHeap() ));
- vm6.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
- getTestMethodName(), "ln", 0, 8, isOffHeap() ));
- vm7.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
- getTestMethodName(), "ln", 0, 8, isOffHeap() ));
+ vm4.invoke(() ->createCustomerOrderShipmentPartitionedRegion("ln", 0, 8, isOffHeap() ));
+ vm5.invoke(() ->createCustomerOrderShipmentPartitionedRegion("ln", 0, 8, isOffHeap() ));
+ vm6.invoke(() ->createCustomerOrderShipmentPartitionedRegion("ln", 0, 8, isOffHeap() ));
+ vm7.invoke(() ->createCustomerOrderShipmentPartitionedRegion("ln", 0, 8, isOffHeap() ));
}
protected Map updateKeyValues() {
@@ -456,7 +450,7 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() ->createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index 8139dca..ae38110 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -25,11 +25,9 @@ import com.gemstone.gemfire.cache.wan.GatewaySender;
import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
import com.gemstone.gemfire.internal.cache.ColocationHelper;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.dunit.SerializableCallableIF;
import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
@@ -87,7 +85,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -133,7 +131,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
LogWriterUtils.getLogWriter().info("Created remote receivers");
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -198,7 +196,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//create cache in local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -329,7 +327,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//create cache in local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -560,7 +558,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
getTestMethodName(), null, 1, 100, isOffHeap() ));
vm3.invoke(() -> WANTestBase.createPersistentPartitionedRegion(
getTestMethodName(), null, 1, 100, isOffHeap() ));
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
vm4.invoke(pauseSenderRunnable());
vm5.invoke(pauseSenderRunnable());
@@ -600,7 +598,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -735,7 +733,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//create cache in local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -863,7 +861,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -1073,7 +1071,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//create cache in local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -1181,7 +1179,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//create cache in local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -1293,7 +1291,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//create cache in local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -1431,7 +1429,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//create receiver on remote site
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//create cache in local site
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -1484,7 +1482,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
index 2c0d693..0e43930 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -42,7 +42,7 @@ public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5);
@@ -106,7 +106,7 @@ public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5);
@@ -151,7 +151,7 @@ public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReceiver());
vm2.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName() + "_PR", null, 3, 4, isOffHeap() ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84a4b474/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index 6d4b03a..63a129b 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -16,8 +16,6 @@
*/
package com.gemstone.gemfire.internal.cache.wan.parallel;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Set;
import com.gemstone.gemfire.cache.EntryExistsException;
@@ -29,11 +27,9 @@ import com.gemstone.gemfire.internal.cache.RegionQueue;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.BatchException70;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.dunit.SerializableCallableIF;
import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -114,7 +110,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
createCacheInVMs(nyPort, vm2, vm3);
vm2.invoke(createReceiverPartitionedRegionRedundancy1());
vm3.invoke(createReceiverPartitionedRegionRedundancy1());
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
//verify all buckets drained on all sender nodes.
vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
@@ -139,7 +135,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -200,7 +196,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -249,7 +245,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -302,7 +298,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -393,7 +389,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -440,7 +436,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -490,7 +486,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
getTestMethodName(), null, 1, 100, isOffHeap() ));
vm3.invoke(() -> WANTestBase.createPartitionedRegion(
getTestMethodName(), null, 1, 100, isOffHeap() ));
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -538,7 +534,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "lnSerial",
@@ -610,11 +606,11 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
createCacheInVMs(nyPort, vm2);
vm2.invoke(createReceiverPartitionedRegionRedundancy1());
- createReceiverInVMs(nyPort, vm2);
+ createReceiverInVMs(vm2);
createCacheInVMs(tkPort, vm3);
vm3.invoke(createReceiverPartitionedRegionRedundancy1());
- createReceiverInVMs(tkPort, vm3);
+ createReceiverInVMs(vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@ -692,7 +688,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -750,7 +746,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -802,7 +798,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -857,7 +853,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -931,7 +927,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2, vm3);
- createReceiverInVMs(nyPort, vm2, vm3);
+ createReceiverInVMs(vm2, vm3);
createCacheInVMs(lnPort, vm4, vm5);
//vm6.invoke(() -> WANTestBase.createCache( lnPort ));
//vm7.invoke(() -> WANTestBase.createCache( lnPort ));
@@ -965,8 +961,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
vm5.invoke(waitForSenderRunnable());
// vm6.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
// vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
- vm4.invoke(() -> WANTestBase.doTxPuts( getTestMethodName() + "_PR",
- 1000 ));
+ vm4.invoke(() -> WANTestBase.doTxPuts( getTestMethodName() + "_PR"));
//verify all buckets drained on all sender nodes.
vm4.invoke(() -> WANTestBase.validateParallelSenderQueueAllBucketsDrained("ln"));
@@ -984,7 +979,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
createCacheInVMs(nyPort, vm2);
createCacheInVMs(nyPort, vm2);
- createReceiverInVMs(nyPort, vm2);
+ createReceiverInVMs(vm2);
createCacheInVMs(lnPort, vm4, vm5);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -1035,7 +1030,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm2);
- createReceiverInVMs(nyPort, vm2);
+ createReceiverInVMs(vm2);
createCacheInVMs(lnPort, vm4, vm5);
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
@@ -1090,7 +1085,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
//create cache and receiver on site2
createCacheInVMs(nyPort, vm2);
- createReceiverInVMs(nyPort, vm2);
+ createReceiverInVMs(vm2);
//create cache on site1
createCacheInVMs(lnPort, vm3);
@@ -1130,7 +1125,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
createCacheInVMs(nyPort, vm6, vm7);
- createReceiverInVMs(nyPort, vm6, vm7);
+ createReceiverInVMs(vm6, vm7);
createCacheInVMs(lnPort, vm2, vm3, vm4, vm5);