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 a1a45cb98156..14782cf29d5c 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.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 01997c17407c..12c0ae7784f1 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.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 @@ * @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 daf0d4fcc99e..1558ad95efd0 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.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 6ff858034dd5..2daddc86c60f 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.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 @@ * * @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 afa10509e5ef..64a72201ee4f 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.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 90272a3d9005..e4b86ed76647 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.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 99048aa3608e..61ff06a238c7 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.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 e95d5852b82e..24d88dba3e66 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 @@ 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 faf495d239f3..ce84f21fc26b 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.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 52481e9bbde3..6495f6114db0 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.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 cc2f81a0ffc2..39675c5f98d6 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.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 261904b66318..2b2fe72c252b 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.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 1e68518ee73d..49df77389c4d 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.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 f8522fa9a215..f6ba8ba57615 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 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 @@ * @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 f16bf4b9804e..9f9e62daa381 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.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 cc07db94f314..58d05a2cb1df 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.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 28ba30b5e367..e39b7fc54bc1 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.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 98966d4e454a..41eb60ed2e37 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.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 4b1eac583186..fcd5d6d006a9 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.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 e235f19d355c..b851ec5ab259 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.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 33172ec54fcb..e650f1026157 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 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 603affc45878..b4bfeb37580c 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.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 964190177dcb..9eb338b53c6f 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.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 f77f3cfa8587..1e4a1f5ab812 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 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 a63ddba29496..ec132566d149 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.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 c4f6a91b119f..44be8adffd05 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 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 3a1d50354a3c..f32592e0c5be 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.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 @@ * * */ -@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 0c79cab03ac9..dbe62f0d4e57 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.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 6c100e598dec..7ce9bcbf6443 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 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 4de1470e2df8..3b893a2c9821 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.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.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 @@ * * @since GemFire 3.0 */ -@Category(UnitTest.class) +@Category({UnitTest.class, SerializationTest.class}) public class DataSerializableJUnitTest implements Serializable { /** A ByteArrayOutputStream 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 3f1d04620887..6c624f78a01f 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.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 @@ * 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 f8f9eba6c1f0..deadaf3f9477 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 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 2e5a72408fd3..ce75873257f6 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.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 28bc6e963325..930b389dc37e 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.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 @@ * 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 1b1bea902240..6e7aca2fce63 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.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 @@ * 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 38708d25943b..5728bd4c0937 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.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 filesToBeDeleted = new CopyOnWriteArrayList(); 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 5239d4cc7b9f..543651bc2688 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.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 3720234169dc..ace02f7d39d9 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.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 filesToBeDeleted = new CopyOnWriteArrayList(); 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 eb4423b8d1a1..154c3783b6a6 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.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 b919e790d6e3..a741220d7e7e 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.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 b9dfd3867f68..bbcfb06095e5 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.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 e63f4ba4e5d6..d16c980f6682 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.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 2d4e0215ca0e..5391401c4486 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.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 77ddef0b518c..8dc7298853e1 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.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 f14f04aaaaf8..d305b4b309c6 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.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 7aa7f8c3d6c2..8f98d1601867 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.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 33466bef4b34..c78607c6bbeb 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.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 62623d45ebaf..c890e9397dae 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.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 27669bc1f8e7..09a3d4ebc832 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.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 ClientHealthMonitor. */ -@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 3f4b86936e27..a720422775ab 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.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 9d365f2b0240..0ffac388c68a 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.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 82535dc1b628..d71271d598ee 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.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 80aac2d33cc4..8c477564d5d4 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.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 490b0412130c..8feb26314009 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 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 52a041b44563..864ef80e163a 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.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 ac6a5605d833..1dac08dbd8e5 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.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 @@ * 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 dcd4240dac14..a14fdda484c6 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.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 05c5889fa06b..5862ad714a06 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.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 b5c195122034..f79613b97160 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.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 7963e97a50eb..3dbee32c8d14 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.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 96a1720cbda5..6509624c59ce 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.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 9a15adab0562..592c4cab357d 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.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 6ce407ab2dd0..abb109918f7e 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.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 9e0fc5940865..05a53ab7b876 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.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 29d43b155d39..f30f53969013 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.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 a9111531adc3..c5edf879bdef 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.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 f1a1684f0cc1..70ba8e38d57c 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.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 c161b3272527..c49d5652835c 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.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 769cbfbcab8f..c920f0d1d113 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.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 535ffe7c2e50..a65b457782bc 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.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 9b7ae7e8b9d3..916732a90cd2 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.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 8d49b8798fe0..866fa6d6ccd1 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.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 18769fb80111..6107b5ec775a 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.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 6c8af02bb93a..70b22a3f5e90 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.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 0c3433fd2071..4c6b971ae347 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.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 c91066783037..0c4d0aa0c786 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.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 19ef0cc0bccc..a6c495f19205 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.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 4aa498818610..a8a44299f7b4 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.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 c424b2c2dc62..a6d8b62496af 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.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 ee38cfd609dd..fb210b99804b 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.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 a7a80cd87581..d757e7ec7015 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.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 2bc7c53cf643..98ffca4aeb44 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.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 378c6a02b9fc..68008e459f6b 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.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 8f6d02bb21bf..3ee17dffa862 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.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 4fb145a30db2..fd14a073b048 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.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 c17170748446..24dffd5d9f3f 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.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 d201cc940342..93c4407b253b 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.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 0c1ca73e580a..8a449a3382c3 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.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 c458ca568fa9..891739ac05f5 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.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 77790813f40c..21d49677628d 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.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 e70ad614af69..a231c722292d 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.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 5e9194471830..9629527c1b8f 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 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 9334e9ee469d..3ac1be7f8ca8 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.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 f033bb6715fa..e075b11e61fa 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.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 3bbf05f734ae..eaa384c5de16 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.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 @@ * @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 32d07de3d367..3a7b7d62c81a 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.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 6b9ac24070fe..01a0f6966a45 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.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 8c5e86345a18..0e34466e74f8 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.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 96f5e4ca9f9d..951beba2158c 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.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 f19a53f5d5df..7125827beb12 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.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 bd388c421897..12ec33417c84 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.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 14c33167c773..ce1f41d7c28c 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.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 1a50be073c28..5c2fea2b5a9e 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.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 aee7dba1b4b4..0606c58c3e3f 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.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 d6030a9e5feb..88658a65f102 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.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 db82c0143427..5e40a4060237 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.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 e1792585500c..eed971c0c8a0 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.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 b7a58f2ee3a7..63aa69d22ebe 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.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 538dfbe79717..5ee3218d3bc9 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.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 618e27934acb..7f5c6cc2a3ff 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 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 42216594b7bb..d268238d32bb 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 @@ 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 ae4afd885477..f39cb7e6c45d 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.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 6e03607500aa..bc5d5ce05bc7 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.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 e663537d52e6..f1dd60802e5e 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 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 ac33a21ba635..5cae11648ef4 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 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 1eb6a7753395..75e58c003fba 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.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 a2e1232091a0..27059d7e3f38 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.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 e304c3a4c99f..ad58bdba4641 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 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 5fb16eb390c1..8dc4ca5592be 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 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-junit/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java new file mode 100755 index 000000000000..15c9c7bfd8b3 --- /dev/null +++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.test.junit.categories; + +/** + * 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 732d5331a35a..d3ca14679761 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.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 b01d57093050..9982e5f38fd7 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.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 8c1d6f1a6565..a4eb2b06232b 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.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 57e66032d49d..e26204c432a9 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.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 6ce9a8fc6c6f..d0d0a703dd66 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.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 9bf975980408..a190c98db24d 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.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 @@ * 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 6027709d5c11..3c49073b0ad6 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.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 10fc7df577d3..90e151062313 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.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 775187d650fb..eb07a79399c9 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.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 c4c9fb4a9b5b..2a233e85959a 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.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 18e6bff3858c..ed99c7145548 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.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 c39040690f88..aa62647a6bcd 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.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 fc29e4b7ac75..d22020e9c8c2 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.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 5871f0cea2a8..ed8f0633bdf4 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.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 677d966a4229..20d02d0b0d40 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.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 62891966c73c..84c4081be5e3 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.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 b388c0806f82..6cf5de973222 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.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 b570d18108e8..4a9faa48fac7 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.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 ae180d20fd6e..953297bb0574 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.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 ebd4ac0aef39..d4e33e07620a 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.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 cf5bd4b7d73a..fad620e9d920 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.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 0aff8f9dab47..d7d86e5de242 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.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 c6fe8ae821a1..9d5e344816d4 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.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 4ce49474a831..579e8750e2dc 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.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 f5b38f753d8e..957a32b0f252 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.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 7bb18ac0b8da..c5d1e1c85e0f 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.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 0feffe950e60..5432d25dae6d 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.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 4bf905106623..92a7e73b541d 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.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 @@ *

* 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 7f0d1a81eb78..7727858003cf 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.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 6020a2343f05..c0191826e8c4 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.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 8b768b7fa1ce..85aaa530bf78 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.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 ea93fe218964..f0dcc6fb0a74 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.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 aec7a7ac5656..c74506ad07fb 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.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 c70739c45b70..b8d9845b283a 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.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 9bc7bd8eeaa8..3f005969fc83 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.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 43dc6dea1596..4ff0f2edfc5c 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.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 d112800647be..87af0e8ec020 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.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 @@ * 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 60c6782527a2..cc91ad6abba4 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.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 008e4957f756..b19c72974bfe 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.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 2d958b7d3e67..77ae6d74356d 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.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 14565e4293b9..126044b74113 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.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 cf8384aaedb5..fafc07daeddd 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.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 eea03dfe3ad0..157c07dc350a 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.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 b6138a7c5677..e14f1a77f4df 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.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 3f73cc8362e3..3f343d050526 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.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 199b97db5186..16975284fdbe 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.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 deb865926bfd..2d0bc625132f 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 @@ 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 c61c4052c1f3..f841705cc081 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.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 2bed4621c050..173dae743973 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 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 b574d4dd27f1..1788199e5c1d 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'