You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2018/04/20 13:52:25 UTC
[geode] branch develop updated: GEODE_2121: add categories to tests
This is an automated email from the ASF dual-hosted git repository.
bschuchardt 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 2b6a6d9 GEODE_2121: add categories to tests
2b6a6d9 is described below
commit 2b6a6d95836dda34ff6f25f65e3d3089270c3e8a
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Fri Apr 20 06:51:09 2018 -0700
GEODE_2121: add categories to tests
added RedisTest category
swept all unit tests looking for additional client/server & other tests to
categorize
---
.../internal/web/RestFunctionExecuteDUnitTest.java | 3 ++-
.../RestAPIOnRegionFunctionExecutionDUnitTest.java | 3 ++-
.../internal/web/controllers/RestAPITestBase.java | 3 ++-
.../controllers/RestAPIsAndInterOpsDUnitTest.java | 3 ++-
...RestAPIsOnGroupsFunctionExecutionDUnitTest.java | 3 ++-
...estAPIsOnMembersFunctionExecutionDUnitTest.java | 3 ++-
.../web/controllers/RestAPIsWithSSLDUnitTest.java | 3 ++-
.../AnalyzeConnectorsSerializablesJUnitTest.java | 3 ++-
.../java/org/apache/geode/DataSerializerTest.java | 3 ++-
.../java/org/apache/geode/LonerDMJUnitTest.java | 3 ++-
.../org/apache/geode/SystemFailureJUnitTest.java | 3 ++-
.../cache/client/internal/AbstractOpTest.java | 3 ++-
...pClientExecutorSubmitTaskWithExceptionTest.java | 3 ++-
.../locator/LocatorStatusResponseJUnitTest.java | 3 ++-
.../apache/geode/cache30/ReconnectDUnitTest.java | 3 ++-
.../cache30/RegionMembershipListenerDUnitTest.java | 3 ++-
.../geode/cache30/RequiredRolesDUnitTest.java | 3 ++-
.../org/apache/geode/cache30/SlowRecDUnitTest.java | 3 ++-
.../AnalyzeSerializablesJUnitTest.java | 3 ++-
.../distributed/DistributedMemberDUnitTest.java | 3 ++-
.../internal/DistributionMessageTest.java | 3 ++-
.../LocatorLoadSnapshotIntegrationTest.java | 3 ++-
.../internal/LocatorLoadSnapshotJUnitTest.java | 3 ++-
.../distributed/internal/ReplyProcessor21Test.java | 3 ++-
.../internal/locks/DLockServiceLeakTest.java | 3 ++-
.../internal/membership/InternalRoleJUnitTest.java | 3 ++-
...ackwardCompatibilitySerializationDUnitTest.java | 3 ++-
.../internal/ClassNotFoundExceptionDUnitTest.java | 3 ++-
.../java/org/apache/geode/internal/DSCODETest.java | 3 ++-
.../geode/internal/DataSerializableJUnitTest.java | 28 +++++++++++++++++++---
.../internal/HeapDataOutputStreamJUnitTest.java | 3 ++-
.../geode/internal/HeapDataOutputStreamTest.java | 3 ++-
.../internal/InternalDataSerializerJUnitTest.java | 3 ++-
...InternalDataSerializerQuickcheckStringTest.java | 3 ++-
...alDataSerializerSerializationWhitelistTest.java | 3 ++-
.../geode/internal/PdxDeleteFieldDUnitTest.java | 3 ++-
.../geode/internal/PdxDeleteFieldJUnitTest.java | 3 ++-
.../apache/geode/internal/PdxRenameDUnitTest.java | 3 ++-
.../apache/geode/internal/PdxRenameJUnitTest.java | 3 ++-
.../internal/SSLConfigIntegrationJUnitTest.java | 3 ++-
.../SystemFailureThreadCleanupRegressionTest.java | 3 ++-
.../cache/P2PDeltaPropagationDUnitTest.java | 3 ++-
.../internal/cache/SingleHopStatsDUnitTest.java | 3 ++-
.../internal/cache/SystemFailureDUnitTest.java | 3 ++-
.../geode/internal/cache/ha/HARegionQueueTest.java | 3 ++-
.../AcceptorImplClientQueueDistributedTest.java | 3 ++-
.../cache/tier/sockets/AcceptorImplDUnitTest.java | 3 ++-
.../internal/cache/tier/sockets/CCUStatsTest.java | 3 ++-
.../tier/sockets/ClientHealthMonitorJUnitTest.java | 3 ++-
.../ClientProxyWithDeltaDistributedTest.java | 3 ++-
.../ClientWithInterestFailoverDistributedTest.java | 3 ++-
.../internal/cache/tier/sockets/HandshakeTest.java | 3 ++-
.../cache/tier/sockets/MessageIdExtractorTest.java | 3 ++-
.../internal/cache/tier/sockets/PartTest.java | 3 ++-
.../tier/sockets/RedundancyLevelTestBase.java | 3 ++-
.../tier/sockets/ServerConnectionFactoryTest.java | 3 ++-
.../sockets/ServerConnectionIntegrationTest.java | 3 ++-
.../cache/tier/sockets/ServerConnectionTest.java | 3 ++-
.../cache/tier/sockets/TcpServerFactoryTest.java | 3 ++-
.../tier/sockets/command/CommitCommandTest.java | 3 ++-
.../tier/sockets/command/ContainsKey66Test.java | 3 ++-
.../tier/sockets/command/ContainsKeyTest.java | 3 ++-
.../tier/sockets/command/CreateRegionTest.java | 3 ++-
.../cache/tier/sockets/command/Destroy65Test.java | 3 ++-
.../tier/sockets/command/DestroyRegionTest.java | 3 ++-
.../cache/tier/sockets/command/DestroyTest.java | 3 ++-
.../sockets/command/ExecuteFunction65Test.java | 3 ++-
.../sockets/command/ExecuteFunction66Test.java | 3 ++-
.../tier/sockets/command/ExecuteFunctionTest.java | 3 ++-
.../cache/tier/sockets/command/Get70Test.java | 3 ++-
.../cache/tier/sockets/command/GetAll651Test.java | 3 ++-
.../cache/tier/sockets/command/GetAll70Test.java | 3 ++-
.../cache/tier/sockets/command/GetAllTest.java | 3 ++-
.../sockets/command/GetAllWithCallbackTest.java | 3 ++-
.../GetClientPartitionAttributesCommand66Test.java | 3 ++-
.../GetClientPartitionAttributesCommandTest.java | 3 ++-
.../cache/tier/sockets/command/InvalidateTest.java | 3 ++-
.../cache/tier/sockets/command/KeySetTest.java | 3 ++-
.../cache/tier/sockets/command/Put61Test.java | 3 ++-
.../cache/tier/sockets/command/Put65Test.java | 3 ++-
.../cache/tier/sockets/command/PutTest.java | 3 ++-
.../sockets/command/RegisterInterest61Test.java | 3 ++-
.../command/RegisterInterestList61Test.java | 3 ++-
.../command/RegisterInterestList66Test.java | 3 ++-
.../sockets/command/RegisterInterestListTest.java | 3 ++-
.../tier/sockets/command/RegisterInterestTest.java | 3 ++-
.../cache/tier/sockets/command/RemoveAllTest.java | 3 ++-
.../cache/tier/sockets/command/RequestTest.java | 3 ++-
.../sockets/command/TXFailoverCommandTest.java | 3 ++-
.../sockets/command/UnregisterInterestTest.java | 3 ++-
.../geode/internal/net/SocketCloserJUnitTest.java | 3 ++-
.../net/SocketCloserWithWaitJUnitTest.java | 3 ++-
.../net/SocketCreatorFactoryJUnitTest.java | 3 ++-
.../geode/internal/net/SocketCreatorJUnitTest.java | 3 ++-
.../geode/internal/net/SocketUtilsJUnitTest.java | 3 ++-
.../geode/internal/tcp/ConnectionTableTest.java | 3 ++-
.../apache/geode/internal/tcp/ConnectionTest.java | 3 ++-
.../geode/pdx/DistributedSystemIdDUnitTest.java | 3 ++-
.../geode/pdx/JSONFormatterBasicJUnitTest.java | 3 ++-
.../geode/pdx/JSONPdxClientServerDUnitTest.java | 3 ++-
.../java/org/apache/geode/redis/AuthJUnitTest.java | 3 ++-
.../apache/geode/redis/ConcurrentStartTest.java | 3 ++-
.../org/apache/geode/redis/HashesJUnitTest.java | 3 ++-
.../org/apache/geode/redis/ListsJUnitTest.java | 3 ++-
.../org/apache/geode/redis/RedisDistDUnitTest.java | 3 ++-
.../org/apache/geode/redis/RedisServerTest.java | 3 ++-
.../java/org/apache/geode/redis/SetsJUnitTest.java | 3 ++-
.../apache/geode/redis/SortedSetsJUnitTest.java | 3 ++-
.../org/apache/geode/redis/StringsJunitTest.java | 3 ++-
.../executor/AbstractScanExecutorTest.java | 3 ++-
.../AnalyzeCQSerializablesJUnitTest.java | 3 ++-
.../experimental/driver/AuthenticationTest.java | 3 ++-
.../experimental/driver/DriverConnectionTest.java | 3 ++-
.../driver/FunctionServiceIntegrationTest.java | 3 ++-
.../driver/QueryServiceIntegrationTest.java | 3 ++-
.../experimental/driver/RegionIntegrationTest.java | 3 ++-
.../apache/geode/experimental/driver/SSLTest.java | 3 ++-
.../experimental/driver/ValueEncoderTest.java | 3 ++-
.../driver/ValueSerializerIntegrationTest.java | 3 ++-
.../geode/test/junit/categories/RedisTest.java | 17 ++++---------
.../apache/geode/OldClientSupportDUnitTest.java | 3 ++-
.../dunit/standalone/VersionManagerJUnitTest.java | 3 ++-
.../OutputCapturingServerConnectionTest.java | 3 ++-
.../tier/sockets/ProtobufServerConnectionTest.java | 3 ++-
.../protobuf/ProtobufStreamProcessorTest.java | 3 ++-
.../protobuf/v1/AuthenticationIntegrationTest.java | 3 ++-
.../protobuf/v1/AuthorizationIntegrationTest.java | 3 ++-
.../v1/DisconnectClientIntegrationTest.java | 3 ++-
.../v1/ExecuteFunctionOnGroupIntegrationTest.java | 3 ++-
.../v1/ExecuteFunctionOnMemberIntegrationTest.java | 3 ++-
.../v1/ExecuteFunctionOnRegionIntegrationTest.java | 3 ++-
.../v1/ProtobufProtocolServiceJUnitTest.java | 3 ++-
.../v1/ProtocolVersionIntegrationTest.java | 3 ++-
.../v1/ValueSerializerIntegrationTest.java | 3 ++-
.../v1/acceptance/CacheConnectionJUnitTest.java | 5 ++--
.../CacheConnectionTimeoutJUnitTest.java | 5 ++--
.../v1/acceptance/CacheMaxConnectionJUnitTest.java | 6 ++---
.../v1/acceptance/CacheOperationsJUnitTest.java | 5 ++--
.../LocatorConnectionAuthenticationDUnitTest.java | 4 +++-
.../v1/acceptance/LocatorConnectionDUnitTest.java | 4 +++-
.../authentication/AuthorizingCacheImplTest.java | 3 ++-
.../AuthorizingFunctionServiceImplTest.java | 3 ++-
.../ClearRequestOperationHandlerJUnitTest.java | 3 ++-
...ionOnGroupRequestOperationHandlerJUnitTest.java | 3 ++-
...onOnMemberRequestOperationHandlerJUnitTest.java | 3 ++-
...onOnRegionRequestOperationHandlerJUnitTest.java | 3 ++-
.../GetAllRequestOperationHandlerJUnitTest.java | 3 ++-
.../GetAndPutJsonDocumentsDUnitTest.java | 3 ++-
...egionNamesRequestOperationHandlerJUnitTest.java | 3 ++-
.../GetRequestOperationHandlerJUnitTest.java | 3 ++-
.../GetServerOperationHandlerJUnitTest.java | 3 ++-
.../GetSizeRequestOperationHandlerJUnitTest.java | 3 ++-
.../KeySetOperationHandlerJUnitTest.java | 3 ++-
.../v1/operations/OperationHandlerJUnitTest.java | 3 ++-
...ueryRequestOperationHandlerIntegrationTest.java | 3 ++-
.../OqlQueryRequestOperationHandlerJUnitTest.java | 3 ++-
.../ProtocolVersionHandlerJUnitTest.java | 3 ++-
.../PutAllRequestOperationHandlerJUnitTest.java | 3 ++-
.../PutIfAbsentRequestIntegrationTest.java | 3 ++-
...utIfAbsentRequestOperationHandlerJUnitTest.java | 3 ++-
.../PutRequestOperationHandlerJUnitTest.java | 3 ++-
.../RemoveRequestOperationHandlerJUnitTest.java | 3 ++-
.../v1/operations/VersionValidatorJUnitTest.java | 3 ++-
.../codec/JsonPdxConverterJUnitTest.java | 3 ++-
.../ProtobufProtocolSerializerJUnitTest.java | 3 ++-
.../v1/utilities/ProtobufUtilitiesJUnitTest.java | 3 ++-
.../AnalyzeWebApiSerializablesJUnitTest.java | 3 ++-
.../AbstractBaseControllerJUnitTest.java | 3 ++-
.../web/controllers/support/RegionDataTest.java | 3 ++-
gradle/test.gradle | 12 ++++++++++
170 files changed, 382 insertions(+), 187 deletions(-)
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java
index a1a45cb..14782cf 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java
@@ -36,9 +36,10 @@ import org.apache.geode.test.compiler.JarBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({RestAPITest.class, DistributedTest.class})
public class RestFunctionExecuteDUnitTest {
@ClassRule
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
index 01997c1..12c0ae7 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
@@ -51,6 +51,7 @@ import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.rest.internal.web.RestFunctionTemplate;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -59,7 +60,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
* @since GemFire 8.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, RestAPITest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
index daf0d4f..1558ad9 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
@@ -56,8 +56,9 @@ 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.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, RestAPITest.class})
class RestAPITestBase extends JUnit4DistributedTestCase {
protected Cache cache = null;
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 6ff8580..2daddc8 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -76,6 +76,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -83,7 +84,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
*
* @since GemFire 8.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, RestAPITest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
index afa1050..64a7220 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
@@ -34,9 +34,10 @@ import org.apache.geode.rest.internal.web.RestFunctionTemplate;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, RestAPITest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index 90272a3..e4b86ed 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -35,9 +35,10 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.rest.internal.web.RestFunctionTemplate;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, RestAPITest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index 99048aa..61ff06a 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -114,13 +114,14 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
import org.apache.geode.util.test.TestUtil;
/**
* @since GemFire 8.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, RestAPITest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
diff --git a/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
index e95d585..24d88db 100644
--- a/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
@@ -17,8 +17,9 @@ package org.apache.geode.codeAnalysis;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class AnalyzeConnectorsSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
index faf495d..ce84f21 100644
--- a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
@@ -25,9 +25,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, SerializationTest.class})
public class DataSerializerTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java b/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java
index 52481e9..6495f61 100644
--- a/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java
@@ -32,13 +32,14 @@ import org.apache.geode.distributed.internal.LonerDistributionManager;
import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.PureJavaMode;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* This class makes sure an isolated "loner" distribution manager can be created and do some cache
* functions.
*/
@SuppressWarnings("deprecation")
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class LonerDMJUnitTest {
@After
diff --git a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
index cc2f81a..39675c5 100644
--- a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
@@ -24,9 +24,10 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class SystemFailureJUnitTest {
private static final int LONG_WAIT = 30000;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
index 261904b..2b2fe72 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
@@ -24,9 +24,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class AbstractOpTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
index 1e68518..49df773 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
@@ -22,13 +22,14 @@ import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemErrRule;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test if exceptions are logged when thread is submitted using
* {@code SingleHopClientExecutor#submitTask} method.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class SingleHopClientExecutorSubmitTaskWithExceptionTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
index f8522fa..f6ba8ba 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -37,7 +38,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class LocatorStatusResponseJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index f16bf4b..9f9e62d 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -55,9 +55,10 @@ import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
import org.apache.geode.test.dunit.*;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class ReconnectDUnitTest extends JUnit4CacheTestCase {
static int locatorPort;
static Locator locator;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
index cc07db9..58d05a2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
@@ -43,13 +43,14 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Test {@link RegionMembershipListener}
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class RegionMembershipListenerDUnitTest extends JUnit4CacheTestCase {
private transient MyRML myListener;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
index 28ba30b..e39b7fc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
@@ -44,13 +44,14 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Tests the functionality of the {@link RequiredRoles} class.
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class RequiredRolesDUnitTest extends ReliabilityTestCase {
protected transient volatile boolean startTestWaitForRequiredRoles = false;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java
index 98966d4..41eb60e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java
@@ -49,13 +49,14 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Test to make sure slow receiver queuing is working
*
* @since GemFire 4.2.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
@Ignore("Test was disabled by renaming to DisabledTest")
public class SlowRecDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
index 4b1eac5..fcd5d6d 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
@@ -73,8 +73,9 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class AnalyzeSerializablesJUnitTest {
private static final String NEW_LINE = System.getProperty("line.separator");
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
index e235f19..b851ec5 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
@@ -41,12 +41,13 @@ 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.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Tests the functionality of the {@link DistributedMember} class.
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
index 33172ec..e650f10 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
@@ -21,9 +21,10 @@ import static org.mockito.Mockito.verify;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class DistributionMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
index 603affc..b4bfeb3 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
@@ -27,11 +27,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoad;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Integration tests extracted from LocatorLoadSnapshotJUnitTest
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class LocatorLoadSnapshotIntegrationTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
index 9641901..9eb338b 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
@@ -26,13 +26,14 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoad;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the LocatorLoadSnapshot, which is the data structure that is used in
* the locator to compare the load between multiple servers.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class LocatorLoadSnapshotJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
index f77f3cf..1e4a1f5 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
@@ -21,9 +21,10 @@ import static org.mockito.Mockito.verify;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class ReplyProcessor21Test {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
index a63ddba..ec13256 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
@@ -41,10 +41,11 @@ import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.DistributedRegion;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, DLockTest.class})
public class DLockServiceLeakTest {
private Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
index c4f6a91..44be8ad 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
@@ -19,12 +19,13 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* InternalRole Tester.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class InternalRoleJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index 3a1d503..f32592e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -34,6 +34,7 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
/**
* Test the DSFID serialization framework added for rolling upgrades in 7.1
@@ -41,7 +42,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTestCase {
private transient ByteArrayOutputStream baos;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
index 0c79cab..dbe62f0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
@@ -47,8 +47,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class ClassNotFoundExceptionDUnitTest extends JUnit4CacheTestCase {
public ClassNotFoundExceptionDUnitTest() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java b/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java
index 6c100e5..7ce9bcb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java
@@ -22,9 +22,10 @@ import java.util.Set;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, SerializationTest.class})
public class DSCODETest {
@Test
public void testNoDuplicateByteValues() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
index 4de1470..3b893a2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
@@ -14,7 +14,12 @@
*/
package org.apache.geode.internal;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.assertNotSame;
+import static org.apache.geode.test.dunit.Assert.assertSame;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -32,7 +37,23 @@ import java.math.BigInteger;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.sql.Timestamp;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Stack;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.Vector;
import java.util.concurrent.TimeUnit;
import org.junit.Before;
@@ -49,6 +70,7 @@ import org.apache.geode.Instantiator;
import org.apache.geode.SystemFailure;
import org.apache.geode.internal.statistics.StatArchiveWriter;
import org.apache.geode.internal.tcp.ByteBufferInputStream;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -56,7 +78,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 3.0
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, SerializationTest.class})
public class DataSerializableJUnitTest implements Serializable {
/** A <code>ByteArrayOutputStream</code> that data is serialized to */
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
index 3f1d046..6c624f7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
@@ -28,6 +28,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.cache.UnitTestValueHolder;
import org.apache.geode.pdx.internal.TypeRegistry;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -36,7 +37,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* TODO right now this just tests the new write(ByteBuffer) method. We might want to add some unit
* tests for the existing methods.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, SerializationTest.class})
public class HeapDataOutputStreamJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
index f8f9eba..deadaf3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
@@ -21,9 +21,10 @@ import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, SerializationTest.class})
public class HeapDataOutputStreamTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java
index 2e5a724..ce75873 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java
@@ -29,12 +29,13 @@ import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.examples.security.ExampleSecurityManager;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the {@link InternalDataSerializer} class.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, SerializationTest.class})
public class InternalDataSerializerJUnitTest {
@Test
public void testIsGemfireObject() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java
index 28bc6e9..930b389 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java
@@ -29,6 +29,7 @@ import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.DataSerializer;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -38,7 +39,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* codepoints, and that it doesn't tend to test strings that are particularly long, though the more
* trials you run, the longer they get.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, SerializationTest.class})
@RunWith(JUnitQuickcheck.class)
public class InternalDataSerializerQuickcheckStringTest {
@Property(trials = 1000)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerSerializationWhitelistTest.java b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerSerializationWhitelistTest.java
index 1b1bea9..6e7aca2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerSerializationWhitelistTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerSerializationWhitelistTest.java
@@ -20,6 +20,7 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.lang.ClassUtils;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
/*
@@ -36,7 +37,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, SerializationTest.class})
public class InternalDataSerializerSerializationWhitelistTest {
private HeapDataOutputStream outputStream;
private Object testSerializable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
index 38708d2..5728bd4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
@@ -51,8 +51,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class PdxDeleteFieldDUnitTest extends JUnit4CacheTestCase {
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
index 5239d4c..543651b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
@@ -48,8 +48,9 @@ import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.PdxUnreadData;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class PdxDeleteFieldJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
index 3720234..ace02f7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
@@ -52,8 +52,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class PdxRenameDUnitTest extends JUnit4CacheTestCase {
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
index eb4423b..154c378 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
@@ -40,8 +40,9 @@ import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class PdxRenameJUnitTest {
@Test
public void testGetPdxTypes() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
index b919e79..a741220 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
@@ -28,12 +28,13 @@ import org.apache.geode.management.GemFireProperties;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.MemberMXBean;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Test that DistributionConfigImpl handles SSL options correctly.
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class SSLConfigIntegrationJUnitTest {
@After
diff --git a/geode-core/src/test/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java
index b9dfd38..bbcfb06 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java
@@ -25,11 +25,12 @@ import org.apache.geode.SystemFailure;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* TRAC #49856: Some GemFire Threads not cleaned up in cache close.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class SystemFailureThreadCleanupRegressionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
index e63f4ba..d16c980 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
@@ -42,11 +42,12 @@ 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.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
/**
* Tests the P2P delta propagation functionality.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class P2PDeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
static VM server1 = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
index 2d4e021..5391401 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
@@ -54,9 +54,10 @@ 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.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class SingleHopStatsDUnitTest extends JUnit4CacheTestCase {
private static final String Region_Name = "42010";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
index 77ddef0..8dc7298 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
@@ -42,13 +42,14 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
/**
* This class tests the response of GemFire to various occurrences of {@link VirtualMachineError}
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class SystemFailureDUnitTest extends DistributedCacheTestCase {
static final String REGION_NAME = "SystemFailureDUnitTest";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueTest.java
index f14f04a..d305b4b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueTest.java
@@ -32,9 +32,10 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.HARegion;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientSubscriptionTest.class})
public class HARegionQueueTest {
private HARegionQueue haRegionQueue;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java
index 7aa7f8c..8f98d16 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java
@@ -55,11 +55,12 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
@SuppressWarnings("serial")
public class AcceptorImplClientQueueDistributedTest implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
index 33466be..c78607c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
@@ -45,12 +45,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests for AcceptorImpl.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class AcceptorImplDUnitTest extends JUnit4DistributedTestCase {
public AcceptorImplDUnitTest() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
index 62623d4..c890e93 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
@@ -22,9 +22,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tier.sockets.CacheClientUpdater.CCUStats;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientSubscriptionTest.class})
public class CCUStatsTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
index 27669bc..09a3d4e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
@@ -28,12 +28,13 @@ import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* This is a functional-test for <code>ClientHealthMonitor</code>.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ClientHealthMonitorJUnitTest {
@Rule
public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java
index 3f4b869..a720422 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java
@@ -59,9 +59,10 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
@SuppressWarnings("serial")
public class ClientProxyWithDeltaDistributedTest implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java
index 9d365f2..0ffac38 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java
@@ -53,9 +53,10 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalCacheServer;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
@SuppressWarnings("serial")
public class ClientWithInterestFailoverDistributedTest implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandshakeTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandshakeTest.java
index 82535dc..d71271d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandshakeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandshakeTest.java
@@ -23,9 +23,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.security.AuthenticationRequiredException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class HandshakeTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java
index 80aac2d..8c47756 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java
@@ -33,9 +33,10 @@ import org.mockito.MockitoAnnotations;
import org.apache.geode.internal.cache.tier.Encryptor;
import org.apache.geode.security.AuthenticationRequiredException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class MessageIdExtractorTest {
@Mock
Message requestMessage;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
index 490b041..8feb263 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
@@ -24,9 +24,10 @@ import java.nio.ByteBuffer;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class PartTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index 52a041b..864ef80 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -53,12 +53,13 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Redundancy Level Functionality
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class RedundancyLevelTestBase extends JUnit4DistributedTestCase {
protected static volatile boolean registerInterestCalled = false;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
index ac6a560..1dac08d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
@@ -35,6 +35,7 @@ import org.apache.geode.internal.cache.client.protocol.exception.ServiceLoadingF
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -45,7 +46,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* What we are concerned with is making sure that everything stays the same when the feature flag
* isn't set, and that we at least try to load the service when the feature flag is true.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ServerConnectionFactoryTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
index dcd4240..a14fdda 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
@@ -45,10 +45,11 @@ import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.ServerSideHandshake;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ServerConnectionIntegrationTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
index 05c5889..5862ad7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
@@ -46,10 +46,11 @@ import org.apache.geode.internal.cache.tier.Encryptor;
import org.apache.geode.internal.cache.tier.ServerSideHandshake;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.AuthenticationRequiredException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ServerConnectionTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java
index b5c1951..f79613b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java
@@ -21,9 +21,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class TcpServerFactoryTest {
@Test
public void createsATcpServer() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
index 7963e97..3dbee32 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
@@ -23,12 +23,13 @@ import org.apache.geode.CancelCriterion;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* Exposes GEODE-537: NPE in JTA AFTER_COMPLETION command processing
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class CommitCommandTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
index 96a1720..6509624 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
@@ -39,9 +39,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ContainsKey66Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
index 9a15ada..592c4ca 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
@@ -40,9 +40,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ContainsKeyTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
index 6ce407a..abb1099 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
@@ -41,9 +41,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class CreateRegionTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
index 9e0fc59..05a53ab 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
@@ -43,9 +43,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class Destroy65Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
index 29d43b1..f30f539 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
@@ -43,9 +43,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class DestroyRegionTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
index a911153..c5edf87 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
@@ -43,9 +43,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class DestroyTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
index f1a1684..70ba8e3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
@@ -59,9 +59,10 @@ import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
@PrepareForTest({FunctionService.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
index c161b32..c49d565 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
@@ -57,9 +57,10 @@ import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.NotAuthorizedException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
@PrepareForTest({FunctionService.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
index 769cbfb..c920f0d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
@@ -57,9 +57,10 @@ import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.NotAuthorizedException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
@PrepareForTest({FunctionService.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
index 535ffe7..a65b457 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
@@ -44,9 +44,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class Get70Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
index 9b7ae7e..916732a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
@@ -48,9 +48,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetAll651Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
index 8d49b87..866fa6d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
@@ -48,9 +48,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetAll70Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
index 18769fb..6107b5e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
@@ -47,9 +47,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetAllTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
index 6c8af02..70b22a3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
@@ -45,9 +45,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetAllWithCallbackTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
index 0c3433f..4c6b971 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
@@ -31,9 +31,10 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetClientPartitionAttributesCommand66Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
index c910667..0c4d0aa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
@@ -31,9 +31,10 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetClientPartitionAttributesCommandTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
index 19ef0cc..a6c495f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
@@ -46,9 +46,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class InvalidateTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
index 4aa4988..a8a4429 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
@@ -45,9 +45,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class KeySetTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
index c424b2c..a6d8b62 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
@@ -46,9 +46,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class Put61Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
index ee38cfd..fb210b9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
@@ -47,9 +47,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class Put65Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
index a7a80cd..d757e7e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
@@ -48,9 +48,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class PutTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
index 2bc7c53..98ffca4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
@@ -48,9 +48,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class RegisterInterest61Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
index 378c6a0..68008e4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
@@ -47,9 +47,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class RegisterInterestList61Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
index 8f6d02b..3ee17df 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
@@ -49,9 +49,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class RegisterInterestList66Test {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
index 4fb145a..fd14a07 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
@@ -47,9 +47,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class RegisterInterestListTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
index c171707..24dffd5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
@@ -46,9 +46,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class RegisterInterestTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
index d201cc9..93c4407 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class RemoveAllTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
index 0c1ca73..8a449a3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class RequestTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommandTest.java
index c458ca5..891739a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommandTest.java
@@ -35,9 +35,10 @@ import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class TXFailoverCommandTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
index 7779081..21d4967 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
@@ -53,12 +53,13 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore({"*.UnitTest"})
@PrepareForTest({CacheClientNotifier.class})
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class UnregisterInterestTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java
index e70ad61..a231c72 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java
@@ -29,12 +29,13 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the default SocketCloser.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class SocketCloserJUnitTest {
private SocketCloser socketCloser;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserWithWaitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserWithWaitJUnitTest.java
index 5e91944..9629527 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserWithWaitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserWithWaitJUnitTest.java
@@ -18,13 +18,14 @@ import java.util.concurrent.TimeUnit;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests SocketCloser with a wait time. The default SocketCloser does not wait. This test configures
* a closer much like the one used by CacheClientNotifier.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class SocketCloserWithWaitJUnitTest extends SocketCloserJUnitTest {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
index 9334e9e..3ac1be7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
@@ -27,10 +27,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class SocketCreatorFactoryJUnitTest {
@After
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java
index f033bb6..e075b11 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java
@@ -23,10 +23,11 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.admin.SSLConfig;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class SocketCreatorJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
index 3bbf05f..eaa384c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
@@ -29,6 +29,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -43,7 +44,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class SocketUtilsJUnitTest {
private Mockery mockContext;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java
index 32d07de..3a7b7d6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java
@@ -29,10 +29,11 @@ import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class ConnectionTableTest {
private ConnectionTable connectionTable;
private Socket socket;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
index 6b9ac24..01a0f69 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
@@ -25,9 +25,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class ConnectionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java
index 8c5e863..0e34466 100755
--- a/geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java
@@ -31,8 +31,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class DistributedSystemIdDUnitTest extends JUnit4DistributedTestCase {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterBasicJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterBasicJUnitTest.java
index 96f5e4c..951beba 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterBasicJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterBasicJUnitTest.java
@@ -22,12 +22,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
/**
* A test class to document and make clear what JSONFormatter will and won't parse as far as simple
* examples.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RestAPITest.class})
public class JSONFormatterBasicJUnitTest {
// This is needed because the JsonFormatter needs to access the PDX region, which requires a
// running Cache.
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
index f19a53f..7125827 100755
--- a/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
@@ -49,9 +49,10 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.util.test.TestUtil;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, RestAPITest.class})
public class JSONPdxClientServerDUnitTest extends JUnit4CacheTestCase {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
index bd388c4..12ec334 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
@@ -33,8 +33,9 @@ import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RedisTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RedisTest.class})
public class AuthJUnitTest {
private static final String PASSWORD = "pwd";
diff --git a/geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java b/geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java
index 14c3316..ce1f41d 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java
@@ -31,8 +31,9 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RedisTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RedisTest.class})
public class ConcurrentStartTest {
private Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
index 1a50be0..5c2fea2 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
@@ -32,8 +32,9 @@ import org.apache.geode.cache.GemFireCache;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RedisTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RedisTest.class})
public class HashesJUnitTest {
private static Jedis jedis;
private static GeodeRedisServer server;
diff --git a/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
index aee7dba..0606c58 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
@@ -33,8 +33,9 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RedisTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RedisTest.class})
public class ListsJUnitTest {
private static Jedis jedis;
diff --git a/geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java
index d6030a9..88658a6 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java
@@ -37,8 +37,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.RedisTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, RedisTest.class})
public class RedisDistDUnitTest extends JUnit4DistributedTestCase {
public static final String TEST_KEY = "key";
diff --git a/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java b/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
index db82c01..5e40a40 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
@@ -27,8 +27,9 @@ import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RedisTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RedisTest.class})
public class RedisServerTest {
Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java
index e179258..eed971c 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java
@@ -37,8 +37,9 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RedisTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RedisTest.class})
public class SetsJUnitTest {
private static Jedis jedis;
private static GeodeRedisServer server;
diff --git a/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
index b7a58f2..63aa69d 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
@@ -33,8 +33,9 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RedisTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RedisTest.class})
public class SortedSetsJUnitTest {
private static Jedis jedis;
private static GeodeRedisServer server;
diff --git a/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java b/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
index 538dfbe..5ee3218 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
@@ -31,8 +31,9 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RedisTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RedisTest.class})
public class StringsJunitTest {
private static Jedis jedis;
diff --git a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
index 618e279..7f5c6cc 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
@@ -22,9 +22,10 @@ import java.util.regex.Pattern;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, RedisTest.class})
public class AbstractScanExecutorTest {
@Test
diff --git a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java b/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
index 4221659..d268238 100755
--- a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
@@ -16,9 +16,10 @@ package org.apache.geode.codeAnalysis;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
@Override
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/AuthenticationTest.java b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/AuthenticationTest.java
index ae4afd8..f39cb7e 100644
--- a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/AuthenticationTest.java
+++ b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/AuthenticationTest.java
@@ -32,9 +32,10 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.Locator;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class AuthenticationTest {
@Rule
public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/DriverConnectionTest.java b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
index 6e03607..bc5d5ce 100644
--- a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
+++ b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
@@ -32,9 +32,10 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.Locator;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class DriverConnectionTest {
@Rule
public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
index e663537..f1dd608 100644
--- a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
+++ b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
@@ -23,9 +23,10 @@ import java.util.List;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class FunctionServiceIntegrationTest extends IntegrationTestBase {
@Test
public void testFunctionOnRegion() throws IOException {
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
index ac33a21..5cae116 100644
--- a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
+++ b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
@@ -23,9 +23,10 @@ import java.util.List;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class QueryServiceIntegrationTest extends IntegrationTestBase {
@Test
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java
index 1eb6a77..75e58c0 100644
--- a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java
+++ b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java
@@ -30,9 +30,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class RegionIntegrationTest extends IntegrationTestBase {
/** a JSON document */
private static final String jsonDocument =
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/SSLTest.java b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/SSLTest.java
index a2e1232..27059d7 100644
--- a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/SSLTest.java
+++ b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/SSLTest.java
@@ -48,10 +48,11 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.Locator;
import org.apache.geode.internal.net.SocketCreatorFactory;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class SSLTest {
@Rule
public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueEncoderTest.java b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueEncoderTest.java
index e304c3a..ad58bdb 100644
--- a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueEncoderTest.java
+++ b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueEncoderTest.java
@@ -20,9 +20,10 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ValueEncoderTest {
/** a JSON document */
private static final String jsonDocument =
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueSerializerIntegrationTest.java b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueSerializerIntegrationTest.java
index 5fb16eb..8dc4ca5 100644
--- a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueSerializerIntegrationTest.java
+++ b/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueSerializerIntegrationTest.java
@@ -25,9 +25,10 @@ import java.util.UUID;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ValueSerializerIntegrationTest extends IntegrationTestBase {
private ValueSerializer serializer;
diff --git a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java
similarity index 69%
copy from geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
copy to geode-junit/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java
index 4221659..15c9c7b 100755
--- a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java
@@ -12,17 +12,10 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.codeAnalysis;
+package org.apache.geode.test.junit.categories;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
-@Category(IntegrationTest.class)
-public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
-
- @Override
- protected String getModuleName() {
- return "geode-cq";
- }
+/**
+ * A test category for Redis-related tests
+ */
+public interface RedisTest {
}
diff --git a/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java b/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
index 732d533..d3ca146 100644
--- a/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
+++ b/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
@@ -44,10 +44,11 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.OldClientSupportService;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import com.gemstone.gemfire.OldClientSupportProvider;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
@SuppressWarnings("deprecation")
public class OldClientSupportDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java b/geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
index b01d570..9982e5f 100755
--- a/geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
+++ b/geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
@@ -20,9 +20,10 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, BackwardCompatibilityTest.class})
public class VersionManagerJUnitTest {
@Test
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/OutputCapturingServerConnectionTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/OutputCapturingServerConnectionTest.java
index 8c1d6f1..a4eb2b0 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/OutputCapturingServerConnectionTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/OutputCapturingServerConnectionTest.java
@@ -38,10 +38,11 @@ import org.apache.geode.internal.cache.client.protocol.ClientProtocolProcessor;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class OutputCapturingServerConnectionTest {
@Rule
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnectionTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnectionTest.java
index 57e6603..e26204c 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnectionTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnectionTest.java
@@ -40,9 +40,10 @@ import org.apache.geode.internal.cache.client.protocol.ClientProtocolProcessor;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ProtobufServerConnectionTest {
private ClientHealthMonitor clientHealthMonitorMock;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/ProtobufStreamProcessorTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/ProtobufStreamProcessorTest.java
index 6ce9a8f..d0d0a70 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/ProtobufStreamProcessorTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/ProtobufStreamProcessorTest.java
@@ -28,9 +28,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.protocol.TestExecutionContext;
import org.apache.geode.internal.protocol.protobuf.v1.ProtobufStreamProcessor;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ProtobufStreamProcessorTest {
@Test(expected = IOException.class)
public void receiveMessage() throws Exception {
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
index 9bf9759..a190c98 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
@@ -46,6 +46,7 @@ import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
@@ -54,7 +55,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* or client auth enabled: we call this incompatible with our auth. - with neither enabled: this is
* what we call "security off". Don't auth at all.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class AuthenticationIntegrationTest {
private static final String TEST_USERNAME = "bob";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
index 6027709..3c49073 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
@@ -50,9 +50,10 @@ import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class AuthorizationIntegrationTest {
private static final String TEST_USERNAME = "bob";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
index 10fc7df..90e1510 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.security.SecurityManager;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class DisconnectClientIntegrationTest {
public static final String SECURITY_PRINCIPAL = "principle";
private Socket socket;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
index 775187d..eb07a79 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
@@ -55,9 +55,10 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ExecuteFunctionOnGroupIntegrationTest {
private static final String TEST_REGION = "testRegion";
private static final String TEST_FUNCTION_ID = "testFunction";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
index c4c9fb4..2a233e8 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
@@ -54,9 +54,10 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ExecuteFunctionOnMemberIntegrationTest {
private static final String TEST_REGION = "testRegion";
private static final String TEST_FUNCTION_ID = "testFunction";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
index 18e6bff..ed99c71 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
@@ -58,9 +58,10 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ExecuteFunctionOnRegionIntegrationTest {
private static final String TEST_REGION = "testRegion";
private static final String TEST_FUNCTION_ID = "testFunction";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufProtocolServiceJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufProtocolServiceJUnitTest.java
index c390406..aa62647 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufProtocolServiceJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufProtocolServiceJUnitTest.java
@@ -21,9 +21,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.protocol.protobuf.statistics.ClientStatistics;
import org.apache.geode.internal.statistics.DummyStatisticsFactory;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ProtobufProtocolServiceJUnitTest {
@Test
public void initializeStatistics() {
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
index fc29e4b..d22020e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
@@ -41,9 +41,10 @@ import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.protocol.protobuf.ProtocolVersion;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.ProtobufProtocolSerializer;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ProtocolVersionIntegrationTest {
private Cache cache;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
index 5871f0c..ed8f063 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
@@ -41,9 +41,10 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ValueSerializerIntegrationTest {
private static final String TEST_REGION = "region";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
index 677d966..20d02d0 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
@@ -67,14 +67,15 @@ import org.apache.geode.internal.protocol.protobuf.v1.MessageUtil;
import org.apache.geode.internal.protocol.protobuf.v1.ProtobufSerializationService;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.ProtobufProtocolSerializer;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.exception.InvalidProtocolMessageException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.AcceptanceTest;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
import org.apache.geode.util.test.TestUtil;
/**
* Test that using the magic byte to indicate intend ot use ProtoBuf messages works
*/
-@Category(IntegrationTest.class)
+@Category({AcceptanceTest.class, ClientServerTest.class})
@RunWith(value = Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class CacheConnectionJUnitTest {
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
index 6289196..84c4081 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
@@ -47,12 +47,13 @@ import org.apache.geode.internal.protocol.protobuf.v1.ClientProtocol;
import org.apache.geode.internal.protocol.protobuf.v1.MessageUtil;
import org.apache.geode.internal.protocol.protobuf.v1.ProtobufSerializationService;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.ProtobufProtocolSerializer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.AcceptanceTest;
+import org.apache.geode.test.junit.categories.ClientServerTest;
/**
* Test the new protocol correctly times out connections
*/
-@Category(IntegrationTest.class)
+@Category({AcceptanceTest.class, ClientServerTest.class})
public class CacheConnectionTimeoutJUnitTest {
private final String TEST_KEY = "testKey";
private final String TEST_VALUE = "testValue";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
index b388c08..6cf5de9 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
@@ -57,13 +57,13 @@ import org.apache.geode.internal.protocol.protobuf.v1.MessageUtil;
import org.apache.geode.internal.protocol.protobuf.v1.ProtobufSerializationService;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.ProtobufProtocolSerializer;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.exception.InvalidProtocolMessageException;
+import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- * Test that using the magic byte to indicate intend ot use ProtoBuf messages works
+ * Test that using the magic byte to indicate intend to use ProtoBuf messages works
*/
-@Category({IntegrationTest.class, FlakyTest.class})
+@Category({AcceptanceTest.class, FlakyTest.class}) // Flaky - GEODE-3733
public class CacheMaxConnectionJUnitTest {
private static final String TEST_KEY = "testKey";
private static final String TEST_VALUE = "testValue";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
index b570d18..4a9faa4 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
@@ -67,13 +67,14 @@ import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.En
import org.apache.geode.internal.protocol.protobuf.v1.serializer.ProtobufProtocolSerializer;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.exception.InvalidProtocolMessageException;
import org.apache.geode.internal.protocol.protobuf.v1.utilities.ProtobufUtilities;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.AcceptanceTest;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.util.test.TestUtil;
/**
* Test operations using ProtoBuf
*/
-@Category(IntegrationTest.class)
+@Category({AcceptanceTest.class, ClientServerTest.class})
public class CacheOperationsJUnitTest {
private final String TEST_KEY = "testKey";
private final String TEST_VALUE = "testValue";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
index ae180d2..953297b 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
@@ -43,12 +43,14 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
+import org.apache.geode.test.junit.categories.AcceptanceTest;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test sending ProtoBuf messages to the locator, with a security manager configured on the locator
*/
-@Category(DistributedTest.class)
+@Category({AcceptanceTest.class, DistributedTest.class, ClientServerTest.class})
public class LocatorConnectionAuthenticationDUnitTest extends JUnit4CacheTestCase {
@Rule
public final DistributedRestoreSystemProperties restoreSystemProperties =
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
index ebd4ac0..d4e33e0 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
@@ -47,12 +47,14 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
+import org.apache.geode.test.junit.categories.AcceptanceTest;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/*
* Test sending ProtoBuf messages to the locator
*/
-@Category(DistributedTest.class)
+@Category({AcceptanceTest.class, DistributedTest.class, ClientServerTest.class})
public class LocatorConnectionDUnitTest extends JUnit4CacheTestCase {
@Rule
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingCacheImplTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingCacheImplTest.java
index cf5bd4b..fad620e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingCacheImplTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingCacheImplTest.java
@@ -48,9 +48,10 @@ import org.apache.geode.cache.query.internal.InternalQueryService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class AuthorizingCacheImplTest {
public static final String REGION = "TestRegion";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java
index 0aff8f9..d7d86e5 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java
@@ -38,9 +38,10 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class AuthorizingFunctionServiceImplTest {
public static final String REGION = "TestRegion";
public static final String FUNCTION_ID = "id";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
index c6fe8ae..9d5e344 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
@@ -31,9 +31,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.ProtobufRequestUtilities;
import org.apache.geode.internal.protocol.protobuf.v1.RegionAPI;
import org.apache.geode.internal.protocol.protobuf.v1.Result;
import org.apache.geode.internal.protocol.protobuf.v1.Success;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ClearRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private final String TEST_REGION = "test region";
private final String MISSING_REGION = "missing region";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest.java
index 4ce4947..579e875 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest.java
@@ -48,9 +48,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.ServerMessageExecutionCont
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.NotAuthorizedException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest {
private static final String TEST_GROUP1 = "group1";
private static final String TEST_GROUP2 = "group2";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnMemberRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnMemberRequestOperationHandlerJUnitTest.java
index f5b38f7..957a32b 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnMemberRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnMemberRequestOperationHandlerJUnitTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.ServerMessageExecutionCont
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.NotAuthorizedException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ExecuteFunctionOnMemberRequestOperationHandlerJUnitTest {
private static final String TEST_MEMBER1 = "member1";
private static final String TEST_MEMBER2 = "member2";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnRegionRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnRegionRequestOperationHandlerJUnitTest.java
index 7bb18ac..c5d1e1c 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnRegionRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnRegionRequestOperationHandlerJUnitTest.java
@@ -44,13 +44,14 @@ import org.apache.geode.internal.protocol.protobuf.v1.ServerMessageExecutionCont
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.NotAuthorizedException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unfortunately, we can't test the happy path with a unit test, because the function service is
* static, and there's mocking function execution is too complicated.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ExecuteFunctionOnRegionRequestOperationHandlerJUnitTest {
private static final String TEST_REGION = "testRegion";
private static final String TEST_FUNCTION_ID = "testFunction";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandlerJUnitTest.java
index 0feffe9..5432d25 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandlerJUnitTest.java
@@ -45,9 +45,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.Result;
import org.apache.geode.internal.protocol.protobuf.v1.Success;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private static final String TEST_KEY1 = "my key1";
private static final String TEST_VALUE1 = "my value1";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
index 4bf9051..92a7e73 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
@@ -44,6 +44,7 @@ import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
@@ -58,7 +59,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* <p>
* This addresses JIRA tickets GEODE-4116 and GEODE-4168.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class GetAndPutJsonDocumentsDUnitTest extends JUnit4CacheTestCase {
/** this JSON document is used by the "put" the tests */
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
index 7f0d1a8..7727858 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
@@ -35,9 +35,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.ProtobufRequestUtilities;
import org.apache.geode.internal.protocol.protobuf.v1.RegionAPI;
import org.apache.geode.internal.protocol.protobuf.v1.Result;
import org.apache.geode.internal.protocol.protobuf.v1.Success;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetRegionNamesRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private final String TEST_REGION1 = "test region 1";
private final String TEST_REGION2 = "test region 2";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRequestOperationHandlerJUnitTest.java
index 6020a23..c019182 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRequestOperationHandlerJUnitTest.java
@@ -36,9 +36,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.Result;
import org.apache.geode.internal.protocol.protobuf.v1.Success;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private final String TEST_KEY = "my key";
private final String TEST_VALUE = "my value";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetServerOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetServerOperationHandlerJUnitTest.java
index 8b768b7..85aaa53 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetServerOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetServerOperationHandlerJUnitTest.java
@@ -39,9 +39,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.LocatorAPI.GetServerRespon
import org.apache.geode.internal.protocol.protobuf.v1.ProtobufRequestUtilities;
import org.apache.geode.internal.protocol.protobuf.v1.Result;
import org.apache.geode.internal.protocol.protobuf.v1.Success;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetServerOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
final String HOSTNAME = "hostname";
final int PORT = 12345;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetSizeRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetSizeRequestOperationHandlerJUnitTest.java
index ea93fe2..f0dcc6f 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetSizeRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetSizeRequestOperationHandlerJUnitTest.java
@@ -37,9 +37,10 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.protocol.protobuf.v1.MessageUtil;
import org.apache.geode.internal.protocol.protobuf.v1.RegionAPI;
import org.apache.geode.internal.protocol.protobuf.v1.Result;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class GetSizeRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private final String TEST_REGION1 = "test region 1";
private Region region1Stub;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/KeySetOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/KeySetOperationHandlerJUnitTest.java
index aec7a7a..c74506a 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/KeySetOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/KeySetOperationHandlerJUnitTest.java
@@ -34,9 +34,10 @@ import org.apache.geode.internal.protocol.TestExecutionContext;
import org.apache.geode.internal.protocol.protobuf.v1.RegionAPI;
import org.apache.geode.internal.protocol.protobuf.v1.Result;
import org.apache.geode.internal.protocol.protobuf.v1.Success;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class KeySetOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private final String TEST_KEY1 = "Key1";
private final String TEST_KEY2 = "Key2";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OperationHandlerJUnitTest.java
index c70739c..b8d9845 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OperationHandlerJUnitTest.java
@@ -22,9 +22,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.protocol.operations.ProtobufOperationHandler;
import org.apache.geode.internal.protocol.protobuf.v1.ProtobufSerializationService;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class OperationHandlerJUnitTest {
protected InternalCache cacheStub;
protected ProtobufSerializationService serializationService;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OqlQueryRequestOperationHandlerIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OqlQueryRequestOperationHandlerIntegrationTest.java
index 9bc7bd8..3f00596 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OqlQueryRequestOperationHandlerIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OqlQueryRequestOperationHandlerIntegrationTest.java
@@ -53,9 +53,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.authentication.NoSecurityA
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
import org.apache.geode.internal.protocol.protobuf.v1.state.exception.ConnectionStateException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class OqlQueryRequestOperationHandlerIntegrationTest {
private Cache cache;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OqlQueryRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OqlQueryRequestOperationHandlerJUnitTest.java
index 43dc6de..4ff0f2e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OqlQueryRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OqlQueryRequestOperationHandlerJUnitTest.java
@@ -49,9 +49,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.Result;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
import org.apache.geode.internal.protocol.protobuf.v1.state.exception.ConnectionStateException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class OqlQueryRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
public static final String SELECT_STAR_QUERY = "select * from /region";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ProtocolVersionHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ProtocolVersionHandlerJUnitTest.java
index d112800..87af0e8 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ProtocolVersionHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ProtocolVersionHandlerJUnitTest.java
@@ -17,6 +17,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.protocol.protobuf.ProtocolVersion;
import org.apache.geode.internal.protocol.protobuf.statistics.ClientStatistics;
import org.apache.geode.internal.protocol.protobuf.v1.MessageUtil;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
/*
@@ -34,7 +35,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* the License.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ProtocolVersionHandlerJUnitTest {
private static final int INVALID_MAJOR_VERSION = 67;
private static final int INVALID_MINOR_VERSION = 92347;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandlerJUnitTest.java
index 60c6782..cc91ad6 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandlerJUnitTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.De
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
import org.apache.geode.internal.protocol.protobuf.v1.utilities.ProtobufUtilities;
import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private final String TEST_KEY1 = "my key1";
private final String TEST_KEY2 = "my key2";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
index 008e495..b19c729 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
@@ -48,9 +48,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.ProtobufSerializationServi
import org.apache.geode.internal.protocol.protobuf.v1.RegionAPI;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.ProtobufProtocolSerializer;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.exception.InvalidProtocolMessageException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class PutIfAbsentRequestIntegrationTest {
private static final String TEST_REGION = "testRegion";
private static final Object TEST_KEY = "testKey";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java
index 2d958b7..77ae6d7 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java
@@ -38,9 +38,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.Result;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
import org.apache.geode.internal.protocol.protobuf.v1.utilities.ProtobufUtilities;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
@SuppressWarnings("unchecked") // Region lacks generics when we look it up
public class PutIfAbsentRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private final String TEST_KEY = "my key";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandlerJUnitTest.java
index 14565e4..126044b 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandlerJUnitTest.java
@@ -40,9 +40,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.Success;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
import org.apache.geode.internal.protocol.protobuf.v1.utilities.ProtobufUtilities;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private final String TEST_KEY = "my key";
private final String TEST_VALUE = "99";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/RemoveRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/RemoveRequestOperationHandlerJUnitTest.java
index cf8384a..fafc07d 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/RemoveRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/RemoveRequestOperationHandlerJUnitTest.java
@@ -38,9 +38,10 @@ import org.apache.geode.internal.protocol.protobuf.v1.Result;
import org.apache.geode.internal.protocol.protobuf.v1.Success;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
private final String TEST_KEY = "my key";
private final String TEST_VALUE = "my value";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/VersionValidatorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/VersionValidatorJUnitTest.java
index eea03df..157c07d 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/VersionValidatorJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/VersionValidatorJUnitTest.java
@@ -21,9 +21,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.protocol.protobuf.ProtocolVersion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class VersionValidatorJUnitTest {
private static final int MAJOR_VERSION = 3;
private static final int MINOR_VERSION = 3;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serialization/codec/JsonPdxConverterJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serialization/codec/JsonPdxConverterJUnitTest.java
index b6138a7..e14f1a7 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serialization/codec/JsonPdxConverterJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serialization/codec/JsonPdxConverterJUnitTest.java
@@ -38,9 +38,10 @@ import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.WritablePdxInstance;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class JsonPdxConverterJUnitTest {
private String complexJSONString = "{\n" + " \"_id\": \"599c7d885df276ac3e0bf10a\",\n"
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serializer/ProtobufProtocolSerializerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serializer/ProtobufProtocolSerializerJUnitTest.java
index 3f73cc8..3f343d0 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serializer/ProtobufProtocolSerializerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serializer/ProtobufProtocolSerializerJUnitTest.java
@@ -27,9 +27,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.protocol.protobuf.v1.ClientProtocol;
import org.apache.geode.internal.protocol.protobuf.v1.MessageUtil;
import org.apache.geode.internal.protocol.protobuf.v1.serializer.exception.InvalidProtocolMessageException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ProtobufProtocolSerializerJUnitTest {
private ProtobufProtocolSerializer protocolSerializer;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/ProtobufUtilitiesJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/ProtobufUtilitiesJUnitTest.java
index 199b97d..1697528 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/ProtobufUtilitiesJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/ProtobufUtilitiesJUnitTest.java
@@ -27,9 +27,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.protocol.protobuf.v1.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.v1.ProtobufSerializationService;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ProtobufUtilitiesJUnitTest {
private ProtobufSerializationService protobufSerializationService =
diff --git a/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java b/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
index deb8659..2d0bc62 100644
--- a/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
+++ b/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
@@ -17,8 +17,9 @@ package org.apache.geode.codeAnalysis;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RestAPITest.class})
public class AnalyzeWebApiSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
@Override
diff --git a/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseControllerJUnitTest.java b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseControllerJUnitTest.java
index c61c405..f841705 100644
--- a/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseControllerJUnitTest.java
+++ b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseControllerJUnitTest.java
@@ -21,12 +21,13 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.rest.internal.web.exception.GemfireRestException;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.UnitTest;
/**
* AbstractBaseController Tester.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, RestAPITest.class})
public class AbstractBaseControllerJUnitTest {
AbstractBaseController abstractBaseController = new AbstractBaseController() {
diff --git a/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java
index 2bed462..173dae7 100644
--- a/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java
+++ b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java
@@ -19,9 +19,10 @@ import static org.mockito.Mockito.*;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, RestAPITest.class})
public class RegionDataTest {
@Test
diff --git a/gradle/test.gradle b/gradle/test.gradle
index b574d4d..1788199 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -289,6 +289,18 @@ subprojects {
}
+ task redisTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.RedisTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ forkEvery 1
+ reports.junitXml.destination = file "$buildDir/test-reports-redis"
+ }
+
task restAPITest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.RestAPITest'
--
To stop receiving notification emails like this one, please contact
bschuchardt@apache.org.