Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DD61E200C67 for ; Mon, 15 May 2017 20:02:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DC2AA160BA9; Mon, 15 May 2017 18:02:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 103CF160BCE for ; Mon, 15 May 2017 20:02:24 +0200 (CEST) Received: (qmail 95855 invoked by uid 500); 15 May 2017 18:02:24 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 95695 invoked by uid 99); 15 May 2017 18:02:22 -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, 15 May 2017 18:02:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB9F0DFFB3; Mon, 15 May 2017 18:02:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bschuchardt@apache.org To: commits@geode.apache.org Date: Mon, 15 May 2017 18:02:22 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/4] geode git commit: Move the startBridgeClient method added to LocatorTestBase to AutoConnectionSourceDUnitTest, and use the DistributedRestoreSystemProperties rule. archived-at: Mon, 15 May 2017 18:02:26 -0000 Move the startBridgeClient method added to LocatorTestBase to AutoConnectionSourceDUnitTest, and use the DistributedRestoreSystemProperties rule. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b62b9bc1 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b62b9bc1 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b62b9bc1 Branch: refs/heads/develop Commit: b62b9bc1bdd6a049f6e2def7dd067b0fb2c6c826 Parents: a7441ae Author: masaki.yamakawa Authored: Fri May 5 04:28:22 2017 +0900 Committer: Bruce Schuchardt Committed: Mon May 15 11:05:56 2017 -0700 ---------------------------------------------------------------------- .../client/internal/AutoConnectionSourceDUnitTest.java | 12 ++++++++++++ .../geode/cache/client/internal/LocatorTestBase.java | 7 ------- 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/b62b9bc1/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java index af929a6..66679ba 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java @@ -32,6 +32,7 @@ import org.apache.geode.internal.*; import org.apache.geode.internal.cache.*; import org.apache.geode.management.membership.*; import org.apache.geode.test.dunit.*; +import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties; import org.apache.geode.test.junit.categories.*; /** @@ -44,6 +45,10 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase { protected static final Object BRIDGE_LISTENER = "BRIDGE_LISTENER"; private static final long MAX_WAIT = 60000; + @Rule + public DistributedRestoreSystemProperties restoreSystemProperties = + new DistributedRestoreSystemProperties(); + @Override public final void postSetUp() throws Exception { IgnoredException.addIgnoredException("NoAvailableLocatorsException"); @@ -569,6 +574,13 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase { }); } + protected void startBridgeClient(final String group, final String host, final int port, + Properties systemProperties) throws Exception { + systemProperties.entrySet().forEach( + entry -> System.setProperty(entry.getKey().toString(), entry.getValue().toString())); + startBridgeClient(group, host, port, new String[] {REGION_NAME}); + } + protected void checkUpdateLocatorListInterval(VM vm, final long expected) { vm.invoke(() -> { PoolImpl pool = (PoolImpl) PoolManager.find(POOL_NAME); http://git-wip-us.apache.org/repos/asf/geode/blob/b62b9bc1/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java index c0ca29e..c3b349a 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java +++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java @@ -289,13 +289,6 @@ public abstract class LocatorTestBase extends JUnit4DistributedTestCase { } } - protected void startBridgeClient(final String group, final String host, final int port, - Properties systemProperties) throws Exception { - systemProperties.entrySet().forEach( - entry -> System.setProperty(entry.getKey().toString(), entry.getValue().toString())); - startBridgeClient(group, host, port, new String[] {REGION_NAME}); - } - protected void startBridgeClient(final String group, final String host, final int port) throws Exception { startBridgeClient(group, host, port, new String[] {REGION_NAME});