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/02/02 21:21:10 UTC
[03/44] incubator-geode git commit: Refactor dunit
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
index af1b69d..95a8fc1 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -31,6 +31,8 @@ import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
import com.gemstone.gemfire.internal.cache.wan.MyGatewayTransportFilter3;
import com.gemstone.gemfire.internal.cache.wan.MyGatewayTransportFilter4;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
public class WanValidationsDUnitTest extends WANTestBase {
@@ -55,7 +57,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
public void testSameSerialGatewaySenderIdAcrossSameDistributedRegion()
throws Exception {
- addExpectedException("another cache has the same region defined");
+ IgnoredException.addIgnoredException("another cache has the same region defined");
try {
Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
new Object[] {1});
@@ -87,7 +89,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("Cannot create Region"))) {
- fail(
+ Assert.fail(
"Expected IllegalStateException with incompatible gateway sender ids message",
e);
}
@@ -131,7 +133,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
}
catch (Exception e) {
- fail("Caught Exception", e);
+ Assert.fail("Caught Exception", e);
}
}
@@ -141,7 +143,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
*/
public void testSameSerialGatewaySenderIdAcrossSamePartitionedRegion()
throws Exception {
- addExpectedException("another cache has the same region defined");
+ IgnoredException.addIgnoredException("another cache has the same region defined");
try {
Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
new Object[] {1});
@@ -170,7 +172,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("Cannot create Region"))) {
- fail(
+ Assert.fail(
"Expected IllegalStateException with incompatible gateway sender ids message",
e);
}
@@ -179,7 +181,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() {
- addExpectedException("another cache has the same region defined");
+ IgnoredException.addIgnoredException("another cache has the same region defined");
try {
Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
"createFirstLocatorWithDSId", new Object[] { 1 });
@@ -198,7 +200,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("Cannot create Region"))) {
- fail(
+ Assert.fail(
"Expected IllegalStateException with incompatible gateway sender ids message",
e);
}
@@ -211,7 +213,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
*/
public void testSameParallelGatewaySenderIdAcrossSamePartitionedRegion()
throws Exception {
- addExpectedException("another cache has the same region defined");
+ IgnoredException.addIgnoredException("another cache has the same region defined");
try {
Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
new Object[] {1});
@@ -241,7 +243,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("Cannot create Region"))) {
- fail(
+ Assert.fail(
"Expected IllegalStateException with incompatible gateway sender ids message",
e);
}
@@ -279,14 +281,14 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("cannot have the same parallel gateway sender id"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion()
throws Exception {
- addExpectedException("another cache has the same region defined");
+ IgnoredException.addIgnoredException("another cache has the same region defined");
try {
Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
"createFirstLocatorWithDSId", new Object[] { 1 });
@@ -311,7 +313,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("should have same parallel gateway sender ids"))) {
- fail(
+ Assert.fail(
"Expected IllegalStateException with incompatible gateway sender ids in colocated regions",
e);
}
@@ -346,7 +348,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
}
catch (Exception e) {
- fail("The tests caught Exception.", e);
+ Assert.fail("The tests caught Exception.", e);
}
}
@@ -377,7 +379,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
testName + "_PR2", null, "ln1_Parallel", testName + "_PR1", isOffHeap() });
} catch (Exception e) {
- fail("The tests caught Exception.", e);
+ Assert.fail("The tests caught Exception.", e);
}
}
@@ -414,7 +416,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("should have same parallel gateway sender ids"))) {
- fail(
+ Assert.fail(
"Expected IllegalStateException with incompatible gateway sender ids in colocated regions",
e);
}
@@ -440,7 +442,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("is already defined in this cache"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -467,7 +469,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("because another cache has the same Gateway Sender defined with remote ds id"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -493,7 +495,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("because another cache has the same sender as serial gateway sender"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -520,7 +522,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("because another cache has the same sender as parallel gateway sender"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -547,7 +549,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("another cache has the same Gateway Sender defined with isBatchConfaltionEnabled"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -571,7 +573,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with isPersistentEnabled"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -594,7 +596,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with alertThreshold"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -617,7 +619,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with manual start"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -646,7 +648,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("because another cache has the same Gateway Sender defined with GatewayEventFilters"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -676,7 +678,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("because another cache has the same Gateway Sender defined with GatewayEventFilters"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -707,7 +709,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("because another cache has the same Gateway Sender defined with GatewayTransportFilters"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -738,7 +740,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("because another cache has the same Gateway Sender defined with GatewayTransportFilters"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -790,7 +792,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("because another cache has the same Gateway Sender defined with isDiskSynchronous"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -865,7 +867,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with dispatcherThread"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -896,7 +898,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
catch (Exception e) {
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with orderPolicy"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
@@ -945,7 +947,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof GatewaySenderConfigurationException)
|| !(e.getCause().getMessage()
.contains("For region across all members, gateway sender ids should be same."))) {
- fail("Expected GatewaySenderConfigurationException", e);
+ Assert.fail("Expected GatewaySenderConfigurationException", e);
}
}
}
@@ -992,7 +994,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof GatewaySenderConfigurationException)
|| !(e.getCause().getMessage()
.contains("For region across all members, AsyncEvent queue IDs should be same."))) {
- fail("Expected GatewaySenderConfigurationException", e);
+ Assert.fail("Expected GatewaySenderConfigurationException", e);
}
}
}
@@ -1151,7 +1153,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof GatewaySenderConfigurationException)
|| !(e.getCause().getMessage()
.contains("For region across all members, gateway sender ids should be same."))) {
- fail("Expected GatewaySenderConfigurationException", e);
+ Assert.fail("Expected GatewaySenderConfigurationException", e);
}
}
}
@@ -1197,7 +1199,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof GatewaySenderConfigurationException)
|| !(e.getCause().getMessage()
.contains("For region across all members, AsyncEvent queue IDs should be same."))) {
- fail("Expected GatewaySenderConfigurationException", e);
+ Assert.fail("Expected GatewaySenderConfigurationException", e);
}
}
}
@@ -1357,7 +1359,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof GatewaySenderConfigurationException)
|| !(e.getCause().getMessage()
.contains("For region across all members, gateway sender ids should be same."))) {
- fail("Expected GatewaySenderConfigurationException", e);
+ Assert.fail("Expected GatewaySenderConfigurationException", e);
}
}
}
@@ -1403,7 +1405,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof GatewaySenderConfigurationException)
|| !(e.getCause().getMessage()
.contains("For region across all members, AsyncEvent queue IDs should be same."))) {
- fail("Expected GatewaySenderConfigurationException", e);
+ Assert.fail("Expected GatewaySenderConfigurationException", e);
}
}
}
@@ -1532,7 +1534,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
public void testBug50247_NonPersistentSenderWithPersistentRegion()
throws Exception {
- addExpectedException("could not get remote locator information");
+ IgnoredException.addIgnoredException("could not get remote locator information");
Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
"createFirstLocatorWithDSId", new Object[] { 1 });
@@ -1550,7 +1552,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof GatewaySenderException)
|| !(e.getCause().getMessage()
.contains("can not be attached to persistent region "))) {
- fail(
+ Assert.fail(
"Expected GatewaySenderException with incompatible gateway sender ids and region",
e);
}
@@ -1567,7 +1569,7 @@ public class WanValidationsDUnitTest extends WANTestBase {
if (!(e.getCause() instanceof GatewaySenderException)
|| !(e.getCause().getMessage()
.contains("can not be attached to persistent region "))) {
- fail(
+ Assert.fail(
"Expected GatewaySenderException with incompatible gateway sender ids and region",
e);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 68614a0..a982a48 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -23,7 +23,10 @@ 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.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.RMIException;
+import com.gemstone.gemfire.test.dunit.Wait;
/**
* DUnit test for operations on ParallelGatewaySender
@@ -40,7 +43,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
public void setUp() throws Exception {
super.setUp();
- addExpectedException("Broken pipe||Unexpected IOException");
+ IgnoredException.addIgnoredException("Broken pipe||Unexpected IOException");
}
public void testParallelGatewaySenderWithoutStarting() {
@@ -70,7 +73,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
createSendersReceiversAndPartitionedRegion(lnPort, nyPort, true, true);
- pause(2000);
+ Wait.pause(2000);
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
@@ -138,7 +141,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
//sleep for a second or two
- pause(2000);
+ Wait.pause(2000);
//resume the senders
vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
@@ -146,7 +149,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- pause(2000);
+ Wait.pause(2000);
validateParallelSenderQueueAllBucketsDrained();
@@ -222,7 +225,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
* @throws Exception
*/
public void testParallelPropagationSenderStop() throws Exception {
- addExpectedException("Broken pipe");
+ IgnoredException.addIgnoredException("Broken pipe");
Integer[] locatorPorts = createLNAndNYLocators();
Integer lnPort = locatorPorts[0];
Integer nyPort = locatorPorts[1];
@@ -250,7 +253,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
* @throws Exception
*/
public void testParallelPropagationSenderStartAfterStop() throws Exception {
- addExpectedException("Broken pipe");
+ IgnoredException.addIgnoredException("Broken pipe");
Integer[] locatorPorts = createLNAndNYLocators();
Integer lnPort = locatorPorts[0];
Integer nyPort = locatorPorts[1];
@@ -266,7 +269,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
//now, stop all of the senders
stopSenders();
- pause(2000);
+ Wait.pause(2000);
//SECOND RUN: do some of the puts after the senders are stopped
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
@@ -284,7 +287,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
async.join();
- pause(2000);
+ Wait.pause(2000);
//verify all the buckets on all the sender nodes are drained
validateParallelSenderQueueAllBucketsDrained();
@@ -305,7 +308,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
* @throws Exception
*/
public void testParallelPropagationSenderStartAfterStop_Scenario2() throws Exception {
- addExpectedException("Broken pipe");
+ IgnoredException.addIgnoredException("Broken pipe");
Integer[] locatorPorts = createLNAndNYLocators();
Integer lnPort = locatorPorts[0];
Integer nyPort = locatorPorts[1];
@@ -315,42 +318,42 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
//make sure all the senders are running before doing any puts
waitForSendersRunning();
- getLogWriter().info("All the senders are now started");
+ LogWriterSupport.getLogWriter().info("All the senders are now started");
//FIRST RUN: now, the senders are started. So, do some of the puts
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 });
- getLogWriter().info("Done few puts");
+ LogWriterSupport.getLogWriter().info("Done few puts");
//now, stop all of the senders
stopSenders();
- getLogWriter().info("All the senders are stopped");
- pause(2000);
+ LogWriterSupport.getLogWriter().info("All the senders are stopped");
+ Wait.pause(2000);
//SECOND RUN: do some of the puts after the senders are stopped
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
- getLogWriter().info("Done some more puts in second run");
+ LogWriterSupport.getLogWriter().info("Done some more puts in second run");
//Region size on remote site should remain same and below the number of puts done in the FIRST RUN
vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
//SECOND RUN: start async puts on region
AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 5000 });
- getLogWriter().info("Started high number of puts by async thread");
+ LogWriterSupport.getLogWriter().info("Started high number of puts by async thread");
- getLogWriter().info("Starting the senders at the same time");
+ LogWriterSupport.getLogWriter().info("Starting the senders at the same time");
//when puts are happening by another thread, start the senders
vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("All the senders are started");
+ LogWriterSupport.getLogWriter().info("All the senders are started");
async.join();
- pause(2000);
+ Wait.pause(2000);
//verify all the buckets on all the sender nodes are drained
validateParallelSenderQueueAllBucketsDrained();
@@ -364,9 +367,9 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
* @throws Exception
*/
public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws Exception {
- addExpectedException("Broken pipe");
- addExpectedException("Connection reset");
- addExpectedException("Unexpected IOException");
+ IgnoredException.addIgnoredException("Broken pipe");
+ IgnoredException.addIgnoredException("Connection reset");
+ IgnoredException.addIgnoredException("Unexpected IOException");
Integer[] locatorPorts = createLNAndNYLocators();
Integer lnPort = locatorPorts[0];
Integer nyPort = locatorPorts[1];
@@ -382,7 +385,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
//now, stop all of the senders
stopSenders();
- pause(2000);
+ Wait.pause(2000);
//SECOND RUN: do some of the puts after the senders are stopped
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
@@ -399,7 +402,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
//SECOND RUN: do some more puts
AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
async.join();
- pause(5000);
+ Wait.pause(5000);
//verify all buckets drained only on non-accessor nodes.
vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
@@ -421,7 +424,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
- getLogWriter().info("Done 1000 puts on local site");
+ LogWriterSupport.getLogWriter().info("Done 1000 puts on local site");
//Since puts are already done on userPR, it will have the buckets created.
//During sender start, it will wait until those buckets are created for shadowPR as well.
@@ -434,16 +437,16 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
waitForSendersRunning();
- getLogWriter().info("Started senders on local site");
+ LogWriterSupport.getLogWriter().info("Started senders on local site");
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 5000 });
- getLogWriter().info("Done 5000 puts on local site");
+ LogWriterSupport.getLogWriter().info("Done 5000 puts on local site");
vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- getLogWriter().info("Paused senders on local site");
+ LogWriterSupport.getLogWriter().info("Paused senders on local site");
vm4.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
@@ -452,13 +455,13 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
new Object[] { testName + "_PR", 1000 });
- getLogWriter().info("Started 1000 async puts on local site");
+ LogWriterSupport.getLogWriter().info("Started 1000 async puts on local site");
vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- getLogWriter().info("Resumed senders on local site");
+ LogWriterSupport.getLogWriter().info("Resumed senders on local site");
vm4.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
@@ -528,7 +531,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
1000 });
- pause(2000);
+ Wait.pause(2000);
//stop the sender and remove from region before calling destroy on it
stopSenders();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index cb64868..c3e9810 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -38,7 +38,10 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
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.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
/**
* DUnit for ParallelSenderQueue overflow operations.
@@ -101,7 +104,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
//give some time for the senders to pause
- pause(1000);
+ Wait.pause(1000);
vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, null, 1, 100, isOffHeap() });
@@ -121,8 +124,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
- getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
- getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
+ LogWriterSupport.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
+ LogWriterSupport.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7;
//considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk.
@@ -189,7 +192,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
//give some time for the senders to pause
- pause(1000);
+ Wait.pause(1000);
vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, null, 1, 100, isOffHeap() });
@@ -209,8 +212,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
- getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
- getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
+ LogWriterSupport.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
+ LogWriterSupport.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7;
//considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk.
@@ -278,7 +281,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
//give some time for the senders to pause
- pause(1000);
+ Wait.pause(1000);
vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, null, 1, 100, isOffHeap() });
@@ -298,8 +301,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
- getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
- getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
+ LogWriterSupport.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
+ LogWriterSupport.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7;
//considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk.
@@ -367,7 +370,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
//give some time for the senders to pause
- pause(1000);
+ Wait.pause(1000);
vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, null, 1, 100, isOffHeap() });
@@ -387,8 +390,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
- getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
- getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
+ LogWriterSupport.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
+ LogWriterSupport.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7;
//all 30 (considering redundant copies) events should accommodate in 40 MB space given to 4 senders
@@ -449,7 +452,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
fact.addGatewayTransportFilter(myStreamfilter1);
GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
fact.addGatewayTransportFilter(myStreamfilter2);
- final ExpectedException exTKSender = addExpectedException("Could not connect");
+ final IgnoredException exTKSender = IgnoredException.addIgnoredException("Could not connect");
try {
GatewaySender sender1 = fact.create("TKSender", 2);
@@ -505,7 +508,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
fact.addGatewayTransportFilter(myStreamfilter1);
GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
fact.addGatewayTransportFilter(myStreamfilter2);
- final ExpectedException ex = addExpectedException("Could not connect");
+ final IgnoredException ex = IgnoredException.addIgnoredException("Could not connect");
try {
GatewaySender sender1 = fact.create("TKSender", 2);
AttributesFactory factory = new AttributesFactory();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index bce63f5..65e6242 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.Random;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
* @author skumar
@@ -36,7 +37,7 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
public void setUp() throws Exception {
super.setUp();
- addExpectedException("java.net.ConnectException");
+ IgnoredException.addIgnoredException("java.net.ConnectException");
}
public void testParallelPropagationConflationDisabled() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index 2d200bf..430e4be 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -27,7 +27,8 @@ 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.DistributedTestCase.ExpectedException;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
WANTestBase {
@@ -41,7 +42,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
public void setUp() throws Exception {
super.setUp();
//The restart tests log this string
- addExpectedException("failed accepting client connection");
+ IgnoredException.addIgnoredException("failed accepting client connection");
}
public void testPartitionedRegionWithGatewaySenderPersistenceEnabled() throws IOException {
@@ -54,7 +55,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
GatewaySenderFactory fact = cache.createGatewaySenderFactory();
fact.setPersistenceEnabled(true);
fact.setParallel(true);
- final ExpectedException ex = addExpectedException("Could not connect");
+ final IgnoredException ex = IgnoredException.addIgnoredException("Could not connect");
try {
GatewaySender sender1 = fact.create("NYSender", 2);
@@ -144,14 +145,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- getLogWriter().info("Created remote receivers");
+ LogWriterSupport.getLogWriter().info("Created remote receivers");
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created local site cache");
+ LogWriterSupport.getLogWriter().info("Created local site cache");
vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
true, 100, 10, false, true, null, true });
@@ -162,7 +163,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
true, 100, 10, false, true, null, true });
- getLogWriter().info("Created local site senders");
+ LogWriterSupport.getLogWriter().info("Created local site senders");
vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, "ln", 1, 100, isOffHeap() });
@@ -173,15 +174,15 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, "ln", 1, 100, isOffHeap() });
- getLogWriter().info("Created local site persistent PR");
+ LogWriterSupport.getLogWriter().info("Created local site persistent PR");
vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Started sender on vm4");
+ LogWriterSupport.getLogWriter().info("Started sender on vm4");
vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Started the senders");
+ LogWriterSupport.getLogWriter().info("Started the senders");
vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, null, 1, 100, isOffHeap() });
@@ -233,7 +234,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
- getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+ LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
//create PR on remote site
vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
@@ -271,7 +272,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
//--------------------close and rebuild local site -------------------------------------------------
//kill the senders
@@ -280,7 +281,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders.");
//restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -288,7 +289,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
//create senders with disk store
vm4.invoke(WANTestBase.class, "createSenderWithDiskStore",
@@ -300,7 +301,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
- getLogWriter().info("Created the senders back from the disk store.");
+ LogWriterSupport.getLogWriter().info("Created the senders back from the disk store.");
//create PR on local site
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, "ln", 1, 100, isOffHeap() });
@@ -321,7 +322,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
fail();
}
- getLogWriter().info("Created back the partitioned regions");
+ LogWriterSupport.getLogWriter().info("Created back the partitioned regions");
//start the senders in async mode. This will ensure that the
//node of shadow PR that went down last will come up first
@@ -330,14 +331,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Waiting for senders running.");
+ LogWriterSupport.getLogWriter().info("Waiting for senders running.");
//wait for senders running
vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- getLogWriter().info("All the senders are now running...");
+ LogWriterSupport.getLogWriter().info("All the senders are now running...");
//----------------------------------------------------------------------------------------------------
@@ -382,7 +383,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
- getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+ LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
//create PR on remote site
vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -420,7 +421,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
//--------------------close and rebuild local site -------------------------------------------------
//kill the senders
@@ -429,7 +430,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders.");
//restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -437,7 +438,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
//create senders with disk store
vm4.invoke(WANTestBase.class, "createSenderWithDiskStore",
@@ -449,7 +450,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
- getLogWriter().info("Created the senders back from the disk store.");
+ LogWriterSupport.getLogWriter().info("Created the senders back from the disk store.");
//create PR on local site
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
testName, "ln", 1, 100, isOffHeap() });
@@ -470,7 +471,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
fail();
}
- getLogWriter().info("Created back the partitioned regions");
+ LogWriterSupport.getLogWriter().info("Created back the partitioned regions");
//start the senders in async mode. This will ensure that the
//node of shadow PR that went down last will come up first
@@ -479,14 +480,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Waiting for senders running.");
+ LogWriterSupport.getLogWriter().info("Waiting for senders running.");
//wait for senders running
vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- getLogWriter().info("All the senders are now running...");
+ LogWriterSupport.getLogWriter().info("All the senders are now running...");
//----------------------------------------------------------------------------------------------------
@@ -527,7 +528,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, null, false });
- getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+ LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
//create PR on local site
vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -559,7 +560,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 300 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
//--------------------close and rebuild local site -------------------------------------------------
//kill the senders
@@ -568,7 +569,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders.");
//restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -576,7 +577,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
//create senders with disk store
vm4.invoke(WANTestBase.class, "createSenderWithDiskStore",
@@ -588,7 +589,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
- getLogWriter().info("Created the senders back from the disk store.");
+ LogWriterSupport.getLogWriter().info("Created the senders back from the disk store.");
//create PR on local site
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -610,7 +611,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
fail();
}
- getLogWriter().info("Created back the partitioned regions");
+ LogWriterSupport.getLogWriter().info("Created back the partitioned regions");
vm4.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
@@ -624,7 +625,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Waiting for senders running.");
+ LogWriterSupport.getLogWriter().info("Waiting for senders running.");
//wait for senders running
vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
@@ -632,13 +633,13 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- getLogWriter().info("Creating the receiver.");
+ LogWriterSupport.getLogWriter().info("Creating the receiver.");
//create receiver on remote site
vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
//create PR on remote site
- getLogWriter().info("Creating the partitioned region at receiver. ");
+ LogWriterSupport.getLogWriter().info("Creating the partitioned region at receiver. ");
vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
testName, null, 1, 100, isOffHeap() });
vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -648,7 +649,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- getLogWriter().info("Doing some extra puts. ");
+ LogWriterSupport.getLogWriter().info("Doing some extra puts. ");
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPutsAfter300", new Object[] { testName, 1000 });
//----------------------------------------------------------------------------------------------------
@@ -657,7 +658,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- getLogWriter().info("Validating the region size at the receiver end. ");
+ LogWriterSupport.getLogWriter().info("Validating the region size at the receiver end. ");
vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
testName, 1000 });
vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
@@ -701,7 +702,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
- getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+ LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
//create PR on remote site
vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -739,7 +740,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
//--------------------close and rebuild local site -------------------------------------------------
//kill the senders
@@ -748,7 +749,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders.");
//restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -756,7 +757,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
//create senders with disk store
vm4.invoke(WANTestBase.class, "createSenderWithDiskStore",
@@ -768,7 +769,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
- getLogWriter().info("Created the senders back from the disk store.");
+ LogWriterSupport.getLogWriter().info("Created the senders back from the disk store.");
//create PR on local site
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -790,7 +791,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
fail();
}
- getLogWriter().info("Created back the partitioned regions");
+ LogWriterSupport.getLogWriter().info("Created back the partitioned regions");
//start the senders in async mode. This will ensure that the
//node of shadow PR that went down last will come up first
@@ -799,14 +800,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Waiting for senders running.");
+ LogWriterSupport.getLogWriter().info("Waiting for senders running.");
//wait for senders running
vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- getLogWriter().info("All the senders are now running...");
+ LogWriterSupport.getLogWriter().info("All the senders are now running...");
//----------------------------------------------------------------------------------------------------
@@ -859,7 +860,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
- getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+ LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
//create PR on remote site
vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -897,7 +898,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { testName, 1000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
//--------------------close and rebuild local site -------------------------------------------------
//kill the senders
@@ -906,7 +907,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders.");
//restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -914,7 +915,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
//create senders with disk store
vm4.invoke(WANTestBase.class, "createSenderWithDiskStore",
@@ -926,7 +927,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
- getLogWriter().info("Created the senders back from the disk store.");
+ LogWriterSupport.getLogWriter().info("Created the senders back from the disk store.");
//create PR on local site
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -948,7 +949,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
fail();
}
- getLogWriter().info("Created back the partitioned regions");
+ LogWriterSupport.getLogWriter().info("Created back the partitioned regions");
//start the senders in async mode. This will ensure that the
//node of shadow PR that went down last will come up first
@@ -957,14 +958,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Waiting for senders running.");
+ LogWriterSupport.getLogWriter().info("Waiting for senders running.");
//wait for senders running
vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- getLogWriter().info("All the senders are now running...");
+ LogWriterSupport.getLogWriter().info("All the senders are now running...");
//----------------------------------------------------------------------------------------------------
@@ -1009,7 +1010,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
- getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+ LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
//create PR on remote site
vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -1047,7 +1048,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { testName, 1000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
//--------------------close and rebuild local site -------------------------------------------------
//kill the senders
@@ -1056,7 +1057,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders.");
//restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -1064,7 +1065,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
//create senders with disk store
vm4.invoke(WANTestBase.class, "createSenderWithDiskStore",
@@ -1076,7 +1077,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
- getLogWriter().info("Created the senders back from the disk store.");
+ LogWriterSupport.getLogWriter().info("Created the senders back from the disk store.");
// create PR on local site
vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
@@ -1088,7 +1089,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
new Object[] { testName, "ln", 1, 100, isOffHeap() });
- getLogWriter().info("Created back the partitioned regions");
+ LogWriterSupport.getLogWriter().info("Created back the partitioned regions");
//start the senders in async mode. This will ensure that the
//node of shadow PR that went down last will come up first
@@ -1097,14 +1098,14 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Waiting for senders running.");
+ LogWriterSupport.getLogWriter().info("Waiting for senders running.");
//wait for senders running
vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- getLogWriter().info("All the senders are now running...");
+ LogWriterSupport.getLogWriter().info("All the senders are now running...");
//----------------------------------------------------------------------------------------------------
@@ -1124,7 +1125,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//do some extra puts in region on local site
vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { testName, 10000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
@@ -1157,7 +1158,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
// start puts in region on local site
vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] {
testName, 1000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
// --------------------close and rebuild local site
// -------------------------------------------------
@@ -1167,7 +1168,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders.");
// restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -1175,7 +1176,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
// // create PR on local site
// vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
@@ -1212,7 +1213,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
fail();
}
- getLogWriter().info("Created back the partitioned regions");
+ LogWriterSupport.getLogWriter().info("Created back the partitioned regions");
vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
testName, 1000 });
@@ -1261,7 +1262,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
- getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+ LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
//create PR on remote site
vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -1299,7 +1300,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
//--------------------close and rebuild local site -------------------------------------------------
//kill the senders
@@ -1308,7 +1309,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders.");
//restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -1316,7 +1317,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
//create senders from disk store
@@ -1329,7 +1330,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
- getLogWriter().info("Created the senders back from the disk store.");
+ LogWriterSupport.getLogWriter().info("Created the senders back from the disk store.");
//start the senders. NOTE that the senders are not associated with partitioned region
@@ -1338,16 +1339,16 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Started the senders.");
+ LogWriterSupport.getLogWriter().info("Started the senders.");
- getLogWriter().info("Waiting for senders running.");
+ LogWriterSupport.getLogWriter().info("Waiting for senders running.");
//wait for senders running
vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- getLogWriter().info("All the senders are now running...");
+ LogWriterSupport.getLogWriter().info("All the senders are now running...");
//----------------------------------------------------------------------------------------------------
@@ -1391,7 +1392,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
- getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+ LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
//create PR on remote site
vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
@@ -1429,7 +1430,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
//kill the senders
vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
@@ -1437,7 +1438,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders. The local site has been brought down.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders. The local site has been brought down.");
//restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -1445,7 +1446,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
//create senders with disk store
vm4.invoke(WANTestBase.class, "createSenderWithDiskStore",
@@ -1457,7 +1458,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSenderWithDiskStore",
new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
- getLogWriter().info("Created the senders back from the disk store.");
+ LogWriterSupport.getLogWriter().info("Created the senders back from the disk store.");
//create PR on local site
vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
@@ -1469,7 +1470,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, "ln", 1, 100, isOffHeap() });
- getLogWriter().info("Created back the partitioned regions");
+ LogWriterSupport.getLogWriter().info("Created back the partitioned regions");
//start the senders
vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
@@ -1477,16 +1478,16 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Started the senders.");
+ LogWriterSupport.getLogWriter().info("Started the senders.");
- getLogWriter().info("Waiting for senders running.");
+ LogWriterSupport.getLogWriter().info("Waiting for senders running.");
//wait for senders running
vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- getLogWriter().info("All the senders are now running...");
+ LogWriterSupport.getLogWriter().info("All the senders are now running...");
vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
testName, 1000 });
@@ -1568,7 +1569,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
//----------------- Close and rebuild local site -------------------------------------
//kill the senders
@@ -1577,7 +1578,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
- getLogWriter().info("Killed all the senders.");
+ LogWriterSupport.getLogWriter().info("Killed all the senders.");
//restart the vm
vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -1585,7 +1586,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- getLogWriter().info("Created back the cache");
+ LogWriterSupport.getLogWriter().info("Created back the cache");
//create back the senders
vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
@@ -1597,7 +1598,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
true, 100, 10, false, false, null, true });
- getLogWriter().info("Created the senders again");
+ LogWriterSupport.getLogWriter().info("Created the senders again");
vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
@@ -1610,9 +1611,9 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- getLogWriter().info("Started the senders.");
+ LogWriterSupport.getLogWriter().info("Started the senders.");
- getLogWriter().info("Waiting for senders running.");
+ LogWriterSupport.getLogWriter().info("Waiting for senders running.");
//wait for senders running
vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
@@ -1620,7 +1621,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- getLogWriter().info("All the senders are now running...");
+ LogWriterSupport.getLogWriter().info("All the senders are now running...");
//create PR on local site
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
@@ -1642,13 +1643,13 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
fail();
}
- getLogWriter().info("Created back the partitioned regions");
+ LogWriterSupport.getLogWriter().info("Created back the partitioned regions");
//-------------------------------------------------------------------------------------------
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 3000 });
vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 3000 });
@@ -1710,7 +1711,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
//start puts in region on local site
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
- getLogWriter().info("Completed puts in the region");
+ LogWriterSupport.getLogWriter().info("Completed puts in the region");
vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
testName + "_PR", 1000 });
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
index 674de6a..a686761 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.Wait;
public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
@@ -79,7 +80,7 @@ public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- pause(5000);
+ Wait.pause(5000);
AsyncInvocation async1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 700 });
AsyncInvocation async2 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
@@ -203,13 +204,13 @@ public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
vm6.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
vm7.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
- pause(2000);
+ Wait.pause(2000);
vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
- pause(2000);
+ Wait.pause(2000);
vm6.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
4 });