You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/09 04:15:55 UTC
incubator-geode git commit: Cleanup
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 <kl...@apache.org>
Authored: Tue Mar 8 19:15:43 2016 -0800
Committer: Kirk Lund <kl...@apache.org>
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<String> testHistory = new LinkedHashSet<String>();
-//
-// /** 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 <code>JUnit3DistributedTestCase</code> 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<String> testHistory = new LinkedHashSet<String>();
/** 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;