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 E661818C88 for ; Wed, 9 Mar 2016 03:15:58 +0000 (UTC) Received: (qmail 70731 invoked by uid 500); 9 Mar 2016 03:15:58 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 70695 invoked by uid 500); 9 Mar 2016 03:15:58 -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 70686 invoked by uid 99); 9 Mar 2016 03:15:58 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2016 03:15:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 4A4FB1A04D4 for ; Wed, 9 Mar 2016 03:15:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-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 mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id DoOQnRvkAgOk for ; Wed, 9 Mar 2016 03:15:56 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 354965FB56 for ; Wed, 9 Mar 2016 03:15:56 +0000 (UTC) Received: (qmail 70681 invoked by uid 99); 9 Mar 2016 03:15:55 -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; Wed, 09 Mar 2016 03:15:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4E2ADDFA6C; Wed, 9 Mar 2016 03:15:55 +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: X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: Cleanup Date: Wed, 9 Mar 2016 03:15:55 +0000 (UTC) Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-1050 24602c90e -> 680ab28b7 Cleanup Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/680ab28b Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/680ab28b Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/680ab28b Branch: refs/heads/feature/GEODE-1050 Commit: 680ab28b78c370e6002f2f6324941e653e2eb8d3 Parents: 24602c9 Author: Kirk Lund Authored: Tue Mar 8 19:15:43 2016 -0800 Committer: Kirk Lund Committed: Tue Mar 8 19:15:43 2016 -0800 ---------------------------------------------------------------------- .../cache/internal/JUnit4CacheTestCase.java | 10 --------- .../internal/JUnit3DistributedTestCase.java | 22 +------------------ .../internal/JUnit4DistributedTestCase.java | 23 +++++++++----------- 3 files changed, 11 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/680ab28b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java index efbc544..4182ffc 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java @@ -81,16 +81,6 @@ public class JUnit4CacheTestCase extends JUnit4DistributedTestCase implements Ca private final CacheTestFixture cacheTestFixture; -// /** -// * Creates a new JUnit4DistributedTestCase test with the given name. -// * -// * @deprecated Please use {@link #JUnit4CacheTestCase()} instead. The {@code name} is ignored. -// */ -// @Deprecated -// public JUnit4CacheTestCase(final String name) { -// this(); -// } - public JUnit4CacheTestCase() { this((CacheTestFixture)null); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/680ab28b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java index b990c2e..90d88d8 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java @@ -45,33 +45,13 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist private final JUnit4DistributedTestCase delegate = new JUnit4DistributedTestCase(this); -// private static final Logger logger = LogService.getLogger(); -// -// private static final Set testHistory = new LinkedHashSet(); -// -// /** This VM's connection to the distributed system */ -// public static InternalDistributedSystem system; -// private static Class lastSystemCreatedInTest; -// private static Properties lastSystemProperties; -// private static volatile String testMethodName; -// -// /** For formatting timing info */ -// private static final DecimalFormat format = new DecimalFormat("###.###"); -// -// public static boolean reconnect = false; -// -// public static final boolean logPerTest = Boolean.getBoolean("dunitLogPerTest"); - - static { - JUnit4DistributedTestCase.initializeDistributedTestCase(); - } - /** * Creates a new JUnit3DistributedTestCase test with the * given name. */ public JUnit3DistributedTestCase(final String name) { super(name); + JUnit4DistributedTestCase.initializeDistributedTestCase(); } //--------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/680ab28b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java index 54be38e..01a3f49 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java @@ -76,7 +76,7 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial private static final Set testHistory = new LinkedHashSet(); /** This VM's connection to the distributed system */ - public static InternalDistributedSystem system; // TODO: make private + private static InternalDistributedSystem system; private static Class lastSystemCreatedInTest; private static Properties lastSystemProperties; private static volatile String testMethodName; @@ -84,26 +84,23 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial /** For formatting timing info */ private static final DecimalFormat format = new DecimalFormat("###.###"); - public static boolean reconnect = false; // TODO: make private + private static boolean reconnect = false; - public static final boolean logPerTest = Boolean.getBoolean("dunitLogPerTest"); // TODO: make private + private static final boolean logPerTest = Boolean.getBoolean("dunitLogPerTest"); private final DistributedTestFixture distributedTestFixture; -// /** -// * Creates a new JUnit4DistributedTestCase distributedTestFixture with the given name. -// * -// * @deprecated Please use {@link #JUnit4DistributedTestCase()} instead. The {@code name} is ignored. -// */ -// @Deprecated -// public JUnit4DistributedTestCase(final String name) { -// this(); -// } - + /** + * Constructs a new distributed test. All JUnit 4 test classes need to have a + * no-arg constructor. + */ public JUnit4DistributedTestCase() { this((DistributedTestFixture)null); } + /** + * This constructor should only be used by {@link JUnit3DistributedTestCase}. + */ protected JUnit4DistributedTestCase(final DistributedTestFixture distributedTestFixture) { if (distributedTestFixture == null) { this.distributedTestFixture = this;