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/05/24 00:31:51 UTC
[26/29] incubator-geode git commit: Fixing compile errors due to the
automatic conversion to junit 4
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java
index 1500269..3929471 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal.cache.persistence;
+import static org.junit.Assert.*;
+
import java.io.File;
import java.io.IOException;
import java.util.Map;
@@ -42,18 +44,15 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-public abstract class PersistentReplicatedTestBase extends CacheTestCase {
+public abstract class PersistentReplicatedTestBase extends JUnit4CacheTestCase {
protected static final int MAX_WAIT = 30 * 1000;
protected static String REGION_NAME = "region";
protected File diskDir;
protected static String SAVED_ACK_WAIT_THRESHOLD;
- public PersistentReplicatedTestBase(String name) {
- super(name);
- }
-
@Override
public final void postSetUp() throws Exception {
Invoke.invokeInEveryVM(PersistentReplicatedTestBase.class,"setRegionName", new Object[]{getUniqueName()});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index e0ad324..c68dff5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
@@ -54,8 +54,7 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
*/
@Category(DistributedTest.class)
-public class BackwardCompatibilityHigherVersionClientDUnitTest extends
- DistributedTestCase {
+public class BackwardCompatibilityHigherVersionClientDUnitTest extends JUnit4DistributedTestCase {
/** the cache */
private static Cache cache = null;
@@ -78,11 +77,6 @@ public class BackwardCompatibilityHigherVersionClientDUnitTest extends
private static short currentClientVersion = ConnectionProxy.VERSION.ordinal();
- /** constructor */
- public BackwardCompatibilityHigherVersionClientDUnitTest() {
- super();
- }
-
@Override
public final void postSetUp() throws Exception {
final Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index d5f0371..ddd9dea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -77,13 +77,6 @@ public class DurableClientQueueSizeDUnitTest extends JUnit4DistributedTestCase {
public static final String DEFAULT_POOL_NAME = "DEFAULT";
- /**
- * @param name
- */
- public DurableClientQueueSizeDUnitTest() {
- super();
- }
-
@Override
public final void postSetUp() throws Exception {
vm0 = Host.getHost(0).getVM(0);
@@ -278,8 +271,7 @@ public class DurableClientQueueSizeDUnitTest extends JUnit4DistributedTestCase {
// + ".gfs");
// props.setProperty("statistic-sampling-enabled", "true");
- DurableClientQueueSizeDUnitTest test = new DurableClientQueueSizeDUnitTest(
- "DurableClientQueueSizeDUnitTest");
+ DurableClientQueueSizeDUnitTest test = new DurableClientQueueSizeDUnitTest();
DistributedSystem ds = test.getSystem(props);
ds.disconnect();
cache = (GemFireCacheImpl)CacheFactory.create(test.getSystem());
@@ -335,8 +327,7 @@ public class DurableClientQueueSizeDUnitTest extends JUnit4DistributedTestCase {
// + ".gfs");
// props.setProperty("statistic-sampling-enabled", "true");
- DistributedSystem ds = new DurableClientQueueSizeDUnitTest(
- "DurableClientQueueSizeDUnitTest").getSystem(props);
+ DistributedSystem ds = new DurableClientQueueSizeDUnitTest().getSystem(props);
ds.disconnect();
ClientCacheFactory ccf = new ClientCacheFactory(props);
ccf.setPoolSubscriptionEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index 3c2f980..402a36a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
@@ -210,8 +210,7 @@ public class InterestListRecoveryDUnitTest extends JUnit4DistributedTestCase
public static void createClientCache(String host, Integer port1, Integer port2 ) throws Exception
{
- InterestListRecoveryDUnitTest test = new InterestListRecoveryDUnitTest(
- "temp");
+ InterestListRecoveryDUnitTest test = new InterestListRecoveryDUnitTest();
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -240,8 +239,7 @@ public class InterestListRecoveryDUnitTest extends JUnit4DistributedTestCase
public static Integer createServerCache() throws Exception
{
- InterestListRecoveryDUnitTest test = new InterestListRecoveryDUnitTest(
- "temp");
+ InterestListRecoveryDUnitTest test = new InterestListRecoveryDUnitTest();
cache = test.createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index 362d3c8..e35fc95 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -75,16 +75,6 @@ public class InterestResultPolicyDUnitTest extends JUnit4DistributedTestCase
private IgnoredException expectedEx;
/**
- * Creates a test instance with the given name
- *
- * @param name -
- * name of test instance
- */
- public InterestResultPolicyDUnitTest() {
- super();
- }
-
- /**
* Creates the server cache and populates it with some entries
*/
@Override
@@ -262,8 +252,7 @@ public class InterestResultPolicyDUnitTest extends JUnit4DistributedTestCase
*/
public static Integer createServerCache() throws Exception
{
- InterestResultPolicyDUnitTest test = new InterestResultPolicyDUnitTest(
- "temp");
+ InterestResultPolicyDUnitTest test = new InterestResultPolicyDUnitTest();
cache = test.createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -302,8 +291,7 @@ public class InterestResultPolicyDUnitTest extends JUnit4DistributedTestCase
public static void createClientCache(String host, Integer port) throws Exception
{
int PORT = port.intValue() ;
- InterestResultPolicyDUnitTest test = new InterestResultPolicyDUnitTest(
- "temp");
+ InterestResultPolicyDUnitTest test = new InterestResultPolicyDUnitTest();
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
index 361f0cd..5b5ab9c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -160,7 +160,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
if (Locator.hasLocator()) {
Locator.getLocator().stop();
}
- AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName());
+ AsyncEventQueueTestBase test = new AsyncEventQueueTestBase();
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -174,7 +174,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
}
public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
- AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName());
+ AsyncEventQueueTestBase test = new AsyncEventQueueTestBase();
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
@@ -694,7 +694,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
}
protected static void createCache(Integer locPort) {
- AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName());
+ AsyncEventQueueTestBase test = new AsyncEventQueueTestBase();
Properties props = test.getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
@@ -704,7 +704,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
}
public static void createCacheWithoutLocator(Integer mCastPort) {
- AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName());
+ AsyncEventQueueTestBase test = new AsyncEventQueueTestBase();
Properties props = test.getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "" + mCastPort);
InternalDistributedSystem ds = test.getSystem(props);
@@ -915,7 +915,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
}
public static int createReceiver(int locPort) {
- AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName());
+ AsyncEventQueueTestBase test = new AsyncEventQueueTestBase();
Properties props = test.getDistributedSystemProperties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
@@ -1563,7 +1563,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
cache = null;
}
else {
- AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName());
+ AsyncEventQueueTestBase test = new AsyncEventQueueTestBase();
if (test.isConnectedToDS()) {
test.getSystem().disconnect();
}
@@ -1571,7 +1571,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
}
public static void shutdownLocator() {
- AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName());
+ AsyncEventQueueTestBase test = new AsyncEventQueueTestBase();
test.getSystem().disconnect();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index 3aded28..460f69f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -66,7 +66,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
*/
@Test
public void testCreateAsyncEventQueueWithNullListener() {
- AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName());
+ AsyncEventQueueTestBase test = new AsyncEventQueueTestBase();
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
InternalDistributedSystem ds = test.getSystem(props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index 15a51bd..210b6a3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -43,11 +43,6 @@ import java.util.*;
@Category(DistributedTest.class)
public class ManagementTestBase extends JUnit4DistributedTestCase {
- public ManagementTestBase() {
- super();
-
- }
-
private static final int MAX_WAIT = 70 * 1000;
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
index 6e6269e..970bf60 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
@@ -87,7 +87,7 @@ public class TestClientIdsDUnitTest extends JUnit4DistributedTestCase {
public TestClientIdsDUnitTest() {
super();
- this.helper = new ManagementTestBase(name);
+ this.helper = new ManagementTestBase();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3de62aec/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
index c86e767..83769f8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
@@ -80,7 +80,7 @@ public class TestSubscriptionsDUnitTest extends JUnit4DistributedTestCase {
public TestSubscriptionsDUnitTest() {
super();
- this.helper = new ManagementTestBase(name);
+ this.helper = new ManagementTestBase();
}
@Override