This is an automated email from the ASF dual-hosted git repository.
gosullivan pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 4c8be37 GEODE-6039: deprecate DistributedTestCase and associated.
(#2841)
4c8be37 is described below
commit 4c8be37220c08ca75f541739a05c89ae6a34036a
Author: Galen O'Sullivan <[email protected]>
AuthorDate: Wed Nov 21 12:51:32 2018 -0800
GEODE-6039: deprecate DistributedTestCase and associated. (#2841)
* GEODE-6039: deprecate DistributedDestCase and associated classes.
---
.../geode/rest/internal/web/controllers/RestAPITestBase.java | 6 ++++++
.../org/apache/geode/internal/cache/DistributedCacheTestCase.java | 6 ++++--
.../cache/rollingupgrade/RollingUpgrade2DUnitTestBase.java | 5 ++++-
.../org/apache/geode/cache/client/internal/LocatorTestBase.java | 7 +++++++
.../geode/internal/cache/tier/sockets/CacheServerTestUtil.java | 7 +++++++
.../apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java | 6 ++++++
.../org/apache/geode/security/ClientAuthorizationTestCase.java | 5 +++++
.../java/org/apache/geode/security/query/QuerySecurityBase.java | 6 ++++++
.../main/java/org/apache/geode/test/dunit/DistributedTestCase.java | 7 +++++++
.../geode/test/dunit/cache/internal/JUnit4CacheTestCase.java | 5 +++++
.../apache/geode/test/dunit/internal/DistributedTestFixture.java | 6 ++++++
.../geode/test/dunit/internal/JUnit4DistributedTestCase.java | 4 +++-
12 files changed, 66 insertions(+), 4 deletions(-)
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
index 6b306a7..5816217 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
@@ -57,8 +57,14 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
import org.apache.geode.test.junit.categories.RestAPITest;
+/**
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
+ */
@Category({RestAPITest.class})
class RestAPITestBase extends JUnit4DistributedTestCase {
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java
index 50f644b..be3be1a 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java
@@ -37,10 +37,12 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
/**
- * This is the abstract superclass of tests that validate the functionality of
GemFire's distributed
- * caches. It provides a number of convenient helper classes.
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
*/
public abstract class DistributedCacheTestCase extends
JUnit4DistributedTestCase {
diff --git
a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTestBase.java
b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTestBase.java
index 3bff442..435f6d0 100755
---
a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTestBase.java
+++
b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTestBase.java
@@ -96,6 +96,8 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.dunit.standalone.VersionManager;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@@ -110,7 +112,8 @@ import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
* talk to one another due to one using a magic number and the other not. Also
turnOffBounce will
* need to be set to true so that bouncing a vm doesn't lead to a NPE.
*
- * @author jhuynh
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
*/
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
diff --git
a/geode-dunit/src/main/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
b/geode-dunit/src/main/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
index 95905b6..5260693 100644
---
a/geode-dunit/src/main/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
+++
b/geode-dunit/src/main/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
@@ -53,7 +53,14 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
+
+/**
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
+ */
public abstract class LocatorTestBase extends JUnit4DistributedTestCase {
protected static final String CACHE_KEY = "CACHE";
protected static final String LOCATOR_KEY = "LOCATOR";
diff --git
a/geode-dunit/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
b/geode-dunit/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
index 9a7138a..8c36945 100755
---
a/geode-dunit/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
+++
b/geode-dunit/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
@@ -61,7 +61,14 @@ import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
+
+/**
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
+ */
public class CacheServerTestUtil extends JUnit4DistributedTestCase {
private static Cache cache = null;
diff --git
a/geode-dunit/src/main/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
b/geode-dunit/src/main/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
index 08fe52b..8f23fb1 100644
---
a/geode-dunit/src/main/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
+++
b/geode-dunit/src/main/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -109,8 +109,14 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
+/**
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
+ */
public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
protected static Cache cache;
diff --git
a/geode-dunit/src/main/java/org/apache/geode/security/ClientAuthorizationTestCase.java
b/geode-dunit/src/main/java/org/apache/geode/security/ClientAuthorizationTestCase.java
index 2b3eab7..aae3a4a 100644
---
a/geode-dunit/src/main/java/org/apache/geode/security/ClientAuthorizationTestCase.java
+++
b/geode-dunit/src/main/java/org/apache/geode/security/ClientAuthorizationTestCase.java
@@ -88,6 +88,8 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
import org.apache.geode.test.dunit.standalone.VersionManager;
/**
@@ -95,6 +97,9 @@ import org.apache.geode.test.dunit.standalone.VersionManager;
* the authorization tests from client to server.
*
* @since GemFire 5.5
+ *
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
*/
public abstract class ClientAuthorizationTestCase extends
JUnit4DistributedTestCase {
diff --git
a/geode-dunit/src/main/java/org/apache/geode/security/query/QuerySecurityBase.java
b/geode-dunit/src/main/java/org/apache/geode/security/query/QuerySecurityBase.java
index c4a16f6..e7b694a 100644
---
a/geode-dunit/src/main/java/org/apache/geode/security/query/QuerySecurityBase.java
+++
b/geode-dunit/src/main/java/org/apache/geode/security/query/QuerySecurityBase.java
@@ -44,8 +44,14 @@ import org.apache.geode.security.TestSecurityManager;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
+/**
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
+ */
public abstract class QuerySecurityBase extends JUnit4DistributedTestCase {
public RegionShortcut getRegionType() {
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/DistributedTestCase.java
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/DistributedTestCase.java
index 60a5db2..144647b 100755
---
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/DistributedTestCase.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/DistributedTestCase.java
@@ -16,9 +16,16 @@ package org.apache.geode.test.dunit;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
/**
* This class is the superclass of all distributed unit tests.
+ *
+ * @deprecated this class used to be the base for distributed test cases, but
due to its complexity
+ * and the complexity of inheritance in test classes, it should
not be used.
+ * Please use {@link DistributedRule} and Geode User APIs or
+ * {@link ClusterStartupRule} instead.
*/
@SuppressWarnings("serial")
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 64b0921..9a77bf2 100644
---
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -52,10 +52,15 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
/**
* This class is the base class for all distributed tests using JUnit 4 that
require the creation of
* a {@link Cache}.
+ *
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
*/
public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
implements CacheTestFixture {
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
index b372696..27feb16 100755
---
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
@@ -17,8 +17,14 @@ package org.apache.geode.test.dunit.internal;
import java.io.Serializable;
import java.util.Properties;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedRule;
+
/**
* Defines the {@code DistributedTestCase} methods that can be overridden by
its subclasses.
+ *
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
*/
public interface DistributedTestFixture extends Serializable {
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
index 1d945d7..74281ca 100644
---
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -56,12 +56,14 @@ import org.apache.geode.test.dunit.DUnitBlackboard;
import org.apache.geode.test.dunit.Disconnect;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.DistributedRule;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
- * This class is the base class for all distributed tests using JUnit 4.
+ * @deprecated Please use {@link DistributedRule} and Geode User APIs or
{@link ClusterStartupRule}
+ * instead.
*/
public abstract class JUnit4DistributedTestCase implements
DistributedTestFixture, Serializable {
private static final Logger logger = LogService.getLogger();
