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 07AFD19977 for ; Mon, 14 Mar 2016 23:30:21 +0000 (UTC) Received: (qmail 22315 invoked by uid 500); 14 Mar 2016 23:30:21 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 22276 invoked by uid 500); 14 Mar 2016 23:30:20 -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 22267 invoked by uid 99); 14 Mar 2016 23:30:20 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Mar 2016 23:30:20 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 49E8C1801A9 for ; Mon, 14 Mar 2016 23:30:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 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.329] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id plan2mNtnJoK for ; Mon, 14 Mar 2016 23:30:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id AEBDA5F2F2 for ; Mon, 14 Mar 2016 23:30:06 +0000 (UTC) Received: (qmail 22193 invoked by uid 99); 14 Mar 2016 23:30:05 -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; Mon, 14 Mar 2016 23:30:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A3245DFAFF; Mon, 14 Mar 2016 23:30:05 +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 Message-Id: <32e409af23104b5f83dc09f0fc12599c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: Use DistributedTestCase#getDistributedSystemProperties() Date: Mon, 14 Mar 2016 23:30:05 +0000 (UTC) Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-1050 e7e4cf8b0 -> 20a35d37e Use DistributedTestCase#getDistributedSystemProperties() Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/20a35d37 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/20a35d37 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/20a35d37 Branch: refs/heads/feature/GEODE-1050 Commit: 20a35d37e4dd79558c3422b5bd8bb85af3efffbb Parents: e7e4cf8 Author: Kirk Lund Authored: Mon Mar 14 16:29:28 2016 -0700 Committer: Kirk Lund Committed: Mon Mar 14 16:29:28 2016 -0700 ---------------------------------------------------------------------- .../sockets/DurableClientBug39997DUnitTest.java | 7 ++- .../internal/cache/UpdateVersionDUnitTest.java | 8 +-- .../gemfire/internal/cache/wan/WANTestBase.java | 63 ++++++++++---------- .../SenderWithTransportFilterDUnitTest.java | 2 +- .../wan/misc/WANLocatorServerDUnitTest.java | 6 +- ...llelGatewaySenderQueueOverflowDUnitTest.java | 4 +- .../SerialGatewaySenderQueueDUnitTest.java | 4 +- .../wan/wancommand/WANCommandTestBase.java | 16 ++--- ...anCommandCreateGatewayReceiverDUnitTest.java | 20 +++---- .../WanCommandCreateGatewaySenderDUnitTest.java | 20 +++---- ...WanCommandGatewayReceiverStartDUnitTest.java | 10 ++-- .../WanCommandGatewayReceiverStopDUnitTest.java | 10 ++-- .../WanCommandGatewaySenderStartDUnitTest.java | 12 ++-- .../WanCommandGatewaySenderStopDUnitTest.java | 10 ++-- .../wan/wancommand/WanCommandListDUnitTest.java | 10 ++-- .../WanCommandPauseResumeDUnitTest.java | 20 +++---- .../wancommand/WanCommandStatusDUnitTest.java | 12 ++-- 17 files changed, 121 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java index fb8fb3e..d9d1172 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java @@ -45,7 +45,11 @@ public class DurableClientBug39997DUnitTest extends CacheTestCase { public DurableClientBug39997DUnitTest(String name) { super(name); } - + + public void postTearDownCacheTestCase() throws Exception { + Host.getHost(0).getVM(0).invoke(() -> disconnectFromDS()); + } + public void testNoServerAvailableOnStartup() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); @@ -120,6 +124,7 @@ public class DurableClientBug39997DUnitTest extends CacheTestCase { public Properties getClientProperties() { Properties props = new Properties(); props.setProperty("mcast-port", "0"); + props.setProperty("locators", "7"); props.setProperty("durable-client-id", "my_id"); return props; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java index 9ccbd01..61c4c28 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java @@ -652,7 +652,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { private static void createCache(Integer locPort) { UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); @@ -792,7 +792,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) { UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); @@ -859,7 +859,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { public static int createReceiver(int locPort) { UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -952,7 +952,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { public static Integer createFirstLocatorWithDSId(int dsId) { UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java index 4dc290a..576facb 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java @@ -172,23 +172,27 @@ public class WANTestBase extends DistributedTestCase{ } @Override - public final void postSetUp() throws Exception { + public final void preSetUp() throws Exception { final Host host = Host.getHost(0); - vm0 = host.getVM(0); + vm0 = host.getVM(0); vm1 = host.getVM(1); vm2 = host.getVM(2); - vm3 = host.getVM(3); + vm3 = host.getVM(3); vm4 = host.getVM(4); vm5 = host.getVM(5); - vm6 = host.getVM(6); + vm6 = host.getVM(6); vm7 = host.getVM(7); //Need to set the test name after the VMs are created + } + @Override + public final void postSetUp() throws Exception { //this is done to vary the number of dispatchers for sender //during every test method run shuffleNumDispatcherThreads(); - Invoke.invokeInEveryVM(WANTestBase.class,"setNumDispatcherThreadsForTheRun", - new Object[]{dispatcherThreads.get(0)}); +// Invoke.invokeInEveryVM(WANTestBase.class,"setNumDispatcherThreadsForTheRun", +// new Object[]{dispatcherThreads.get(0)}); + Invoke.invokeInEveryVM(() -> setNumDispatcherThreadsForTheRun(dispatcherThreads.get(0))); // TODO: does this work? if so delete previous line IgnoredException.addIgnoredException("Connection refused"); IgnoredException.addIgnoredException("Software caused connection abort"); IgnoredException.addIgnoredException("Connection reset"); @@ -214,7 +218,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createLocator(int dsId, int port, Set localLocatorsList, Set remoteLocatorsList){ WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); StringBuffer localLocatorBuffer = new StringBuffer(localLocatorsList.toString()); @@ -238,7 +242,7 @@ public class WANTestBase extends DistributedTestCase{ stopOldLocator(); WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); @@ -251,7 +255,7 @@ public class WANTestBase extends DistributedTestCase{ stopOldLocator(); WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); @@ -264,7 +268,7 @@ public class WANTestBase extends DistributedTestCase{ stopOldLocator(); WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locatorPort + "]"); @@ -277,7 +281,7 @@ public class WANTestBase extends DistributedTestCase{ stopOldLocator(); WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locatorPort + "]"); @@ -290,7 +294,7 @@ public class WANTestBase extends DistributedTestCase{ stopOldLocator(); WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); @@ -302,7 +306,7 @@ public class WANTestBase extends DistributedTestCase{ public static void bringBackLocatorOnOldPort(int dsId, int remoteLocPort, int oldPort) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.put(DistributionConfig.LOG_LEVEL_NAME, "fine"); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); @@ -318,7 +322,7 @@ public class WANTestBase extends DistributedTestCase{ stopOldLocator(); WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); @@ -333,7 +337,7 @@ public class WANTestBase extends DistributedTestCase{ stopOldLocator(); WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localPort + "]"); @@ -348,7 +352,7 @@ public class WANTestBase extends DistributedTestCase{ stopOldLocator(); WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localPort + "]"); @@ -1338,7 +1342,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createCacheConserveSockets(Boolean conserveSockets,Integer locPort){ WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, conserveSockets.toString()); @@ -1348,7 +1352,7 @@ public class WANTestBase extends DistributedTestCase{ protected static void createCache(boolean management, Integer locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); if (management) { props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false"); @@ -1369,7 +1373,7 @@ public class WANTestBase extends DistributedTestCase{ String gatewaySslciphers = "any"; boolean gatewaySslRequireAuth = true; - Properties gemFireProps = new Properties(); + Properties gemFireProps = test.getDistributedSystemProperties(); gemFireProps.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewaySslenabled)); gemFireProps.put(DistributionConfig.GATEWAY_SSL_PROTOCOLS_NAME, gatewaySslprotocols); @@ -1395,7 +1399,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createCache_PDX(Integer locPort){ WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); InternalDistributedSystem ds = test.getSystem(props); @@ -1412,7 +1416,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createCache(Integer locPort1, Integer locPort2){ WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort1 + "],localhost[" + locPort2 + "]"); @@ -1422,7 +1426,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createCacheWithoutLocator(Integer mCastPort){ WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, ""+mCastPort); InternalDistributedSystem ds = test.getSystem(props); cache = CacheFactory.create(ds); @@ -2747,7 +2751,7 @@ public class WANTestBase extends DistributedTestCase{ public static int createReceiver(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -2773,7 +2777,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createReceiverWithBindAddress(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort @@ -2809,7 +2813,7 @@ public class WANTestBase extends DistributedTestCase{ String gatewaySslciphers = "any"; boolean gatewaySslRequireAuth = true; - Properties gemFireProps = new Properties(); + Properties gemFireProps = test.getDistributedSystemProperties(); gemFireProps.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewaySslenabled)); @@ -2879,7 +2883,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createReceiverAndServer(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -2931,7 +2935,7 @@ public class WANTestBase extends DistributedTestCase{ public static int createServer(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -2954,8 +2958,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createClientWithLocator(int port0,String host, String regionName) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); - props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty("mcast-port", "0"); props.setProperty("locators", ""); @@ -2989,7 +2992,7 @@ public class WANTestBase extends DistributedTestCase{ public static int createReceiver_PDX(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); InternalDistributedSystem ds = test.getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java index 10e82e6..1f4d72c 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java @@ -100,7 +100,7 @@ public class SenderWithTransportFilterDUnitTest extends WANTestBase { public static int createReceiverWithTransportFilters(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java index 1f47c05..bd0c118 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java @@ -94,7 +94,7 @@ public class WANLocatorServerDUnitTest extends WANTestBase { public static void createLocator(Integer port1, Integer port2, Integer port3, Integer startingPort) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "" + 1); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port1 @@ -107,7 +107,7 @@ public class WANLocatorServerDUnitTest extends WANTestBase { public static void createReceiver(Integer port1, Integer port2, Integer port3) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port1 + "],localhost[" + port2 + "],localhost[" + port3 + "]"); @@ -132,7 +132,7 @@ public class WANLocatorServerDUnitTest extends WANTestBase { public static void createServer(Integer port1, Integer port2, Integer port3) { WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port1 + "],localhost[" + port2 + "],localhost[" + port3 + "]"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java index 84d2cb8..a54d776 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java @@ -408,7 +408,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase { Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort )); WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]"); InternalDistributedSystem ds = test.getSystem(props); @@ -471,7 +471,7 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase { Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort )); WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]"); InternalDistributedSystem ds = test.getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java index 43c4b04..c4ceb21 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java @@ -217,7 +217,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ Integer remoteLocPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort )); WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]"); @@ -281,7 +281,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort )); WANTestBase test = new WANTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]"); InternalDistributedSystem ds = test.getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java index b3fc365..9bfce05 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java @@ -88,7 +88,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ public static Integer createFirstLocatorWithDSId(int dsId) { WANCommandTestBase test = new WANCommandTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); @@ -101,7 +101,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) { WANCommandTestBase test = new WANCommandTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); @@ -113,7 +113,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ public static void createCache(Integer locPort){ WANCommandTestBase test = new WANCommandTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); InternalDistributedSystem ds = test.getSystem(props); @@ -122,7 +122,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ public static void createCacheWithGroups(Integer locPort, String groups){ WANCommandTestBase test = new WANCommandTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); props.setProperty(DistributionConfig.GROUPS_NAME, groups); @@ -215,7 +215,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ public static int createAndStartReceiver(int locPort) { WANCommandTestBase test = new WANCommandTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -239,7 +239,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ public static int createReceiver(int locPort) { WANCommandTestBase test = new WANCommandTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -257,7 +257,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ public static int createReceiverWithGroup(int locPort, String groups) { WANCommandTestBase test = new WANCommandTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -297,7 +297,7 @@ public class WANCommandTestBase extends CliCommandTestBase{ public static int createAndStartReceiverWithGroup(int locPort, String groups) { WANCommandTestBase test = new WANCommandTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java index 5cf9df3..1122059 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java @@ -52,7 +52,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -114,7 +114,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -170,7 +170,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -230,7 +230,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -293,7 +293,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -341,7 +341,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -396,7 +396,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -454,7 +454,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -512,7 +512,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -567,7 +567,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends VM puneLocator = Host.getLocator(); int punePort = (Integer)puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java index c21ad23..2c99ad3 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java @@ -59,7 +59,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -107,7 +107,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -178,7 +178,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -234,7 +234,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -308,7 +308,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -380,7 +380,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -444,7 +444,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -508,7 +508,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -569,7 +569,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -637,7 +637,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java index ef22370..6f26e3b 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java @@ -48,7 +48,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); @@ -80,7 +80,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); @@ -125,7 +125,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); @@ -170,7 +170,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); @@ -220,7 +220,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{ VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java index e6b998d..82ca3ba 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java @@ -48,7 +48,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); @@ -81,7 +81,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); @@ -128,7 +128,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); @@ -174,7 +174,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); @@ -225,7 +225,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { VM puneLocator = Host.getLocator(); int punePort = (Integer) puneLocator.invoke(() -> WANCommandTestBase.getLocatorPort()); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); createDefaultSetup(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java index e476557..a10a926 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java @@ -46,7 +46,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -90,7 +90,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -150,7 +150,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -193,7 +193,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -259,7 +259,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -340,7 +340,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java index c20448e..f0e51bf 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java @@ -50,7 +50,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -84,7 +84,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -149,7 +149,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -194,7 +194,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -266,7 +266,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java index 597b353..8880348 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java @@ -42,7 +42,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -71,7 +71,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -123,7 +123,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); @@ -172,7 +172,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); @@ -233,7 +233,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java index c3f3faf..360f2ab 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java @@ -41,7 +41,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -75,7 +75,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -140,7 +140,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -185,7 +185,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -256,7 +256,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -339,7 +339,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -374,7 +374,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -450,7 +450,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -500,7 +500,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); @@ -581,7 +581,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/20a35d37/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java index 4c6613b..12d81d7 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java @@ -42,7 +42,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); createDefaultSetup(props); @@ -132,7 +132,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); createDefaultSetup(props); @@ -232,7 +232,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); createDefaultSetup(props); @@ -325,7 +325,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); createDefaultSetup(props); @@ -401,7 +401,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); createDefaultSetup(props); @@ -474,7 +474,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 )); - Properties props = new Properties(); + Properties props = getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); createDefaultSetup(props);