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 03:56:26 UTC
incubator-geode git commit: Make remaining vars in
DistributedTestCase private
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1050 43a182a2e -> 24602c90e
Make remaining vars in DistributedTestCase private
Fix up one dunit extending JUnit3 and JUnit4 internal versions of DistributedTestCase and CacheTestCase
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/24602c90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/24602c90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/24602c90
Branch: refs/heads/feature/GEODE-1050
Commit: 24602c90e4ce6f9692192797cd3c052075b8ee5c
Parents: 43a182a
Author: Kirk Lund <kl...@apache.org>
Authored: Tue Mar 8 18:51:41 2016 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Mar 8 18:51:41 2016 -0800
----------------------------------------------------------------------
.../cache30/CachedAllEventsDUnitTest.java | 23 ++++++++---------
.../distributed/DistributedMemberDUnitTest.java | 8 +++---
.../distributed/DistributedSystemDUnitTest.java | 27 ++------------------
.../gemfire/test/dunit/DistributedTestCase.java | 4 +--
.../dunit/cache/internal/CacheTestFixture.java | 3 ++-
.../cache/internal/JUnit4CacheTestCase.java | 20 +++++++--------
.../internal/JUnit4DistributedTestCase.java | 20 +++++++--------
7 files changed, 40 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24602c90/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
index c3f97f7..68f1305 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.cache30;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.DataPolicy;
@@ -27,6 +29,8 @@ import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.junit.Test;
/**
* Make sure that create are distributed and done in
@@ -35,15 +39,7 @@ import com.gemstone.gemfire.test.dunit.VM;
* @author darrel
* @since 5.0
*/
-public class CachedAllEventsDUnitTest extends CacheTestCase {
-
-// private transient Region r;
-// private transient DistributedMember otherId;
-// private transient int invokeCount;
-
- public CachedAllEventsDUnitTest(String name) {
- super(name);
- }
+public class CachedAllEventsDUnitTest extends JUnit4CacheTestCase {
private VM getOtherVm() {
Host host = Host.getHost(0);
@@ -75,8 +71,6 @@ public class CachedAllEventsDUnitTest extends CacheTestCase {
return InternalDistributedSystem.getAnyInstance().getDistributedMember();
}
- ////////////////////// Test Methods //////////////////////
-
/**
* make sure a remote create will be done in a NORMAL+ALL region
* @param rmtCreate is true if create should happen in remote region
@@ -98,13 +92,18 @@ public class CachedAllEventsDUnitTest extends CacheTestCase {
assertEquals(false, r1.containsKey("key"));
}
}
- // TODO these are never used
+
+ @Test
public void testRemoteCreate_CAE() throws CacheException {
remoteCreate(DataPolicy.NORMAL, InterestPolicy.ALL, true);
}
+
+ @Test
public void testRemoteCreate_CAER() throws CacheException {
remoteCreate(DataPolicy.REPLICATE, InterestPolicy.CACHE_CONTENT, true);
}
+
+ @Test
public void testRemoteCreate_C() throws CacheException {
remoteCreate(DataPolicy.NORMAL, InterestPolicy.CACHE_CONTENT, false);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24602c90/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
index 391ec8c..d66fded 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
@@ -33,14 +33,12 @@ import com.gemstone.gemfire.distributed.internal.DM;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
-
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import junit.framework.AssertionFailedError;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -233,7 +231,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
assertEquals(3, members.size());
break;
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) { // TODO: delete this
if (i < 3) {
sleep(200);
} else {
@@ -314,7 +312,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
assertEquals(3, members.size());
break;
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) { // TODO: delete this
if (i < 3) {
sleep(200);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24602c90/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
index 3fd686c..26cdf85 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
@@ -64,19 +64,16 @@ import org.junit.experimental.categories.Category;
* @author David Whitlock
*/
@Category(DistributedTest.class)
-public class DistributedSystemDUnitTest extends DistributedTestCase {
+public class DistributedSystemDUnitTest extends JUnit3DistributedTestCase {
public DistributedSystemDUnitTest(String name) {
super(name);
}
public void postSetUp() throws Exception {
- System.out.println("KIRK:postSetUp");
disconnectAllFromDS();
}
- //////// Test methods
-
/**
* ensure that waitForMemberDeparture correctly flushes the serial message queue for
* the given member
@@ -117,7 +114,7 @@ public class DistributedSystemDUnitTest extends DistributedTestCase {
}
}
- static class FakeMessage extends SerialDistributionMessage {
+ private static class FakeMessage extends SerialDistributionMessage {
volatile boolean[] blocked;
volatile boolean processed;
@@ -154,10 +151,6 @@ public class DistributedSystemDUnitTest extends DistributedTestCase {
@Test
public void testGetSameSystemTwice() {
Properties config = new Properties();
-
-// int unusedPort = AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS);
-// config.setProperty("mcast-port", String.valueOf(unusedPort));
- // a loner is all this test needs
config.setProperty("mcast-port", "0");
config.setProperty("locators", "");
// set a flow-control property for the test (bug 37562)
@@ -177,10 +170,6 @@ public class DistributedSystemDUnitTest extends DistributedTestCase {
@Test
public void testGetDifferentSystem() {
Properties config = new Properties();
-
-// int unusedPort = AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS);
-// config.setProperty("mcast-port", String.valueOf(unusedPort));
- // a loner is all this test needs
config.setProperty("mcast-port", "0");
config.setProperty("locators", "");
config.setProperty("mcast-flow-control", "3000000,0.20,3000");
@@ -209,10 +198,6 @@ public class DistributedSystemDUnitTest extends DistributedTestCase {
@Test
public void testGetDifferentSystemAfterClose() {
Properties config = new Properties();
-
-// int unusedPort = AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS);
-// config.setProperty("mcast-port", String.valueOf(unusedPort));
- // a loner is all this test needs
config.setProperty("mcast-port", "0");
config.setProperty("locators", "");
@@ -229,9 +214,6 @@ public class DistributedSystemDUnitTest extends DistributedTestCase {
@Test
public void testGetProperties() {
Properties config = new Properties();
-
-// int unusedPort = AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS);
-// config.setProperty("mcast-port", String.valueOf(unusedPort));
// a loner is all this test needs
int unusedPort = 0;
config.setProperty("mcast-port", "0");
@@ -394,11 +376,6 @@ public class DistributedSystemDUnitTest extends DistributedTestCase {
@Test
public void testEmptyCacheXmlFile() throws Exception {
Properties config = new Properties();
-
-// int unusedPort =
-// AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS);
-// config.setProperty("mcast-port", String.valueOf(unusedPort));
- // a loner is all this test needs
config.setProperty("mcast-port", "0");
config.setProperty("locators", "");
config.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, "");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24602c90/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
index 1f7daa1..a131034 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
@@ -89,9 +89,9 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
/** For formatting timing info */
private static final DecimalFormat format = new DecimalFormat("###.###");
- public static boolean reconnect = false; // TODO: make private
+ private static boolean reconnect = false; // TODO: make private
- public static final boolean logPerTest = Boolean.getBoolean("dunitLogPerTest"); // TODO: make private
+ private static final boolean logPerTest = Boolean.getBoolean("dunitLogPerTest"); // TODO: make private
/**
* Creates a new <code>DistributedTestCase</code> test with the given name.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24602c90/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/CacheTestFixture.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/CacheTestFixture.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/CacheTestFixture.java
index 6f33fd9..09ee10e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/CacheTestFixture.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/CacheTestFixture.java
@@ -17,11 +17,12 @@
package com.gemstone.gemfire.test.dunit.cache.internal;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.test.dunit.internal.DistributedTestFixture;
/**
* Defines the {@code CacheTestCase} methods that can be overridden by its subclasses.
*/
-public interface CacheTestFixture {
+public interface CacheTestFixture extends DistributedTestFixture {
/**
* {@code preTearDownCacheTestCase()} is invoked before {@code CacheTestCase#tearDownCacheTestCase()}.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24602c90/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 e16e65b..efbc544 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,22 +81,22 @@ 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();
- }
+// /**
+// * 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);
}
JUnit4CacheTestCase(final CacheTestFixture cacheTestFixture) {
- super(); // TODO: what about DistributedTestFixture? Make CacheTestFixture extend DistributedTestFixture
+ super(cacheTestFixture);
if (cacheTestFixture == null) {
this.cacheTestFixture = this;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24602c90/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 915aee9..54be38e 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
@@ -90,21 +90,21 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
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();
- }
+// /**
+// * 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();
+// }
public JUnit4DistributedTestCase() {
this((DistributedTestFixture)null);
}
- JUnit4DistributedTestCase(final DistributedTestFixture distributedTestFixture) {
+ protected JUnit4DistributedTestCase(final DistributedTestFixture distributedTestFixture) {
if (distributedTestFixture == null) {
this.distributedTestFixture = this;
} else {