Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46B6618629 for ; Tue, 2 Feb 2016 20:21:29 +0000 (UTC) Received: (qmail 69769 invoked by uid 500); 2 Feb 2016 20:21:16 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 69737 invoked by uid 500); 2 Feb 2016 20:21:16 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 69728 invoked by uid 99); 2 Feb 2016 20:21:16 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Feb 2016 20:21:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 3E9E6C181B for ; Tue, 2 Feb 2016 20:21:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.649 X-Spam-Level: X-Spam-Status: No, score=-3.649 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.429] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 4k0L6EtR8hWx for ; Tue, 2 Feb 2016 20:21:10 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 5FF8D429E2 for ; Tue, 2 Feb 2016 20:21:09 +0000 (UTC) Received: (qmail 68861 invoked by uid 99); 2 Feb 2016 20:21:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Feb 2016 20:21:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9C317DFDC7; Tue, 2 Feb 2016 20:21:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Tue, 02 Feb 2016 20:21:09 -0000 Message-Id: <2112ee1cad86406295abcfdfa30c9ef7@git.apache.org> In-Reply-To: <8084d27559034992a68abed5afa94685@git.apache.org> References: <8084d27559034992a68abed5afa94685@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/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/parallel/ParallelWANPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java index 5b93bc2..2dcfe25 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java @@ -31,6 +31,9 @@ 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.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.Wait; public class ParallelWANPropagationDUnitTest extends WANTestBase { private static final long serialVersionUID = 1L; @@ -418,7 +421,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { Integer regionSize = (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {testName + "_PR" }); - getLogWriter().info("Region size on remote is: " + regionSize); + LogWriterSupport.getLogWriter().info("Region size on remote is: " + regionSize); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -459,9 +462,9 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); //------------------------------------------------------------------------------------ - addExpectedException(EntryExistsException.class.getName()); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(EntryExistsException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); @@ -836,9 +839,9 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { } public void testPartitionedParallelPropagationHA() throws Exception { - addExpectedException("Broken pipe"); - addExpectedException("Connection reset"); - addExpectedException("Unexpected IOException"); + IgnoredException.addIgnoredException("Broken pipe"); + IgnoredException.addIgnoredException("Connection reset"); + IgnoredException.addIgnoredException("Unexpected IOException"); Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId", new Object[] { 1 }); Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, @@ -887,11 +890,11 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { AsyncInvocation inv1 = vm7.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 5000 }); - pause(500); + Wait.pause(500); AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender"); AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10000 }); - pause(1500); + Wait.pause(1500); AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender"); inv1.join(); inv2.join(); @@ -1098,7 +1101,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); - pause(2000); + Wait.pause(2000); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); vm4.invoke(WANTestBase.class, "doDestroys", new Object[] { testName + "_PR", 500 }); @@ -1115,7 +1118,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); //give some time for the queue to drain - pause(5000); + Wait.pause(5000); vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" }); @@ -1232,7 +1235,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { */ // vm4.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" }); // vm5.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" }); - pause(1000); + Wait.pause(1000); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10 }); @@ -1249,9 +1252,9 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { public void tParallelGatewaySenderQueueLocalSizeWithHA() { - addExpectedException("Broken pipe"); - addExpectedException("Connection reset"); - addExpectedException("Unexpected IOException"); + IgnoredException.addIgnoredException("Broken pipe"); + IgnoredException.addIgnoredException("Connection reset"); + IgnoredException.addIgnoredException("Unexpected IOException"); Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId", new Object[] { 1 }); Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, @@ -1289,7 +1292,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase { */ // vm4.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" }); // vm5.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" }); - pause(1000); + Wait.pause(1000); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10 }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java index 9708684..05d43dc 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; +import com.gemstone.gemfire.test.dunit.Wait; public class ParallelWANPropagationLoopBackDUnitTest extends WANTestBase { @@ -109,7 +110,7 @@ public class ParallelWANPropagationLoopBackDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny" }); //this is required since sender pause doesn't take effect immediately - pause(1000); + Wait.pause(1000); //Do 100 puts on site1 vm2.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", @@ -221,7 +222,7 @@ public class ParallelWANPropagationLoopBackDUnitTest extends WANTestBase { vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "tk" }); //need to have this pause since pauseSender doesn't take effect immediately - pause(1000); + Wait.pause(1000); //do puts on site1 vm3.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", @@ -355,7 +356,7 @@ public class ParallelWANPropagationLoopBackDUnitTest extends WANTestBase { vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "tk2" }); //this is required since sender pause doesn't take effect immediately - pause(1000); + Wait.pause(1000); //do puts on site1 vm3.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java index 529e378..54c6bc7 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java @@ -23,6 +23,8 @@ import java.util.Map; 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; public class ParallelWANStatsDUnitTest extends WANTestBase{ @@ -73,7 +75,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{ vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - pause(3000); + Wait.pause(3000); vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); @@ -85,7 +87,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{ vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { testName, null, 1, 100, isOffHeap() }); - pause(2000); + Wait.pause(2000); final Map keyValues = new HashMap(); final Map updateKeyValues = new HashMap(); @@ -278,7 +280,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{ vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); - pause(10000); + Wait.pause(10000); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_PR", 1000 }); vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { @@ -349,7 +351,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{ AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10000 }); - pause(2000); + Wait.pause(2000); AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender"); inv1.join(); inv2.join(); @@ -385,7 +387,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{ * @throws Exception */ public void testParallePropagationWithRemoteRegionDestroy() throws Exception { - addExpectedException("RegionDestroyedException"); + IgnoredException.addIgnoredException("RegionDestroyedException"); Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId", new Object[] { 1 }); Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, @@ -556,7 +558,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{ vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - pause(3000); + Wait.pause(3000); vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); @@ -566,7 +568,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{ vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { testName, null, 1, 100, isOffHeap() }); - pause(2000); + Wait.pause(2000); final Map keyValues = new HashMap(); final Map updateKeyValues = new HashMap(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java index fd0b753..d46d6f5 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java @@ -23,6 +23,7 @@ import com.gemstone.gemfire.cache.execute.*; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; +import com.gemstone.gemfire.test.dunit.Wait; //The tests here are to validate changes introduced because a distributed deadlock //was found that caused issues for a production customer. @@ -267,31 +268,31 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase //exercise region and gateway operations vm4.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100}); vm5.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100}); - pause(2000); //wait for events to propogate + Wait.pause(2000); //wait for events to propogate vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100}); vm5.invoke(WANTestBase.class, "doDestroys", new Object[]{testName + "_RR", 100}); - pause(2000);//wait for events to propogate + Wait.pause(2000);//wait for events to propogate vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0}); vm4.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100}); vm5.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100}); - pause(2000); //wait for events to propogate + Wait.pause(2000); //wait for events to propogate vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100}); vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doInvalidates", new Object[]{testName + "_RR", 100, 100}); vm4.invoke(WANTestBase.class, "doPutAll", new Object[]{testName + "_RR", 100, 10}); vm5.invoke(WANTestBase.class, "doPutAll", new Object[]{testName + "_RR", 100, 10}); - pause(2000);//wait for events to propogate + Wait.pause(2000);//wait for events to propogate vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 1000}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 1000}); vm4.invoke(WANTestBase.class, "doDestroys", new Object[]{testName + "_RR", 1000}); - pause(2000);//wait for events to propogate + Wait.pause(2000);//wait for events to propogate vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0}); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0}); vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[]{testName + "_RR", 100}); - pause(2000); + Wait.pause(2000); vm5.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{testName + "_RR", 100}); vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{testName + "_RR", 100}); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java index 82bbce0..09c1646 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java @@ -28,7 +28,8 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener; import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener2; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; +import com.gemstone.gemfire.test.dunit.Wait; +import com.gemstone.gemfire.test.dunit.WaitCriterion; /** * @author skumar @@ -336,7 +337,7 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase { return "Waiting for all sites to get updated, the sizes are " + listenerMap.size() + " and " + map.size(); } }; - DistributedTestCase.waitForCriterion(wc, 60000, 500, true); + Wait.waitForCriterion(wc, 60000, 500, true); } } @@ -383,7 +384,7 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase { + listenerMap2.size() + " expected map size " + map.size(); } }; - DistributedTestCase.waitForCriterion(wc, 60000, 500, true); + Wait.waitForCriterion(wc, 60000, 500, true); } } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java index fe113a2..19f608b 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java @@ -34,6 +34,8 @@ 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.IgnoredException; +import com.gemstone.gemfire.test.dunit.LogWriterSupport; import com.gemstone.gemfire.test.dunit.RMIException; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -52,15 +54,15 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { public void setUp() throws Exception { super.setUp(); - addExpectedException("Broken pipe"); - addExpectedException("Connection reset"); - addExpectedException("Unexpected IOException"); - addExpectedException("Connection refused"); - addExpectedException("could not get remote locator information"); + IgnoredException.addIgnoredException("Broken pipe"); + IgnoredException.addIgnoredException("Connection reset"); + IgnoredException.addIgnoredException("Unexpected IOException"); + IgnoredException.addIgnoredException("Connection refused"); + IgnoredException.addIgnoredException("could not get remote locator information"); //Stopping the gateway closed the region, //which causes this exception to get logged - addExpectedException(RegionDestroyedException.class.getSimpleName()); + IgnoredException.addIgnoredException(RegionDestroyedException.class.getSimpleName()); } public void testSerialGatewaySenderOperationsWithoutStarting() { @@ -173,7 +175,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { fail("Interrupted the async invocation."); } - getLogWriter().info("Completed puts in the region"); + LogWriterSupport.getLogWriter().info("Completed puts in the region"); validateQueueContents(vm4, "ln", 0); validateQueueContents(vm5, "ln", 0); @@ -313,7 +315,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { vm4.invoke(() -> WANTestBase.startSender( "ln" )); asyncPuts.getResult(); - getLogWriter().info("Completed puts in the region"); + LogWriterSupport.getLogWriter().info("Completed puts in the region"); vm2.invoke(() -> WANTestBase.validateRegionSize( testName + "_RR", 300 )); @@ -352,7 +354,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR", 100 )); - getLogWriter().info("Completed puts in the region"); + LogWriterSupport.getLogWriter().info("Completed puts in the region"); vm2.invoke(() -> WANTestBase.validateRegionSize( testName + "_RR", 100 )); @@ -387,7 +389,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { vm5.invoke(() -> WANTestBase.doPuts( testName + "_RR", 100 )); - getLogWriter().info("Completed puts in the region"); + LogWriterSupport.getLogWriter().info("Completed puts in the region"); vm2.invoke(() -> WANTestBase.validateRegionSize( testName + "_RR", 100 )); } @@ -430,7 +432,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { vm2.invoke(() -> WANTestBase.createReceiver( nyPort )); vm2.invoke(() -> WANTestBase.createReplicatedRegion( testName + "_RR", null, isOffHeap() )); - getLogWriter().info("Completed puts in the region"); + LogWriterSupport.getLogWriter().info("Completed puts in the region"); vm2.invoke(() -> WANTestBase.validateRegionSize( testName + "_RR", 100 )); vm5.invoke(() -> WANTestBase.stopSender( "ln" )); @@ -580,7 +582,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase { public void run() { InternalLocator inl = (InternalLocator)Locator.getLocator(); ServerLocator servel = inl.getServerLocatorAdvisee(); - getLogWriter().info("Server load map is " + servel.getLoadMap()); + LogWriterSupport.getLogWriter().info("Server load map is " + servel.getLoadMap()); assertTrue("expected an empty map but found " + servel.getLoadMap(), servel.getLoadMap().isEmpty()); QueueConnectionRequest request = new QueueConnectionRequest( http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java index eec1341..38e3178 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java @@ -41,7 +41,9 @@ 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.VM; +import com.gemstone.gemfire.test.dunit.Wait; public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ @@ -107,15 +109,15 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ vm6.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 1000 }); - pause(5000); + Wait.pause(5000); HashMap primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue"); HashMap secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue"); assertEquals(primarySenderUpdates, secondarySenderUpdates); vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"}); - pause(2000); + Wait.pause(2000); vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"}); - pause(2000); + Wait.pause(2000); // We should wait till primarySenderUpdates and secondarySenderUpdates become same // If in 300000ms they don't then throw error. primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue"); @@ -126,7 +128,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ // assertEquals(primarySenderUpdates, secondarySenderUpdates); vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"}); - pause(5000); + Wait.pause(5000); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 1000 }); primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue"); @@ -139,7 +141,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ } assertEquals(primarySenderUpdates.get("Destroy"), receiverUpdates.get("Create")); - pause(5000); + Wait.pause(5000); // We expect that after this much time secondary would have got batchremoval message // removing all the keys. secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue"); @@ -192,22 +194,22 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ vm6.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 }); - pause(5000); + Wait.pause(5000); HashMap primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue"); HashMap secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue"); vm5.invoke(WANTestBase.class, "checkQueueOnSecondary", new Object[] { primarySenderUpdates }); vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"}); - pause(4000); + Wait.pause(4000); vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"}); - pause(15000); + Wait.pause(15000); primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue"); secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue"); assertEquals(primarySenderUpdates, secondarySenderUpdates); vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"}); - pause(5000); + Wait.pause(5000); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_PR", 1000 }); } @@ -254,7 +256,7 @@ public class SerialGatewaySenderQueueDUnitTest 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); @@ -310,7 +312,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ fact.addGatewayTransportFilter(myStreamfilter1); GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2(); fact.addGatewayTransportFilter(myStreamfilter2); - final ExpectedException exp = addExpectedException("Could not connect"); + final IgnoredException exp = IgnoredException.addIgnoredException("Could not connect"); try { GatewaySender sender1 = fact.create("TKSender", 2); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java index ede5e09..605696c 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java @@ -19,6 +19,8 @@ package com.gemstone.gemfire.internal.cache.wan.serial; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; +import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.Wait; /** * @author skumar @@ -215,8 +217,8 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, null, true }); - getLogWriter().info("The first ds is " + firstDStore); - getLogWriter().info("The first ds is " + secondDStore); + LogWriterSupport.getLogWriter().info("The first ds is " + firstDStore); + LogWriterSupport.getLogWriter().info("The first ds is " + secondDStore); vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR", null, isOffHeap() }); @@ -241,7 +243,7 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 1000 }); - getLogWriter().info("Completed puts in the region"); + LogWriterSupport.getLogWriter().info("Completed puts in the region"); // verify if the queue has all the events // vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000 @@ -260,31 +262,31 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - getLogWriter().info("Killed all the sender. "); + LogWriterSupport.getLogWriter().info("Killed all the sender. "); // restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, firstDStore, true }); - getLogWriter().info("Creted the sender.... in vm4 "); + LogWriterSupport.getLogWriter().info("Creted the sender.... in vm4 "); vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, secondDStore, true }); - getLogWriter().info("Creted the sender.... in vm5 "); + LogWriterSupport.getLogWriter().info("Creted the sender.... in vm5 "); AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started the sender in vm 4"); + LogWriterSupport.getLogWriter().info("Started the sender in vm 4"); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started the sender in vm 5"); + LogWriterSupport.getLogWriter().info("Started the sender in vm 5"); try { inv1.join(); } catch (InterruptedException e) { fail("Got interrupted exception while waiting for startSender to finish."); } - pause(5000); + Wait.pause(5000); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 1000 }); @@ -320,8 +322,8 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, null, true }); - getLogWriter().info("The first ds is " + firstDStore); - getLogWriter().info("The first ds is " + secondDStore); + LogWriterSupport.getLogWriter().info("The first ds is " + firstDStore); + LogWriterSupport.getLogWriter().info("The first ds is " + secondDStore); vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR", null, isOffHeap() }); @@ -346,13 +348,13 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 1000 }); - getLogWriter().info("Completed puts in the region"); + LogWriterSupport.getLogWriter().info("Completed puts in the region"); // kill the vm vm4.invoke(WANTestBase.class, "killSender", new Object[] {}); vm5.invoke(WANTestBase.class, "killSender", new Object[] {}); - getLogWriter().info("Killed the sender. "); + LogWriterSupport.getLogWriter().info("Killed the sender. "); // restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -360,11 +362,11 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, firstDStore, true }); - getLogWriter().info("Created the sender.... in vm4 "); + LogWriterSupport.getLogWriter().info("Created the sender.... in vm4 "); vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, secondDStore, true }); - getLogWriter().info("Created the sender.... in vm5 "); + LogWriterSupport.getLogWriter().info("Created the sender.... in vm5 "); vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] { testName + "_RR", "ln", isOffHeap() }); @@ -374,17 +376,17 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started the sender in vm 4"); + LogWriterSupport.getLogWriter().info("Started the sender in vm 4"); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started the sender in vm 5"); + LogWriterSupport.getLogWriter().info("Started the sender in vm 5"); try { inv1.join(); } catch (InterruptedException e) { fail("Got interrupted exception while waiting for startSedner to finish."); } - pause(5000); + Wait.pause(5000); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 1000 }); @@ -443,7 +445,7 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 1000 }); - getLogWriter().info("Completed puts in the region"); + LogWriterSupport.getLogWriter().info("Completed puts in the region"); // verify if the queue has all the events // vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000 @@ -460,22 +462,22 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "killSender", new Object[] {}); vm5.invoke(WANTestBase.class, "killSender", new Object[] {}); - getLogWriter().info("Killed the sender. "); + LogWriterSupport.getLogWriter().info("Killed the sender. "); // restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, false, 100, 10, false, false, null, true}); - getLogWriter().info("Creted the sender.... in vm4 "); + LogWriterSupport.getLogWriter().info("Creted the sender.... in vm4 "); vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, false, 100, 10, false, false, null, true}); - getLogWriter().info("Creted the sender.... in vm5 "); + LogWriterSupport.getLogWriter().info("Creted the sender.... in vm5 "); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started the sender in vm 4"); + LogWriterSupport.getLogWriter().info("Started the sender in vm 4"); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started the sender in vm 5"); + LogWriterSupport.getLogWriter().info("Started the sender in vm 5"); AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] { testName + "_RR", "ln", isOffHeap() }); @@ -488,7 +490,7 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends fail("Got interrupted exception while waiting for startSedner to finish."); } - pause(5000); + Wait.pause(5000); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 1000 }); @@ -527,8 +529,8 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, null, true }); - getLogWriter().info("The first ds is " + firstDStore); - getLogWriter().info("The first ds is " + secondDStore); + LogWriterSupport.getLogWriter().info("The first ds is " + firstDStore); + LogWriterSupport.getLogWriter().info("The first ds is " + secondDStore); vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR", null, isOffHeap() }); @@ -553,13 +555,13 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 1000 }); - getLogWriter().info("Completed puts in the region"); + LogWriterSupport.getLogWriter().info("Completed puts in the region"); // kill the vm vm4.invoke(WANTestBase.class, "killSender", new Object[] {}); vm5.invoke(WANTestBase.class, "killSender", new Object[] {}); - getLogWriter().info("Killed the sender. "); + LogWriterSupport.getLogWriter().info("Killed the sender. "); // restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -567,11 +569,11 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, firstDStore, true }); - getLogWriter().info("Created the sender.... in vm4 "); + LogWriterSupport.getLogWriter().info("Created the sender.... in vm4 "); vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, false, 100, 10, false, true, null, secondDStore, true }); - getLogWriter().info("Created the sender.... in vm5 "); + LogWriterSupport.getLogWriter().info("Created the sender.... in vm5 "); vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] { testName + "_RR", "ln", isOffHeap() }); @@ -581,17 +583,17 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started the sender in vm 4"); + LogWriterSupport.getLogWriter().info("Started the sender in vm 4"); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started the sender in vm 5"); + LogWriterSupport.getLogWriter().info("Started the sender in vm 5"); try { inv1.join(); } catch (InterruptedException e) { fail("Got interrupted exception while waiting for startSedner to finish."); } - pause(5000); + Wait.pause(5000); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 1000 }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java index af13221..cebcbda 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Map; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; +import com.gemstone.gemfire.test.dunit.Wait; public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase { @@ -105,7 +106,7 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase { testName + "_RR", 2 }); - pause(5000); + Wait.pause(5000); vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 }); vm6.invoke(WANTestBase.class, "verifyQueueSize", @@ -209,7 +210,7 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase { testName + "_RR", 3 }); - pause(5000); + Wait.pause(5000); vm6.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 }); vm7.invoke(WANTestBase.class, "verifyQueueSize", @@ -332,7 +333,7 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase { vm5.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR", keyValues }); - pause(2000); + Wait.pause(2000); vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 3 }); vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] { @@ -340,7 +341,7 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 3 }); - pause(5000); + Wait.pause(5000); vm6.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln1", 0 }); vm7.invoke(WANTestBase.class, "verifyQueueSize", @@ -475,7 +476,7 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase { vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 1 }); - pause(5000); + Wait.pause(5000); vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln1", 0 }); vm4.invoke(WANTestBase.class, "verifyQueueSize", http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java index c33d7aa..f596990 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java @@ -26,6 +26,9 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.internal.cache.wan.BatchException70; 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.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.Wait; public class SerialWANPropogationDUnitTest extends WANTestBase { @@ -37,11 +40,11 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { public void setUp() throws Exception { super.setUp(); - addExpectedException("Connection reset"); - addExpectedException("Broken pipe"); - addExpectedException("Connection refused"); - addExpectedException("could not get remote locator information"); - addExpectedException("Unexpected IOException"); + IgnoredException.addIgnoredException("Connection reset"); + IgnoredException.addIgnoredException("Broken pipe"); + IgnoredException.addIgnoredException("Connection refused"); + IgnoredException.addIgnoredException("could not get remote locator information"); + IgnoredException.addIgnoredException("Unexpected IOException"); } // this test is disabled due to a high rate of failure in unit test runs @@ -132,8 +135,8 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR", "ln", isOffHeap() }); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false }); @@ -201,9 +204,9 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR", "ln", isOffHeap() }); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); - addExpectedException(IOException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(IOException.class.getName()); vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false }); vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { @@ -213,7 +216,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { 10000 }); // pause for some time before starting up the remote site - pause(10000); + Wait.pause(10000); vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort }); vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort }); @@ -330,7 +333,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { Integer regionSize = (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {testName + "_RR" }); - getLogWriter().info("Region size on remote is: " + regionSize); + LogWriterSupport.getLogWriter().info("Region size on remote is: " + regionSize); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -360,9 +363,9 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - addExpectedException(EntryExistsException.class.getName()); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(EntryExistsException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 1000 }); @@ -511,8 +514,8 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR_1", "ln", isOffHeap() }); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); //start puts in RR_1 in another thread AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 }); @@ -604,8 +607,8 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_2"}); //expected exceptions in the logs - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); //start puts in RR_2 in another thread vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_2", 1000 }); @@ -693,8 +696,8 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR_2", "ln", isOffHeap() }); - addExpectedException(BatchException70.class.getName()); - addExpectedException(ServerOperationException.class.getName()); + IgnoredException.addIgnoredException(BatchException70.class.getName()); + IgnoredException.addIgnoredException(ServerOperationException.class.getName()); // start puts in RR_1 in another thread AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", @@ -847,7 +850,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { new Object[] { testName + "_RR_1", 8000 }); // close cache in remote site. This will automatically kill the remote // receivers. - pause(2000); + Wait.pause(2000); vm2.invoke(WANTestBase.class, "closeCache"); // vm3.invoke(WANTestBase.class, "closeCache"); @@ -922,7 +925,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { new Object[] { testName + "_RR_1", 8000 }); // close cache in remote site. This will automatically kill the remote // receivers. - pause(2000); + Wait.pause(2000); vm2.invoke(WANTestBase.class, "closeCache"); // vm3.invoke(WANTestBase.class, "closeCache"); @@ -993,7 +996,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { new Object[] { testName + "_RR_1", 8000 }); // close cache in remote site. This will automatically kill the remote // receivers. - pause(2000); + Wait.pause(2000); vm1.invoke(WANTestBase.class, "shutdownLocator"); vm2.invoke(WANTestBase.class, "closeCache"); // vm3.invoke(WANTestBase.class, "closeCache"); @@ -1073,7 +1076,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { new Object[] { testName + "_RR_1", 8000 }); // close cache in remote site. This will automatically kill the remote // receivers. - pause(2000); + Wait.pause(2000); vm1.invoke(WANTestBase.class, "shutdownLocator"); vm2.invoke(WANTestBase.class, "closeCache"); // vm3.invoke(WANTestBase.class, "closeCache"); @@ -1271,7 +1274,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 10000 }); - pause(2000); + Wait.pause(2000); AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender"); inv1.join(); @@ -1307,7 +1310,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - getLogWriter().info("Started receivers on remote site"); + LogWriterSupport.getLogWriter().info("Started receivers on remote site"); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1329,7 +1332,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started senders on local site"); + LogWriterSupport.getLogWriter().info("Started senders on local site"); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR", "ln", isOffHeap() }); @@ -1338,31 +1341,31 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 10000 }); - getLogWriter().info("Started async puts on local site"); - pause(1000); + LogWriterSupport.getLogWriter().info("Started async puts on local site"); + Wait.pause(1000); Map oldConnectionInfo = (Map)vm4.invoke(WANTestBase.class, "getSenderToReceiverConnectionInfo", new Object[] { "ln" }); assertNotNull(oldConnectionInfo); String oldServerHost = (String)oldConnectionInfo.get("serverHost"); int oldServerPort = (Integer)oldConnectionInfo.get("serverPort"); - getLogWriter().info("Got sender to receiver connection information"); + LogWriterSupport.getLogWriter().info("Got sender to receiver connection information"); AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender"); inv2.join(); - getLogWriter().info("Killed primary sender on local site"); - pause(5000);// give some time for vm5 to take primary charge + LogWriterSupport.getLogWriter().info("Killed primary sender on local site"); + Wait.pause(5000);// give some time for vm5 to take primary charge Map newConnectionInfo = (Map)vm5.invoke(WANTestBase.class, "getSenderToReceiverConnectionInfo", new Object[] { "ln" }); assertNotNull(newConnectionInfo); String newServerHost = (String)newConnectionInfo.get("serverHost"); int newServerPort = (Integer)newConnectionInfo.get("serverPort"); - getLogWriter().info("Got new sender to receiver connection information"); + LogWriterSupport.getLogWriter().info("Got new sender to receiver connection information"); assertEquals(oldServerHost, newServerHost); assertEquals(oldServerPort, newServerPort); - getLogWriter() + LogWriterSupport.getLogWriter() .info( "Matched the new connection info with old connection info. Receiver affinity verified."); @@ -1397,7 +1400,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - getLogWriter().info("Started receivers on remote site"); + LogWriterSupport.getLogWriter().info("Started receivers on remote site"); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -1419,7 +1422,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - getLogWriter().info("Started senders on local site"); + LogWriterSupport.getLogWriter().info("Started senders on local site"); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR", "ln", isOffHeap() }); @@ -1428,44 +1431,44 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 10000 }); - getLogWriter().info("Started async puts on local site"); - pause(1000); + LogWriterSupport.getLogWriter().info("Started async puts on local site"); + Wait.pause(1000); Map oldConnectionInfo = (Map)vm4.invoke(WANTestBase.class, "getSenderToReceiverConnectionInfo", new Object[] { "ln" }); assertNotNull(oldConnectionInfo); String oldServerHost = (String)oldConnectionInfo.get("serverHost"); int oldServerPort = (Integer)oldConnectionInfo.get("serverPort"); - getLogWriter().info("Got sender to receiver connection information"); + LogWriterSupport.getLogWriter().info("Got sender to receiver connection information"); // ---------------------------- KILL vm4 // -------------------------------------- AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender"); inv2.join(); - getLogWriter().info("Killed vm4 (primary sender) on local site"); + LogWriterSupport.getLogWriter().info("Killed vm4 (primary sender) on local site"); // ----------------------------------------------------------------------------- vm5.invoke(WANTestBase.class, "waitForSenderToBecomePrimary", new Object[] { "ln" }); - getLogWriter().info("vm5 sender has now acquired primary status"); - pause(5000);// give time to process unprocessedEventsMap + LogWriterSupport.getLogWriter().info("vm5 sender has now acquired primary status"); + Wait.pause(5000);// give time to process unprocessedEventsMap // ---------------------------REBUILD vm4 // -------------------------------------- - getLogWriter().info("Rebuilding vm4...."); + LogWriterSupport.getLogWriter().info("Rebuilding vm4...."); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, false, 100, 10, false, false, null, true }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { testName + "_RR", "ln", isOffHeap() }); - getLogWriter().info("Rebuilt vm4"); + LogWriterSupport.getLogWriter().info("Rebuilt vm4"); // ----------------------------------------------------------------------------- // --------------------------- KILL vm5 // ---------------------------------------- inv1.join();// once the puts are done, kill vm5 - getLogWriter().info("puts in vm5 are done"); + LogWriterSupport.getLogWriter().info("puts in vm5 are done"); inv2 = vm5.invokeAsync(WANTestBase.class, "killSender"); inv2.join(); @@ -1478,10 +1481,10 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { assertNotNull(newConnectionInfo); String newServerHost = (String)newConnectionInfo.get("serverHost"); int newServerPort = (Integer)newConnectionInfo.get("serverPort"); - getLogWriter().info("Got new sender to receiver connection information"); + LogWriterSupport.getLogWriter().info("Got new sender to receiver connection information"); assertEquals(oldServerHost, newServerHost); assertEquals(oldServerPort, newServerPort); - getLogWriter() + LogWriterSupport.getLogWriter() .info( "Matched the new connection info with old connection info. Receiver affinity verified."); @@ -1511,7 +1514,7 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { testName + "_RR", null, isOffHeap() }); vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); - pause(500); + Wait.pause(500); vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" }); vm4.invoke(WANTestBase.class, "createNormalRegion", new Object[] { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java index 9ae58cc..c6a4fd5 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java @@ -22,6 +22,7 @@ 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.IgnoredException; public class SerialWANPropogation_PartitionedRegionDUnitTest extends WANTestBase { @@ -334,9 +335,9 @@ public class SerialWANPropogation_PartitionedRegionDUnitTest extends WANTestBase } public void testPartitionedSerialPropagationHA() throws Exception { - addExpectedException("Broken pipe"); - addExpectedException("Connection reset"); - addExpectedException("Unexpected IOException"); + IgnoredException.addIgnoredException("Broken pipe"); + IgnoredException.addIgnoredException("Connection reset"); + IgnoredException.addIgnoredException("Unexpected IOException"); Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId", new Object[] { 1 }); @@ -376,9 +377,9 @@ public class SerialWANPropogation_PartitionedRegionDUnitTest extends WANTestBase //do initial 100 puts to create all the buckets vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 }); - addExpectedException(CancelException.class.getName()); - addExpectedException(CacheClosedException.class.getName()); - addExpectedException(ForceReattemptException.class.getName()); + IgnoredException.addIgnoredException(CancelException.class.getName()); + IgnoredException.addIgnoredException(CacheClosedException.class.getName()); + IgnoredException.addIgnoredException(ForceReattemptException.class.getName()); //start async puts AsyncInvocation inv = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[] { 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/serial/SerialWANStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java index a142f82..7cb60d9 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java @@ -23,6 +23,8 @@ import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; 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; public class SerialWANStatsDUnitTest extends WANTestBase { @@ -34,9 +36,9 @@ public class SerialWANStatsDUnitTest extends WANTestBase { public void setUp() throws Exception { super.setUp(); - addExpectedException("java.net.ConnectException"); - addExpectedException("java.net.SocketException"); - addExpectedException("Unexpected IOException"); + IgnoredException.addIgnoredException("java.net.ConnectException"); + IgnoredException.addIgnoredException("java.net.SocketException"); + IgnoredException.addIgnoredException("Unexpected IOException"); } public void testReplicatedSerialPropagation() throws Exception { @@ -78,7 +80,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 1000 }); - pause(2000); + Wait.pause(2000); vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 }); vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln", @@ -132,7 +134,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 1000 }); - pause(2000); + Wait.pause(2000); vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 }); vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln", @@ -201,7 +203,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR", 1000 }); - pause(2000); + Wait.pause(2000); vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 }); vm3.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 }); @@ -260,7 +262,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 10000 }); - pause(2000); + Wait.pause(2000); AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender", new Object[] { "ln" }); Boolean isKilled = Boolean.FALSE; try { @@ -355,7 +357,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR_2", 500 }); - pause(2000); + Wait.pause(2000); vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln", 0, 1500, 1500, 1500}); vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln", @@ -492,7 +494,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 800 }); - pause(2000); + Wait.pause(2000); vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln", 0, 1000, 900, 800}); vm4.invoke(WANTestBase.class, "checkEventFilteredStats", new Object[] {"ln", @@ -552,7 +554,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues }); - pause(5000); + Wait.pause(5000); vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() }); for(int i=0;i<500;i++) { updateKeyValues.put(i, i+"_updated"); @@ -560,7 +562,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues }); - pause(5000); + Wait.pause(5000); vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); @@ -569,7 +571,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues }); - pause(5000); + Wait.pause(5000); vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); @@ -586,7 +588,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] { testName, keyValues }); - pause(2000); + Wait.pause(2000); vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln", 0, 2000, 2000, 1500}); vm4.invoke(WANTestBase.class, "checkConflatedStats", new Object[] {"ln", http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java index 2a91108..655ad2a 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java @@ -44,6 +44,8 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; import com.gemstone.gemfire.management.ManagementService; import com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -178,7 +180,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ } public static void startSender(String senderId){ - final ExpectedException exln = addExpectedException("Could not connect"); + final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect"); try { Set senders = cache.getGatewaySenders(); GatewaySender sender = null; @@ -195,7 +197,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ } public static void pauseSender(String senderId){ - final ExpectedException exln = addExpectedException("Could not connect"); + final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect"); try { Set senders = cache.getGatewaySenders(); GatewaySender sender = null; @@ -331,7 +333,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ * Enable system property gemfire.disableManagement false in each VM. */ public void enableManagement() { - invokeInEveryVM(new SerializableRunnable("Enable Management") { + Invoke.invokeInEveryVM(new SerializableRunnable("Enable Management") { public void run() { System.setProperty(InternalDistributedSystem.DISABLE_MANAGEMENT_PROPERTY, "false"); } @@ -340,7 +342,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ } public static void verifySenderState(String senderId, boolean isRunning, boolean isPaused) { - final ExpectedException exln = addExpectedException("Could not connect"); + final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect"); try { Set senders = cache.getGatewaySenders(); AbstractGatewaySender sender = null; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java index 91a731a..9ebf4e4 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java @@ -31,6 +31,7 @@ import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; +import com.gemstone.gemfire.test.dunit.IgnoredException; public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { @@ -45,7 +46,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { } private CommandResult executeCommandWithIgnoredExceptions(String command) { - final ExpectedException exln = addExpectedException("Could not connect"); + final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect"); try { CommandResult commandResult = executeCommand(command); return commandResult; @@ -734,7 +735,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { + CliStrings.CREATE_GATEWAYSENDER__ALERTTHRESHOLD + "=100" + " --" + CliStrings.CREATE_GATEWAYSENDER__DISPATCHERTHREADS + "=2" + " --" + CliStrings.CREATE_GATEWAYSENDER__ORDERPOLICY + "=THREAD"; - ExpectedException exp = addExpectedException(GatewaySenderException.class + IgnoredException exp = IgnoredException.addIgnoredException(GatewaySenderException.class .getName()); try { CommandResult cmdResult = executeCommandWithIgnoredExceptions(command); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java index f38f5b9..927d63b 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java @@ -29,6 +29,7 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.Wait; public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ @@ -110,7 +111,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ vm5.invoke(WANCommandTestBase.class, "verifyReceiverState", new Object[] { false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.START_GATEWAYRECEIVER; CommandResult cmdResult = executeCommand(command); if (cmdResult != null) { @@ -168,7 +169,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ final DistributedMember vm1Member = (DistributedMember) vm3.invoke( WANCommandTestBase.class, "getMember"); - pause(10000); + Wait.pause(10000); String command = CliStrings.START_GATEWAYRECEIVER + " --" + CliStrings.START_GATEWAYRECEIVER__MEMBER+ "=" + vm1Member.getId(); @@ -223,7 +224,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ vm5.invoke(WANCommandTestBase.class, "verifyReceiverState", new Object[] { false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.START_GATEWAYRECEIVER + " --" + CliStrings.START_GATEWAYRECEIVER__GROUP + "=RG1"; CommandResult cmdResult = executeCommand(command); @@ -292,7 +293,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ vm7.invoke(WANCommandTestBase.class, "verifyReceiverState", new Object[] { false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.START_GATEWAYRECEIVER + " --" + CliStrings.START_GATEWAYRECEIVER__GROUP + "=RG1,RG2"; CommandResult cmdResult = executeCommand(command); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java index 439a74b..574c5d9 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java @@ -29,6 +29,7 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.Wait; public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { @@ -111,7 +112,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { vm5.invoke(WANCommandTestBase.class, "verifyReceiverState", new Object[] { true }); - pause(10000); + Wait.pause(10000); String command = CliStrings.STOP_GATEWAYRECEIVER; CommandResult cmdResult = executeCommand(command); if (cmdResult != null) { @@ -171,7 +172,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { final DistributedMember vm1Member = (DistributedMember) vm3.invoke( WANCommandTestBase.class, "getMember"); - pause(10000); + Wait.pause(10000); String command = CliStrings.STOP_GATEWAYRECEIVER + " --" + CliStrings.STOP_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId(); @@ -227,7 +228,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { vm5.invoke(WANCommandTestBase.class, "verifyReceiverState", new Object[] { true }); - pause(10000); + Wait.pause(10000); String command = CliStrings.STOP_GATEWAYRECEIVER + " --" + CliStrings.STOP_GATEWAYRECEIVER__GROUP + "=RG1"; CommandResult cmdResult = executeCommand(command); @@ -297,7 +298,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { vm7.invoke(WANCommandTestBase.class, "verifyReceiverState", new Object[] { true }); - pause(10000); + Wait.pause(10000); String command = CliStrings.STOP_GATEWAYRECEIVER + " --" + CliStrings.STOP_GATEWAYRECEIVER__GROUP + "=RG1,RG2"; CommandResult cmdResult = executeCommand(command); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java index 9d106d6..d4211e8 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java @@ -27,6 +27,8 @@ import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.Wait; public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { @@ -83,7 +85,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { } private CommandResult executeCommandWithIgnoredExceptions(String command) { - final ExpectedException exln = addExpectedException("Could not connect"); + final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect"); try { CommandResult commandResult = executeCommand(command); return commandResult; @@ -126,7 +128,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] { "ln", false, false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID + "=ln"; CommandResult cmdResult = executeCommandWithIgnoredExceptions(command); @@ -181,7 +183,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { final DistributedMember vm1Member = (DistributedMember) vm3.invoke( WANCommandTestBase.class, "getMember"); - pause(10000); + Wait.pause(10000); String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID + "=ln --" + CliStrings.START_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId(); @@ -238,7 +240,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] { "ln", false, false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID + "=ln --" + CliStrings.START_GATEWAYSENDER__GROUP + "=SenderGroup1"; @@ -318,7 +320,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] { "ln", false, false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID + "=ln --" + CliStrings.START_GATEWAYSENDER__GROUP + "=SenderGroup1,SenderGroup2"; @@ -385,7 +387,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] { "ln", false, false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID + "=ln --" + CliStrings.START_GATEWAYSENDER__GROUP + "=SenderGroup1"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java index 4ed98cc..20b7251 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java @@ -27,6 +27,8 @@ import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.Wait; public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { @@ -41,7 +43,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { } private CommandResult executeCommandWithIgnoredExceptions(String command) { - final ExpectedException exln = addExpectedException("Could not connect"); + final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect"); CommandResult commandResult = executeCommand(command); exln.remove(); return commandResult; @@ -124,7 +126,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] { "ln", true, false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.STOP_GATEWAYSENDER + " --" + CliStrings.STOP_GATEWAYSENDER__ID + "=ln"; CommandResult cmdResult = executeCommandWithIgnoredExceptions(command); @@ -182,7 +184,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { final DistributedMember vm1Member = (DistributedMember) vm3.invoke( WANCommandTestBase.class, "getMember"); - pause(10000); + Wait.pause(10000); String command = CliStrings.STOP_GATEWAYSENDER + " --" + CliStrings.STOP_GATEWAYSENDER__ID + "=ln --" + CliStrings.STOP_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId(); @@ -243,7 +245,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] { "ln", true, false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.STOP_GATEWAYSENDER + " --" + CliStrings.STOP_GATEWAYSENDER__ID + "=ln --" + CliStrings.STOP_GATEWAYSENDER__GROUP + "=SenderGroup1"; @@ -331,7 +333,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] { "ln", true, false }); - pause(10000); + Wait.pause(10000); String command = CliStrings.STOP_GATEWAYSENDER + " --" + CliStrings.STOP_GATEWAYSENDER__ID + "=ln --" + CliStrings.STOP_GATEWAYSENDER__GROUP + "=SenderGroup1,SenderGroup2";